auto-sync

firmware/config/engines/mazda_miata_nb.cpp

@@ -69,7 +69,7 @@ void setMazdaMiataNbEngineConfiguration(engine_configuration_s *engineConfigurat
 	boardConfiguration->fanPinMode = OM_DEFAULT;
 
 	boardConfiguration->electronicThrottlePin1 = GPIO_UNASSIGNED;
-	boardConfiguration->idleSwitchPin = GPIO_UNASSIGNED;
+	boardConfiguration->clutchDownPin = GPIO_UNASSIGNED;
 
 	// set_whole_fuel_map 3
 	setWholeFuelMap(engineConfiguration, 3);

firmware/controllers/algo/auto_generated_enums.cpp

@@ -435,6 +435,10 @@ case Force_4b_pin_input_mode:
   return "Force_4b_pin_input_mode";
 case PI_DEFAULT:
   return "PI_DEFAULT";
+case PI_PULLUP:
+	return "PI_PULLUP";
+case PI_PULLDOWN:
+	return "PI_PULLDOWN";
   }
  return NULL;
 }

firmware/controllers/algo/engine_configuration.cpp

@@ -422,7 +422,8 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
 	boardConfiguration->fanPin = GPIOC_15;
 	boardConfiguration->fanPinMode = OM_DEFAULT;
 
-	boardConfiguration->idleSwitchPin = GPIO_UNASSIGNED;
+	boardConfiguration->clutchDownPin = GPIO_UNASSIGNED;
+	engineConfiguration->clutchUpPin = GPIO_UNASSIGNED;
 
 	boardConfiguration->triggerSimulatorPins[0] = GPIOD_1;
 	boardConfiguration->triggerSimulatorPins[1] = GPIOD_2;

firmware/controllers/algo/engine_configuration.h

@@ -146,10 +146,13 @@ typedef struct {
 	pin_output_mode_e electronicThrottlePin1Mode;
 
 	/**
-	 * Idle switch input signal
+	 * some cars have a switch to indicate that clutch pedal is all the way down
 	 */
-	brain_pin_e idleSwitchPin;
-	pin_input_mode_e idleSwitchPinMode;
+	brain_pin_e clutchDownPin;
+	/**
+	 * some cars have a switch to indicate that clutch pedal is all the way down
+	 */
+	pin_input_mode_e clutchDownPinMode;
 
 	brain_pin_e alternatorControlPin;
 	pin_output_mode_e alternatorControlPinMode;
@@ -598,7 +601,12 @@ typedef struct {
 	 */
 	float cylinderBore;
 
-	int unused3[84];
+	/**
+	 * Some vehicles have a switch to indicate that clutch pedal is all the way up
+	 */
+	brain_pin_e clutchUpPin;
+	pin_input_mode_e clutchUpPinMode;
+	int unused3[82];
 
 } engine_configuration_s;
 

firmware/controllers/algo/rusefi_enums.h

@@ -238,6 +238,8 @@ typedef enum {
 
 typedef enum {
 	PI_DEFAULT = 0,
+	PI_PULLUP = 1,
+	PI_PULLDOWN = 2,
 
 	Force_4b_pin_input_mode = ENUM_SIZE_HACK,
 } pin_input_mode_e;

firmware/controllers/flash_main.h

@@ -12,7 +12,7 @@
 #include "engine_configuration.h"
 #include "engine.h"
 
-#define FLASH_DATA_VERSION 6100
+#define FLASH_DATA_VERSION 6130
 
 void readFromFlash(void);
 void initFlash(Engine *engine);

firmware/controllers/idle_thread.cpp

@@ -96,9 +96,9 @@ static msg_t ivThread(int param) {
 		chThdSleepMilliseconds(boardConfiguration->idleThreadPeriod);
 
 		// this value is not used yet
-		if (boardConfiguration->idleSwitchPin != GPIO_UNASSIGNED) {
-			idleSwitchState = palReadPad(getHwPort(boardConfiguration->idleSwitchPin),
-					getHwPin(boardConfiguration->idleSwitchPin));
+		if (boardConfiguration->clutchDownPin != GPIO_UNASSIGNED) {
+			idleSwitchState = palReadPad(getHwPort(boardConfiguration->clutchDownPin),
+					getHwPin(boardConfiguration->clutchDownPin));
 		}
 
 		if (engineConfiguration->idleMode != IM_AUTO)
@@ -149,8 +149,11 @@ void startIdleThread(Engine *engine) {
 
 	// this is idle switch INPUT - sometimes there is a switch on the throttle pedal
 	// this switch is not used yet
-	if (boardConfiguration->idleSwitchPin != GPIO_UNASSIGNED)
-		mySetPadMode2("idle switch", boardConfiguration->idleSwitchPin, PAL_MODE_INPUT);
+	if (boardConfiguration->clutchDownPin != GPIO_UNASSIGNED)
+		mySetPadMode2("clutch down switch", boardConfiguration->clutchDownPin, PAL_MODE_INPUT);
+
+	if (engineConfiguration->clutchUpPin != GPIO_UNASSIGNED)
+		mySetPadMode2("clutch up switch", engineConfiguration->clutchUpPin, PAL_MODE_INPUT);
 
 	addConsoleAction("idleinfo", showIdleInfo);
 	addConsoleActionI("set_idle_rpm", setIdleRpmAction);

hardware/PowerSSO-24_breakout/PowerSSO-24_breakout.kicad_pcb

@@ -3,12 +3,12 @@
   (general
     (links 37)
     (no_connects 0)
-    (area 207.594287 137.16 256.540001 162.941423)
+    (area 206.959287 137.16 256.540001 162.941423)
     (thickness 1.6)
-    (drawings 12)
-    (tracks 207)
+    (drawings 15)
+    (tracks 210)
     (zones 0)
-    (modules 17)
+    (modules 18)
     (nets 13)
   )
 
@@ -61,8 +61,8 @@
     (mod_edge_width 0.15)
     (mod_text_size 1 1)
     (mod_text_width 0.15)
-    (pad_size 1.5 1.5)
-    (pad_drill 0.6)
+    (pad_size 1.524 1.524)
+    (pad_drill 1.016)
     (pad_to_mask_clearance 0)
     (aux_axis_origin 0 0)
     (visible_elements 7FFFFB3F)
@@ -105,8 +105,8 @@
   (net 8 /VCC)
   (net 9 GND)
   (net 10 N-000001)
-  (net 11 N-000003)
-  (net 12 N-000004)
+  (net 11 N-000004)
+  (net 12 N-000005)
 
   (net_class Default "This is the default net class."
     (clearance 0.24892)
@@ -126,8 +126,8 @@
     (add_net /VCC)
     (add_net GND)
     (add_net N-000001)
-    (add_net N-000003)
     (add_net N-000004)
+    (add_net N-000005)
   )
 
   (net_class FAT ""
@@ -148,7 +148,7 @@
     (uvia_drill 0.127)
   )
 
-  (module SIL-1 (layer B.Cu) (tedit 54A882CD) (tstamp 54A84B00)
+  (module SIL-1 (layer B.Cu) (tedit 54A88DBF) (tstamp 54A84B00)
     (at 217.17 151.13)
     (descr "Connecteurs 1 pin")
     (tags "CONN DEV")
@@ -163,14 +163,14 @@
     (fp_line (start -1.27 1.27) (end 1.27 1.27) (layer B.SilkS) (width 0.3175))
     (fp_line (start -1.27 -1.27) (end -1.27 1.27) (layer B.SilkS) (width 0.3048))
     (fp_line (start 1.27 1.27) (end 1.27 -1.27) (layer B.SilkS) (width 0.3048))
-    (pad 1 thru_hole rect (at 0 0) (size 1.397 1.397) (drill 0.8128)
+    (pad 1 thru_hole rect (at 0 0) (size 1.524 1.524) (drill 1.016)
       (layers *.Cu *.Mask B.SilkS)
-      (net 11 N-000003)
+      (net 11 N-000004)
     )
   )
 
-  (module SIL-1 (layer B.Cu) (tedit 54A882D4) (tstamp 54A84B12)
-    (at 217.17 153.67)
+  (module SIL-1 (layer B.Cu) (tedit 54A88DB3) (tstamp 54A84B12)
+    (at 217.17 156.21)
     (descr "Connecteurs 1 pin")
     (tags "CONN DEV")
     (path /54A83634)
@@ -184,13 +184,13 @@
     (fp_line (start -1.27 1.27) (end 1.27 1.27) (layer B.SilkS) (width 0.3175))
     (fp_line (start -1.27 -1.27) (end -1.27 1.27) (layer B.SilkS) (width 0.3048))
     (fp_line (start 1.27 1.27) (end 1.27 -1.27) (layer B.SilkS) (width 0.3048))
-    (pad 1 thru_hole rect (at 0 0) (size 1.397 1.397) (drill 0.8128)
+    (pad 1 thru_hole rect (at 0 0) (size 1.524 1.524) (drill 1.016)
       (layers *.Cu *.Mask B.SilkS)
       (net 1 /CS_DIS)
     )
   )
 
-  (module SIL-1 (layer B.Cu) (tedit 54A882E1) (tstamp 54A84B24)
+  (module SIL-1 (layer B.Cu) (tedit 54A88DD5) (tstamp 54A84B24)
     (at 217.17 143.51)
     (descr "Connecteurs 1 pin")
     (tags "CONN DEV")
@@ -205,13 +205,13 @@
     (fp_line (start -1.27 1.27) (end 1.27 1.27) (layer B.SilkS) (width 0.3175))
     (fp_line (start -1.27 -1.27) (end -1.27 1.27) (layer B.SilkS) (width 0.3048))
     (fp_line (start 1.27 1.27) (end 1.27 -1.27) (layer B.SilkS) (width 0.3048))
-    (pad 1 thru_hole rect (at 0 0) (size 1.397 1.397) (drill 0.8128)
+    (pad 1 thru_hole rect (at 0 0) (size 1.524 1.524) (drill 1.016)
       (layers *.Cu *.Mask B.SilkS)
       (net 10 N-000001)
     )
   )
 
-  (module SIL-1 (layer B.Cu) (tedit 54A882CA) (tstamp 54A84B2D)
+  (module SIL-1 (layer B.Cu) (tedit 54A88DCA) (tstamp 54A84B2D)
     (at 217.17 146.05)
     (descr "Connecteurs 1 pin")
     (tags "CONN DEV")
@@ -226,9 +226,9 @@
     (fp_line (start -1.27 1.27) (end 1.27 1.27) (layer B.SilkS) (width 0.3175))
     (fp_line (start -1.27 -1.27) (end -1.27 1.27) (layer B.SilkS) (width 0.3048))
     (fp_line (start 1.27 1.27) (end 1.27 -1.27) (layer B.SilkS) (width 0.3048))
-    (pad 1 thru_hole rect (at 0 0) (size 1.397 1.397) (drill 0.8128)
+    (pad 1 thru_hole rect (at 0 0) (size 1.524 1.524) (drill 1.016)
       (layers *.Cu *.Mask B.SilkS)
-      (net 12 N-000004)
+      (net 12 N-000005)
     )
   )
 
@@ -530,7 +530,7 @@
     (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906))
     (pad 1 smd rect (at -0.9525 0 90) (size 0.889 1.397)
       (layers F.Cu F.Paste F.Mask)
-      (net 11 N-000003)
+      (net 11 N-000004)
     )
     (pad 2 smd rect (at 0.9525 0 90) (size 0.889 1.397)
       (layers F.Cu F.Paste F.Mask)
@@ -562,7 +562,7 @@
     (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906))
     (pad 1 smd rect (at -0.9525 0) (size 0.889 1.397)
       (layers F.Cu F.Paste F.Mask)
-      (net 12 N-000004)
+      (net 12 N-000005)
     )
     (pad 2 smd rect (at 0.9525 0) (size 0.889 1.397)
       (layers F.Cu F.Paste F.Mask)
@@ -703,8 +703,8 @@
     )
   )
 
-  (module SIL-2 (layer F.Cu) (tedit 54A88496) (tstamp 54A84B84)
-    (at 242.443 154.559 270)
+  (module SIL-2 (layer F.Cu) (tedit 54A88DA8) (tstamp 54A84B84)
+    (at 242.57 154.94 270)
     (descr "Connecteurs 2 pins")
     (tags "CONN DEV")
     (path /5449A1BA)
@@ -718,17 +718,17 @@
     (fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer F.SilkS) (width 0.3048))
     (fp_line (start 2.54 -1.27) (end 2.54 1.27) (layer F.SilkS) (width 0.3048))
     (fp_line (start 2.54 1.27) (end -2.54 1.27) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole rect (at -1.27 0 270) (size 1.397 1.397) (drill 0.8128)
+    (pad 1 thru_hole rect (at -1.27 0 270) (size 1.524 1.524) (drill 1.016)
       (layers *.Cu *.Mask F.SilkS)
       (net 6 /O1)
     )
-    (pad 2 thru_hole circle (at 1.27 0 270) (size 1.397 1.397) (drill 0.8128)
+    (pad 2 thru_hole circle (at 1.27 0 270) (size 1.524 1.524) (drill 1.016)
       (layers *.Cu *.Mask F.SilkS)
       (net 9 GND)
     )
   )
 
-  (module SIL-2 (layer F.Cu) (tedit 54A884A1) (tstamp 54A84BDB)
+  (module SIL-2 (layer F.Cu) (tedit 54A88D91) (tstamp 54A84BDB)
     (at 242.57 144.78 270)
     (descr "Connecteurs 2 pins")
     (tags "CONN DEV")
@@ -743,16 +743,64 @@
     (fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer F.SilkS) (width 0.3048))
     (fp_line (start 2.54 -1.27) (end 2.54 1.27) (layer F.SilkS) (width 0.3048))
     (fp_line (start 2.54 1.27) (end -2.54 1.27) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole rect (at -1.27 0 270) (size 1.397 1.397) (drill 0.8128)
+    (pad 1 thru_hole rect (at -1.27 0 270) (size 1.524 1.524) (drill 1.016)
       (layers *.Cu *.Mask F.SilkS)
       (net 8 /VCC)
     )
-    (pad 2 thru_hole circle (at 1.27 0 270) (size 1.397 1.397) (drill 0.8128)
+    (pad 2 thru_hole circle (at 1.27 0 270) (size 1.524 1.524) (drill 1.016)
       (layers *.Cu *.Mask F.SilkS)
       (net 7 /O2)
     )
   )
 
+  (module SIL-5 (layer B.Cu) (tedit 54A88E07) (tstamp 54A8BEBD)
+    (at 231.775 156.21)
+    (descr "Connecteur 5 pins")
+    (tags "CONN DEV")
+    (path /54A88BBE)
+    (fp_text reference P104 (at -6.35 -1.905) (layer B.SilkS)
+      (effects (font (size 0.762 0.762) (thickness 0.1905)) (justify mirror))
+    )
+    (fp_text value CONN_5 (at 0 2.54) (layer B.SilkS) hide
+      (effects (font (size 1.524 1.016) (thickness 0.3048)) (justify mirror))
+    )
+    (fp_line (start -7.62 -1.27) (end -7.62 1.27) (layer B.SilkS) (width 0.3048))
+    (fp_line (start -7.62 1.27) (end 5.08 1.27) (layer B.SilkS) (width 0.3048))
+    (fp_line (start 5.08 1.27) (end 5.08 -1.27) (layer B.SilkS) (width 0.3048))
+    (fp_line (start 5.08 -1.27) (end -7.62 -1.27) (layer B.SilkS) (width 0.3048))
+    (fp_line (start -5.08 -1.27) (end -5.08 1.27) (layer B.SilkS) (width 0.3048))
+    (pad 1 thru_hole rect (at -6.35 0) (size 1.524 1.524) (drill 1.016)
+      (layers *.Cu *.Mask B.SilkS)
+    )
+    (pad 2 thru_hole circle (at -3.81 0) (size 1.524 1.524) (drill 1.016)
+      (layers *.Cu *.Mask B.SilkS)
+    )
+    (pad 3 thru_hole circle (at -1.27 0) (size 1.524 1.524) (drill 1.016)
+      (layers *.Cu *.Mask B.SilkS)
+    )
+    (pad 4 thru_hole circle (at 1.27 0) (size 1.524 1.524) (drill 1.016)
+      (layers *.Cu *.Mask B.SilkS)
+    )
+    (pad 5 thru_hole circle (at 3.81 0) (size 1.524 1.524) (drill 1.016)
+      (layers *.Cu *.Mask B.SilkS)
+    )
+  )
+
+  (dimension 16.51 (width 0.3) (layer Dwgs.User)
+    (gr_text "0.6500 in" (at 212.645 149.225 90) (layer Dwgs.User)
+      (effects (font (size 1.5 1.5) (thickness 0.3)))
+    )
+    (feature1 (pts (xy 215.265 140.97) (xy 211.295 140.97)))
+    (feature2 (pts (xy 215.265 157.48) (xy 211.295 157.48)))
+    (crossbar (pts (xy 213.995 157.48) (xy 213.995 140.97)))
+    (arrow1a (pts (xy 213.995 140.97) (xy 214.58142 142.096503)))
+    (arrow1b (pts (xy 213.995 140.97) (xy 213.40858 142.096503)))
+    (arrow2a (pts (xy 213.995 157.48) (xy 214.58142 156.353497)))
+    (arrow2b (pts (xy 213.995 157.48) (xy 213.40858 156.353497)))
+  )
+  (gr_line (start 215.9 156.845) (end 215.9 157.48) (angle 90) (layer Edge.Cuts) (width 0.1))
+  (gr_line (start 243.84 157.48) (end 215.9 157.48) (angle 90) (layer Edge.Cuts) (width 0.1))
+  (gr_line (start 243.84 156.845) (end 243.84 157.48) (angle 90) (layer Edge.Cuts) (width 0.1))
   (gr_text CS (at 219.456 154.813) (layer B.SilkS)
     (effects (font (size 0.762 0.762) (thickness 0.127)) (justify mirror))
   )
@@ -765,18 +813,6 @@
   (gr_text IN2 (at 219.583 147.066) (layer B.SilkS)
     (effects (font (size 0.762 0.762) (thickness 0.127)) (justify mirror))
   )
-  (dimension 15.875 (width 0.3) (layer Dwgs.User)
-    (gr_text "0.6250 in" (at 213.28 148.9075 90) (layer Dwgs.User)
-      (effects (font (size 1.5 1.5) (thickness 0.3)))
-    )
-    (feature1 (pts (xy 215.265 140.97) (xy 211.93 140.97)))
-    (feature2 (pts (xy 215.265 156.845) (xy 211.93 156.845)))
-    (crossbar (pts (xy 214.63 156.845) (xy 214.63 140.97)))
-    (arrow1a (pts (xy 214.63 140.97) (xy 215.21642 142.096503)))
-    (arrow1b (pts (xy 214.63 140.97) (xy 214.04358 142.096503)))
-    (arrow2a (pts (xy 214.63 156.845) (xy 215.21642 155.718497)))
-    (arrow2b (pts (xy 214.63 156.845) (xy 214.04358 155.718497)))
-  )
   (dimension 27.94 (width 0.3) (layer Dwgs.User)
     (gr_text "1.1000 in" (at 229.87 160.099999) (layer Dwgs.User)
       (effects (font (size 1.5 1.5) (thickness 0.3)))
@@ -792,7 +828,7 @@
   (gr_line (start 243.84 156.845) (end 243.84 140.97) (angle 90) (layer Edge.Cuts) (width 0.1))
   (gr_line (start 215.9 156.845) (end 215.9 140.97) (angle 90) (layer Edge.Cuts) (width 0.1))
   (gr_line (start 215.9 140.97) (end 243.84 140.97) (angle 90) (layer Edge.Cuts) (width 0.1))
-  (gr_line (start 215.9 156.845) (end 243.84 156.845) (angle 90) (layer Edge.Cuts) (width 0.1))
+  (gr_line (start 215.9 157.48) (end 243.84 157.48) (angle 90) (layer Edge.Cuts) (width 0.1))
   (gr_text "R0.1\nAlt_breakout" (at 231.14 142.24) (layer B.SilkS)
     (effects (font (size 1.016 1.016) (thickness 0.127)) (justify mirror))
   )
@@ -800,11 +836,14 @@
     (effects (font (size 1.016 1.016) (thickness 0.2032)) (justify mirror))
   )
 
+  (segment (start 222.885 153.9875) (end 221.9325 153.9875) (width 0.3048) (layer F.Cu) (net 1))
+  (segment (start 217.17 155.575) (end 217.17 156.21) (width 0.3048) (layer F.Cu) (net 1) (tstamp 54A8BEAC))
+  (segment (start 219.075 153.67) (end 217.17 155.575) (width 0.3048) (layer F.Cu) (net 1) (tstamp 54A8BEAB))
+  (segment (start 221.615 153.67) (end 219.075 153.67) (width 0.3048) (layer F.Cu) (net 1) (tstamp 54A8BEAA))
+  (segment (start 221.9325 153.9875) (end 221.615 153.67) (width 0.3048) (layer F.Cu) (net 1) (tstamp 54A8BEA9))
   (segment (start 225.5725 153.46) (end 224.492 153.46) (width 0.3048) (layer F.Cu) (net 1))
   (segment (start 223.9645 153.9875) (end 222.885 153.9875) (width 0.3048) (layer F.Cu) (net 1) (tstamp 54A88223))
   (segment (start 224.492 153.46) (end 223.9645 153.9875) (width 0.3048) (layer F.Cu) (net 1) (tstamp 54A88220))
-  (segment (start 217.17 153.67) (end 222.5675 153.67) (width 0.3048) (layer F.Cu) (net 1))
-  (segment (start 222.5675 153.67) (end 222.885 153.9875) (width 0.3048) (layer F.Cu) (net 1) (tstamp 54A881DE))
   (segment (start 225.5725 151.06) (end 223.7675 151.06) (width 0.3048) (layer F.Cu) (net 2))
   (segment (start 223.7675 151.06) (end 222.885 150.1775) (width 0.3048) (layer F.Cu) (net 2) (tstamp 54A8823C))
   (segment (start 225.5725 152.66) (end 224.403 152.66) (width 0.3048) (layer F.Cu) (net 3))
@@ -1019,60 +1058,73 @@
     )
     (filled_polygon
       (pts
-        (xy 243.409 155.443462) (xy 243.356609 155.409305) (xy 242.936914 155.829) (xy 242.973506 155.865593) (xy 242.862695 155.976405)
-        (xy 242.862695 154.915391) (xy 242.773962 154.779291) (xy 242.347063 154.732542) (xy 242.112038 154.779291) (xy 242.023305 154.915391)
-        (xy 242.443 155.335086) (xy 242.862695 154.915391) (xy 242.862695 155.976405) (xy 242.479593 156.359507) (xy 242.443 156.322914)
-        (xy 242.406407 156.359507) (xy 241.949086 155.902186) (xy 241.912492 155.865592) (xy 241.949086 155.829) (xy 241.529391 155.409305)
-        (xy 241.393291 155.498038) (xy 241.346542 155.924937) (xy 241.393291 156.159962) (xy 241.502208 156.230973) (xy 241.397075 156.336107)
-        (xy 241.474967 156.414) (xy 234.505643 156.414) (xy 234.505643 154.141518) (xy 234.380233 153.838002) (xy 234.212434 153.66991)
-        (xy 234.379417 153.503219) (xy 234.505357 153.199923) (xy 234.505643 152.871518) (xy 234.380233 152.568002) (xy 234.212434 152.39991)
-        (xy 234.379417 152.233219) (xy 234.505357 151.929923) (xy 234.505643 151.601518) (xy 234.380233 151.298002) (xy 234.212434 151.12991)
-        (xy 234.379417 150.963219) (xy 234.505357 150.659923) (xy 234.505643 150.331518) (xy 234.380233 150.028002) (xy 234.212434 149.85991)
-        (xy 234.379417 149.693219) (xy 234.505357 149.389923) (xy 234.505643 149.061518) (xy 234.380233 148.758002) (xy 234.212434 148.58991)
-        (xy 234.379417 148.423219) (xy 234.505357 148.119923) (xy 234.505643 147.791518) (xy 234.380233 147.488002) (xy 234.212434 147.31991)
-        (xy 234.379417 147.153219) (xy 234.505357 146.849923) (xy 234.505643 146.521518) (xy 234.380233 146.218002) (xy 234.212434 146.04991)
-        (xy 234.379417 145.883219) (xy 234.505357 145.579923) (xy 234.505643 145.251518) (xy 234.380233 144.948002) (xy 234.148219 144.715583)
-        (xy 233.844923 144.589643) (xy 233.516518 144.589357) (xy 233.213002 144.714767) (xy 233.04491 144.882565) (xy 232.878219 144.715583)
-        (xy 232.574923 144.589643) (xy 232.246518 144.589357) (xy 231.943002 144.714767) (xy 231.775877 144.8816) (xy 231.773946 144.8816)
-        (xy 231.608219 144.715583) (xy 231.304923 144.589643) (xy 230.976518 144.589357) (xy 230.673002 144.714767) (xy 230.50491 144.882565)
-        (xy 230.338219 144.715583) (xy 230.034923 144.589643) (xy 229.706518 144.589357) (xy 229.403002 144.714767) (xy 229.235877 144.8816)
-        (xy 229.233946 144.8816) (xy 229.068219 144.715583) (xy 228.764923 144.589643) (xy 228.436518 144.589357) (xy 228.133002 144.714767)
-        (xy 227.900583 144.946781) (xy 227.781968 145.232434) (xy 227.498002 145.349767) (xy 227.265583 145.581781) (xy 227.139643 145.885077)
-        (xy 227.139357 146.213482) (xy 227.264767 146.516998) (xy 227.432565 146.685089) (xy 227.265583 146.851781) (xy 227.139643 147.155077)
-        (xy 227.139357 147.483482) (xy 227.264767 147.786998) (xy 227.432565 147.955089) (xy 227.265583 148.121781) (xy 227.139643 148.425077)
-        (xy 227.139357 148.753482) (xy 227.264767 149.056998) (xy 227.432565 149.225089) (xy 227.265583 149.391781) (xy 227.139643 149.695077)
-        (xy 227.139357 150.023482) (xy 227.264767 150.326998) (xy 227.432565 150.495089) (xy 227.265583 150.661781) (xy 227.139643 150.965077)
-        (xy 227.139357 151.293482) (xy 227.264767 151.596998) (xy 227.432565 151.765089) (xy 227.265583 151.931781) (xy 227.139643 152.235077)
-        (xy 227.139357 152.563482) (xy 227.264767 152.866998) (xy 227.432565 153.035089) (xy 227.265583 153.201781) (xy 227.139643 153.505077)
-        (xy 227.139357 153.833482) (xy 227.264767 154.136998) (xy 227.496781 154.369417) (xy 227.782434 154.488031) (xy 227.899767 154.771998)
-        (xy 228.131781 155.004417) (xy 228.435077 155.130357) (xy 228.763482 155.130643) (xy 229.066998 155.005233) (xy 229.234122 154.8384)
-        (xy 229.236053 154.8384) (xy 229.401781 155.004417) (xy 229.705077 155.130357) (xy 230.033482 155.130643) (xy 230.336998 155.005233)
-        (xy 230.505089 154.837434) (xy 230.671781 155.004417) (xy 230.975077 155.130357) (xy 231.303482 155.130643) (xy 231.606998 155.005233)
-        (xy 231.774122 154.8384) (xy 231.776053 154.8384) (xy 231.941781 155.004417) (xy 232.245077 155.130357) (xy 232.573482 155.130643)
-        (xy 232.876998 155.005233) (xy 233.045089 154.837434) (xy 233.211781 155.004417) (xy 233.515077 155.130357) (xy 233.843482 155.130643)
-        (xy 234.146998 155.005233) (xy 234.379417 154.773219) (xy 234.505357 154.469923) (xy 234.505643 154.141518) (xy 234.505643 156.414)
-        (xy 216.331 156.414) (xy 216.331 154.7227) (xy 216.395382 154.749434) (xy 216.546953 154.749566) (xy 217.943953 154.749566)
-        (xy 218.084037 154.691684) (xy 218.191308 154.584601) (xy 218.249434 154.444618) (xy 218.249566 154.293047) (xy 218.249566 152.896047)
-        (xy 218.191684 152.755963) (xy 218.084601 152.648692) (xy 217.944618 152.590566) (xy 217.793047 152.590434) (xy 216.396047 152.590434)
-        (xy 216.331 152.617311) (xy 216.331 152.1827) (xy 216.395382 152.209434) (xy 216.546953 152.209566) (xy 217.943953 152.209566)
-        (xy 218.084037 152.151684) (xy 218.191308 152.044601) (xy 218.249434 151.904618) (xy 218.249566 151.753047) (xy 218.249566 150.356047)
-        (xy 218.191684 150.215963) (xy 218.084601 150.108692) (xy 217.944618 150.050566) (xy 217.793047 150.050434) (xy 216.396047 150.050434)
-        (xy 216.331 150.077311) (xy 216.331 147.1027) (xy 216.395382 147.129434) (xy 216.546953 147.129566) (xy 217.943953 147.129566)
-        (xy 218.084037 147.071684) (xy 218.191308 146.964601) (xy 218.249434 146.824618) (xy 218.249566 146.673047) (xy 218.249566 145.276047)
-        (xy 218.191684 145.135963) (xy 218.084601 145.028692) (xy 217.944618 144.970566) (xy 217.793047 144.970434) (xy 216.396047 144.970434)
-        (xy 216.331 144.997311) (xy 216.331 144.5627) (xy 216.395382 144.589434) (xy 216.546953 144.589566) (xy 217.943953 144.589566)
-        (xy 218.084037 144.531684) (xy 218.191308 144.424601) (xy 218.249434 144.284618) (xy 218.249566 144.133047) (xy 218.249566 142.736047)
-        (xy 218.191684 142.595963) (xy 218.084601 142.488692) (xy 217.944618 142.430566) (xy 217.793047 142.430434) (xy 216.396047 142.430434)
-        (xy 216.331 142.457311) (xy 216.331 141.401) (xy 243.409 141.401) (xy 243.409 142.457299) (xy 243.344618 142.430566)
-        (xy 243.193047 142.430434) (xy 241.796047 142.430434) (xy 241.655963 142.488316) (xy 241.548692 142.595399) (xy 241.490566 142.735382)
-        (xy 241.490434 142.886953) (xy 241.490434 144.283953) (xy 241.548316 144.424037) (xy 241.655399 144.531308) (xy 241.795382 144.589434)
-        (xy 241.946953 144.589566) (xy 243.343953 144.589566) (xy 243.409 144.562688) (xy 243.409 145.362489) (xy 243.182286 145.135379)
-        (xy 242.785668 144.970688) (xy 242.356216 144.970314) (xy 241.959312 145.134311) (xy 241.655379 145.437714) (xy 241.490688 145.834332)
-        (xy 241.490314 146.263784) (xy 241.654311 146.660688) (xy 241.957714 146.964621) (xy 242.354332 147.129312) (xy 242.783784 147.129686)
-        (xy 243.180688 146.965689) (xy 243.409 146.737775) (xy 243.409 152.319181) (xy 243.357601 152.267692) (xy 243.217618 152.209566)
-        (xy 243.066047 152.209434) (xy 241.669047 152.209434) (xy 241.528963 152.267316) (xy 241.421692 152.374399) (xy 241.363566 152.514382)
-        (xy 241.363434 152.665953) (xy 241.363434 154.062953) (xy 241.421316 154.203037) (xy 241.528399 154.310308) (xy 241.668382 154.368434)
-        (xy 241.819953 154.368566) (xy 243.216953 154.368566) (xy 243.357037 154.310684) (xy 243.409 154.258812) (xy 243.409 155.443462)
+        (xy 243.409 157.049) (xy 242.989695 157.049) (xy 242.989695 155.296391) (xy 242.900962 155.160291) (xy 242.474063 155.113542)
+        (xy 242.239038 155.160291) (xy 242.150305 155.296391) (xy 242.57 155.716086) (xy 242.989695 155.296391) (xy 242.989695 157.049)
+        (xy 242.915086 157.049) (xy 242.57 156.703914) (xy 242.224914 157.049) (xy 242.076086 157.049) (xy 242.076086 156.21)
+        (xy 241.656391 155.790305) (xy 241.520291 155.879038) (xy 241.473542 156.305937) (xy 241.520291 156.540962) (xy 241.656391 156.629695)
+        (xy 242.076086 156.21) (xy 242.076086 157.049) (xy 236.27251 157.049) (xy 236.499621 156.822286) (xy 236.664312 156.425668)
+        (xy 236.664686 155.996216) (xy 236.500689 155.599312) (xy 236.197286 155.295379) (xy 235.800668 155.130688) (xy 235.371216 155.130314)
+        (xy 234.974312 155.294311) (xy 234.670379 155.597714) (xy 234.505688 155.994332) (xy 234.505643 156.046004) (xy 234.505643 154.141518)
+        (xy 234.380233 153.838002) (xy 234.212434 153.66991) (xy 234.379417 153.503219) (xy 234.505357 153.199923) (xy 234.505643 152.871518)
+        (xy 234.380233 152.568002) (xy 234.212434 152.39991) (xy 234.379417 152.233219) (xy 234.505357 151.929923) (xy 234.505643 151.601518)
+        (xy 234.380233 151.298002) (xy 234.212434 151.12991) (xy 234.379417 150.963219) (xy 234.505357 150.659923) (xy 234.505643 150.331518)
+        (xy 234.380233 150.028002) (xy 234.212434 149.85991) (xy 234.379417 149.693219) (xy 234.505357 149.389923) (xy 234.505643 149.061518)
+        (xy 234.380233 148.758002) (xy 234.212434 148.58991) (xy 234.379417 148.423219) (xy 234.505357 148.119923) (xy 234.505643 147.791518)
+        (xy 234.380233 147.488002) (xy 234.212434 147.31991) (xy 234.379417 147.153219) (xy 234.505357 146.849923) (xy 234.505643 146.521518)
+        (xy 234.380233 146.218002) (xy 234.212434 146.04991) (xy 234.379417 145.883219) (xy 234.505357 145.579923) (xy 234.505643 145.251518)
+        (xy 234.380233 144.948002) (xy 234.148219 144.715583) (xy 233.844923 144.589643) (xy 233.516518 144.589357) (xy 233.213002 144.714767)
+        (xy 233.04491 144.882565) (xy 232.878219 144.715583) (xy 232.574923 144.589643) (xy 232.246518 144.589357) (xy 231.943002 144.714767)
+        (xy 231.775877 144.8816) (xy 231.773946 144.8816) (xy 231.608219 144.715583) (xy 231.304923 144.589643) (xy 230.976518 144.589357)
+        (xy 230.673002 144.714767) (xy 230.50491 144.882565) (xy 230.338219 144.715583) (xy 230.034923 144.589643) (xy 229.706518 144.589357)
+        (xy 229.403002 144.714767) (xy 229.235877 144.8816) (xy 229.233946 144.8816) (xy 229.068219 144.715583) (xy 228.764923 144.589643)
+        (xy 228.436518 144.589357) (xy 228.133002 144.714767) (xy 227.900583 144.946781) (xy 227.781968 145.232434) (xy 227.498002 145.349767)
+        (xy 227.265583 145.581781) (xy 227.139643 145.885077) (xy 227.139357 146.213482) (xy 227.264767 146.516998) (xy 227.432565 146.685089)
+        (xy 227.265583 146.851781) (xy 227.139643 147.155077) (xy 227.139357 147.483482) (xy 227.264767 147.786998) (xy 227.432565 147.955089)
+        (xy 227.265583 148.121781) (xy 227.139643 148.425077) (xy 227.139357 148.753482) (xy 227.264767 149.056998) (xy 227.432565 149.225089)
+        (xy 227.265583 149.391781) (xy 227.139643 149.695077) (xy 227.139357 150.023482) (xy 227.264767 150.326998) (xy 227.432565 150.495089)
+        (xy 227.265583 150.661781) (xy 227.139643 150.965077) (xy 227.139357 151.293482) (xy 227.264767 151.596998) (xy 227.432565 151.765089)
+        (xy 227.265583 151.931781) (xy 227.139643 152.235077) (xy 227.139357 152.563482) (xy 227.264767 152.866998) (xy 227.432565 153.035089)
+        (xy 227.265583 153.201781) (xy 227.139643 153.505077) (xy 227.139357 153.833482) (xy 227.264767 154.136998) (xy 227.496781 154.369417)
+        (xy 227.782434 154.488031) (xy 227.899767 154.771998) (xy 228.131781 155.004417) (xy 228.435077 155.130357) (xy 228.763482 155.130643)
+        (xy 229.066998 155.005233) (xy 229.234122 154.8384) (xy 229.236053 154.8384) (xy 229.401781 155.004417) (xy 229.705077 155.130357)
+        (xy 230.033482 155.130643) (xy 230.336998 155.005233) (xy 230.505089 154.837434) (xy 230.671781 155.004417) (xy 230.975077 155.130357)
+        (xy 231.303482 155.130643) (xy 231.606998 155.005233) (xy 231.774122 154.8384) (xy 231.776053 154.8384) (xy 231.941781 155.004417)
+        (xy 232.245077 155.130357) (xy 232.573482 155.130643) (xy 232.876998 155.005233) (xy 233.045089 154.837434) (xy 233.211781 155.004417)
+        (xy 233.515077 155.130357) (xy 233.843482 155.130643) (xy 234.146998 155.005233) (xy 234.379417 154.773219) (xy 234.505357 154.469923)
+        (xy 234.505643 154.141518) (xy 234.505643 156.046004) (xy 234.505314 156.423784) (xy 234.669311 156.820688) (xy 234.897224 157.049)
+        (xy 233.73251 157.049) (xy 233.959621 156.822286) (xy 234.124312 156.425668) (xy 234.124686 155.996216) (xy 233.960689 155.599312)
+        (xy 233.657286 155.295379) (xy 233.260668 155.130688) (xy 232.831216 155.130314) (xy 232.434312 155.294311) (xy 232.130379 155.597714)
+        (xy 231.965688 155.994332) (xy 231.965314 156.423784) (xy 232.129311 156.820688) (xy 232.357224 157.049) (xy 231.19251 157.049)
+        (xy 231.419621 156.822286) (xy 231.584312 156.425668) (xy 231.584686 155.996216) (xy 231.420689 155.599312) (xy 231.117286 155.295379)
+        (xy 230.720668 155.130688) (xy 230.291216 155.130314) (xy 229.894312 155.294311) (xy 229.590379 155.597714) (xy 229.425688 155.994332)
+        (xy 229.425314 156.423784) (xy 229.589311 156.820688) (xy 229.817224 157.049) (xy 228.65251 157.049) (xy 228.879621 156.822286)
+        (xy 229.044312 156.425668) (xy 229.044686 155.996216) (xy 228.880689 155.599312) (xy 228.577286 155.295379) (xy 228.180668 155.130688)
+        (xy 227.751216 155.130314) (xy 227.354312 155.294311) (xy 227.050379 155.597714) (xy 226.885688 155.994332) (xy 226.885314 156.423784)
+        (xy 227.049311 156.820688) (xy 227.277224 157.049) (xy 226.4777 157.049) (xy 226.504434 156.984618) (xy 226.504566 156.833047)
+        (xy 226.504566 155.436047) (xy 226.446684 155.295963) (xy 226.339601 155.188692) (xy 226.199618 155.130566) (xy 226.048047 155.130434)
+        (xy 224.651047 155.130434) (xy 224.510963 155.188316) (xy 224.403692 155.295399) (xy 224.345566 155.435382) (xy 224.345434 155.586953)
+        (xy 224.345434 156.983953) (xy 224.372311 157.049) (xy 218.2227 157.049) (xy 218.249434 156.984618) (xy 218.249566 156.833047)
+        (xy 218.249566 155.436047) (xy 218.191684 155.295963) (xy 218.084601 155.188692) (xy 217.944618 155.130566) (xy 217.793047 155.130434)
+        (xy 216.396047 155.130434) (xy 216.331 155.157311) (xy 216.331 152.1827) (xy 216.395382 152.209434) (xy 216.546953 152.209566)
+        (xy 217.943953 152.209566) (xy 218.084037 152.151684) (xy 218.191308 152.044601) (xy 218.249434 151.904618) (xy 218.249566 151.753047)
+        (xy 218.249566 150.356047) (xy 218.191684 150.215963) (xy 218.084601 150.108692) (xy 217.944618 150.050566) (xy 217.793047 150.050434)
+        (xy 216.396047 150.050434) (xy 216.331 150.077311) (xy 216.331 147.1027) (xy 216.395382 147.129434) (xy 216.546953 147.129566)
+        (xy 217.943953 147.129566) (xy 218.084037 147.071684) (xy 218.191308 146.964601) (xy 218.249434 146.824618) (xy 218.249566 146.673047)
+        (xy 218.249566 145.276047) (xy 218.191684 145.135963) (xy 218.084601 145.028692) (xy 217.944618 144.970566) (xy 217.793047 144.970434)
+        (xy 216.396047 144.970434) (xy 216.331 144.997311) (xy 216.331 144.5627) (xy 216.395382 144.589434) (xy 216.546953 144.589566)
+        (xy 217.943953 144.589566) (xy 218.084037 144.531684) (xy 218.191308 144.424601) (xy 218.249434 144.284618) (xy 218.249566 144.133047)
+        (xy 218.249566 142.736047) (xy 218.191684 142.595963) (xy 218.084601 142.488692) (xy 217.944618 142.430566) (xy 217.793047 142.430434)
+        (xy 216.396047 142.430434) (xy 216.331 142.457311) (xy 216.331 141.401) (xy 243.409 141.401) (xy 243.409 142.457299)
+        (xy 243.344618 142.430566) (xy 243.193047 142.430434) (xy 241.796047 142.430434) (xy 241.655963 142.488316) (xy 241.548692 142.595399)
+        (xy 241.490566 142.735382) (xy 241.490434 142.886953) (xy 241.490434 144.283953) (xy 241.548316 144.424037) (xy 241.655399 144.531308)
+        (xy 241.795382 144.589434) (xy 241.946953 144.589566) (xy 243.343953 144.589566) (xy 243.409 144.562688) (xy 243.409 145.362489)
+        (xy 243.182286 145.135379) (xy 242.785668 144.970688) (xy 242.356216 144.970314) (xy 241.959312 145.134311) (xy 241.655379 145.437714)
+        (xy 241.490688 145.834332) (xy 241.490314 146.263784) (xy 241.654311 146.660688) (xy 241.957714 146.964621) (xy 242.354332 147.129312)
+        (xy 242.783784 147.129686) (xy 243.180688 146.965689) (xy 243.409 146.737775) (xy 243.409 152.617299) (xy 243.344618 152.590566)
+        (xy 243.193047 152.590434) (xy 241.796047 152.590434) (xy 241.655963 152.648316) (xy 241.548692 152.755399) (xy 241.490566 152.895382)
+        (xy 241.490434 153.046953) (xy 241.490434 154.443953) (xy 241.548316 154.584037) (xy 241.655399 154.691308) (xy 241.795382 154.749434)
+        (xy 241.946953 154.749566) (xy 243.343953 154.749566) (xy 243.409 154.722688) (xy 243.409 155.864914) (xy 243.063914 156.21)
+        (xy 243.409 156.555086) (xy 243.409 156.845) (xy 243.409 157.049)
       )
     )
   )
@@ -1101,52 +1153,67 @@
         (xy 237.584727 143.523904) (xy 237.444643 143.581786) (xy 237.337372 143.688869) (xy 237.279246 143.828852) (xy 237.279114 143.980423)
         (xy 237.279114 144.407419) (xy 237.150002 144.460767) (xy 236.957433 144.653) (xy 234.188 144.653) (xy 234.188 155.067)
         (xy 236.830433 155.067) (xy 236.790583 155.106781) (xy 236.664643 155.410077) (xy 236.664357 155.738482) (xy 236.789767 156.041998)
-        (xy 237.021781 156.274417) (xy 237.279114 156.381271) (xy 237.279114 156.414) (xy 233.486066 156.414) (xy 233.486066 153.534547)
-        (xy 233.486066 146.185453) (xy 233.485934 146.033882) (xy 233.427808 145.893899) (xy 233.320537 145.786816) (xy 233.180453 145.728934)
-        (xy 232.650096 145.728949) (xy 232.650096 143.391367) (xy 232.65003 142.84325) (xy 232.55478 142.748) (xy 231.7496 142.748)
-        (xy 231.7496 143.75257) (xy 231.84485 143.84782) (xy 232.344483 143.847886) (xy 232.484567 143.790004) (xy 232.591838 143.682921)
-        (xy 232.649964 143.542938) (xy 232.650096 143.391367) (xy 232.650096 145.728949) (xy 230.9876 145.728999) (xy 230.9876 143.75257)
-        (xy 230.9876 142.748) (xy 230.18242 142.748) (xy 230.08717 142.84325) (xy 230.087104 143.391367) (xy 230.087236 143.542938)
-        (xy 230.145362 143.682921) (xy 230.252633 143.790004) (xy 230.392717 143.847886) (xy 230.89235 143.84782) (xy 230.9876 143.75257)
-        (xy 230.9876 145.728999) (xy 230.98125 145.729) (xy 230.886 145.82425) (xy 230.886 149.479) (xy 233.39075 149.479)
-        (xy 233.486 149.38375) (xy 233.486066 146.185453) (xy 233.486066 153.534547) (xy 233.486 150.33625) (xy 233.39075 150.241)
-        (xy 230.886 150.241) (xy 230.886 153.89575) (xy 230.98125 153.991) (xy 233.180453 153.991066) (xy 233.320537 153.933184)
-        (xy 233.427808 153.826101) (xy 233.485934 153.686118) (xy 233.486066 153.534547) (xy 233.486066 156.414) (xy 230.124 156.414)
+        (xy 237.021781 156.274417) (xy 237.279114 156.381271) (xy 237.279114 156.652483) (xy 237.336996 156.792567) (xy 237.444079 156.899838)
+        (xy 237.584062 156.957964) (xy 237.735633 156.958096) (xy 239.935273 156.958096) (xy 240.075357 156.900214) (xy 240.182628 156.793131)
+        (xy 240.240754 156.653148) (xy 240.240886 156.501577) (xy 240.240886 156.3624) (xy 241.490367 156.3624) (xy 241.490314 156.423784)
+        (xy 241.654311 156.820688) (xy 241.882224 157.049) (xy 236.27251 157.049) (xy 236.499621 156.822286) (xy 236.664312 156.425668)
+        (xy 236.664686 155.996216) (xy 236.500689 155.599312) (xy 236.197286 155.295379) (xy 235.800668 155.130688) (xy 235.371216 155.130314)
+        (xy 234.974312 155.294311) (xy 234.670379 155.597714) (xy 234.505688 155.994332) (xy 234.505314 156.423784) (xy 234.669311 156.820688)
+        (xy 234.897224 157.049) (xy 233.73251 157.049) (xy 233.959621 156.822286) (xy 234.124312 156.425668) (xy 234.124686 155.996216)
+        (xy 233.960689 155.599312) (xy 233.657286 155.295379) (xy 233.486066 155.224281) (xy 233.486066 153.534547) (xy 233.486066 146.185453)
+        (xy 233.485934 146.033882) (xy 233.427808 145.893899) (xy 233.320537 145.786816) (xy 233.180453 145.728934) (xy 232.650096 145.728949)
+        (xy 232.650096 143.391367) (xy 232.65003 142.84325) (xy 232.55478 142.748) (xy 231.7496 142.748) (xy 231.7496 143.75257)
+        (xy 231.84485 143.84782) (xy 232.344483 143.847886) (xy 232.484567 143.790004) (xy 232.591838 143.682921) (xy 232.649964 143.542938)
+        (xy 232.650096 143.391367) (xy 232.650096 145.728949) (xy 230.9876 145.728999) (xy 230.9876 143.75257) (xy 230.9876 142.748)
+        (xy 230.18242 142.748) (xy 230.08717 142.84325) (xy 230.087104 143.391367) (xy 230.087236 143.542938) (xy 230.145362 143.682921)
+        (xy 230.252633 143.790004) (xy 230.392717 143.847886) (xy 230.89235 143.84782) (xy 230.9876 143.75257) (xy 230.9876 145.728999)
+        (xy 230.98125 145.729) (xy 230.886 145.82425) (xy 230.886 149.479) (xy 233.39075 149.479) (xy 233.486 149.38375)
+        (xy 233.486066 146.185453) (xy 233.486066 153.534547) (xy 233.486 150.33625) (xy 233.39075 150.241) (xy 230.886 150.241)
+        (xy 230.886 153.89575) (xy 230.98125 153.991) (xy 233.180453 153.991066) (xy 233.320537 153.933184) (xy 233.427808 153.826101)
+        (xy 233.485934 153.686118) (xy 233.486066 153.534547) (xy 233.486066 155.224281) (xy 233.260668 155.130688) (xy 232.831216 155.130314)
+        (xy 232.434312 155.294311) (xy 232.130379 155.597714) (xy 231.965688 155.994332) (xy 231.965314 156.423784) (xy 232.129311 156.820688)
+        (xy 232.357224 157.049) (xy 231.19251 157.049) (xy 231.419621 156.822286) (xy 231.584312 156.425668) (xy 231.584686 155.996216)
+        (xy 231.420689 155.599312) (xy 231.117286 155.295379) (xy 230.720668 155.130688) (xy 230.291216 155.130314) (xy 230.124 155.199406)
         (xy 230.124 153.89575) (xy 230.124 150.241) (xy 230.124 149.479) (xy 230.124 145.82425) (xy 230.02875 145.729)
         (xy 227.829547 145.728934) (xy 227.689463 145.786816) (xy 227.582192 145.893899) (xy 227.524066 146.033882) (xy 227.523934 146.185453)
         (xy 227.524 149.38375) (xy 227.61925 149.479) (xy 230.124 149.479) (xy 230.124 150.241) (xy 227.61925 150.241)
         (xy 227.524 150.33625) (xy 227.523934 153.534547) (xy 227.524066 153.686118) (xy 227.582192 153.826101) (xy 227.689463 153.933184)
-        (xy 227.829547 153.991066) (xy 230.02875 153.991) (xy 230.124 153.89575) (xy 230.124 156.414) (xy 226.803566 156.414)
+        (xy 227.829547 153.991066) (xy 230.02875 153.991) (xy 230.124 153.89575) (xy 230.124 155.199406) (xy 229.894312 155.294311)
+        (xy 229.590379 155.597714) (xy 229.425688 155.994332) (xy 229.425314 156.423784) (xy 229.589311 156.820688) (xy 229.817224 157.049)
+        (xy 228.65251 157.049) (xy 228.879621 156.822286) (xy 229.044312 156.425668) (xy 229.044686 155.996216) (xy 228.880689 155.599312)
+        (xy 228.577286 155.295379) (xy 228.180668 155.130688) (xy 227.751216 155.130314) (xy 227.354312 155.294311) (xy 227.050379 155.597714)
+        (xy 226.885688 155.994332) (xy 226.885314 156.423784) (xy 227.049311 156.820688) (xy 227.277224 157.049) (xy 226.803566 157.049)
         (xy 226.803566 154.459547) (xy 226.8035 154.49275) (xy 226.70825 154.3975) (xy 225.9535 154.3975) (xy 225.9535 154.82075)
         (xy 226.04875 154.916) (xy 226.497953 154.916066) (xy 226.638037 154.858184) (xy 226.745308 154.751101) (xy 226.803434 154.611118)
-        (xy 226.803566 154.459547) (xy 226.803566 156.414) (xy 224.917 156.414) (xy 224.917 154.916026) (xy 225.09625 154.916)
-        (xy 225.1915 154.82075) (xy 225.1915 154.3975) (xy 225.1715 154.3975) (xy 225.1715 154.1225) (xy 225.1915 154.1225)
-        (xy 225.1915 154.116066) (xy 225.9535 154.116066) (xy 225.9535 154.1225) (xy 226.70825 154.1225) (xy 226.8035 154.02725)
-        (xy 226.803566 154.060453) (xy 226.803434 153.908882) (xy 226.783136 153.86) (xy 226.803434 153.811118) (xy 226.803566 153.659547)
-        (xy 226.803566 153.109547) (xy 226.783114 153.060051) (xy 226.803434 153.011118) (xy 226.803566 152.859547) (xy 226.803566 152.309547)
-        (xy 226.783114 152.260051) (xy 226.803434 152.211118) (xy 226.803566 152.059547) (xy 226.803566 151.509547) (xy 226.783114 151.460051)
-        (xy 226.803434 151.411118) (xy 226.803566 151.259547) (xy 226.803566 150.709547) (xy 226.783114 150.660051) (xy 226.803434 150.611118)
-        (xy 226.803566 150.459547) (xy 226.803566 149.909547) (xy 226.783114 149.860051) (xy 226.803434 149.811118) (xy 226.803566 149.659547)
-        (xy 226.803566 149.109547) (xy 226.783114 149.060051) (xy 226.803434 149.011118) (xy 226.803566 148.859547) (xy 226.803566 148.309547)
-        (xy 226.783114 148.260051) (xy 226.803434 148.211118) (xy 226.803566 148.059547) (xy 226.803566 147.509547) (xy 226.783114 147.460051)
-        (xy 226.803434 147.411118) (xy 226.803566 147.259547) (xy 226.803566 146.709547) (xy 226.783114 146.660051) (xy 226.803434 146.611118)
-        (xy 226.803566 146.459547) (xy 226.803566 145.909547) (xy 226.783114 145.860051) (xy 226.803434 145.811118) (xy 226.803566 145.659547)
-        (xy 226.803566 145.260453) (xy 226.803434 145.108882) (xy 226.745308 144.968899) (xy 226.638037 144.861816) (xy 226.497953 144.803934)
-        (xy 226.04875 144.804) (xy 225.9535 144.89925) (xy 225.9535 145.3225) (xy 226.70825 145.3225) (xy 226.8035 145.22725)
-        (xy 226.803566 145.260453) (xy 226.803566 145.659547) (xy 226.8035 145.69275) (xy 226.70825 145.5975) (xy 225.9535 145.5975)
-        (xy 225.9535 145.603934) (xy 225.1915 145.603934) (xy 225.1915 145.5975) (xy 225.1715 145.5975) (xy 225.1715 145.3225)
-        (xy 225.1915 145.3225) (xy 225.1915 144.89925) (xy 225.09625 144.804) (xy 224.917 144.803973) (xy 224.917 141.401)
-        (xy 226.073904 141.401) (xy 226.073904 141.414511) (xy 225.896518 141.414357) (xy 225.593002 141.539767) (xy 225.360583 141.771781)
-        (xy 225.234643 142.075077) (xy 225.234357 142.403482) (xy 225.359767 142.706998) (xy 225.527565 142.875089) (xy 225.360583 143.041781)
-        (xy 225.234643 143.345077) (xy 225.234357 143.673482) (xy 225.359767 143.976998) (xy 225.591781 144.209417) (xy 225.895077 144.335357)
-        (xy 226.223482 144.335643) (xy 226.526998 144.210233) (xy 226.759417 143.978219) (xy 226.813536 143.847886) (xy 228.331283 143.847886)
-        (xy 228.471367 143.790004) (xy 228.578638 143.682921) (xy 228.636764 143.542938) (xy 228.636896 143.391367) (xy 228.636896 141.401)
-        (xy 230.087111 141.401) (xy 230.08717 141.89075) (xy 230.18242 141.986) (xy 230.9876 141.986) (xy 230.9876 141.966)
-        (xy 231.7496 141.966) (xy 231.7496 141.986) (xy 232.55478 141.986) (xy 232.65003 141.89075) (xy 232.650088 141.401)
-        (xy 243.409 141.401) (xy 243.409 142.457299) (xy 243.344618 142.430566) (xy 243.193047 142.430434) (xy 243.0145 142.4305)
-        (xy 242.91925 142.52575) (xy 242.91925 143.16075) (xy 242.971 143.16075) (xy 242.971 143.85925) (xy 242.91925 143.85925)
-        (xy 242.91925 144.49425) (xy 243.0145 144.5895) (xy 243.193047 144.589566) (xy 243.344618 144.589434) (xy 243.409 144.5627)
-        (xy 243.409 144.653)
+        (xy 226.803566 154.459547) (xy 226.803566 157.049) (xy 226.4777 157.049) (xy 226.504434 156.984618) (xy 226.504566 156.833047)
+        (xy 226.504566 155.436047) (xy 226.446684 155.295963) (xy 226.339601 155.188692) (xy 226.199618 155.130566) (xy 226.048047 155.130434)
+        (xy 224.917 155.130434) (xy 224.917 154.916026) (xy 225.09625 154.916) (xy 225.1915 154.82075) (xy 225.1915 154.3975)
+        (xy 225.1715 154.3975) (xy 225.1715 154.1225) (xy 225.1915 154.1225) (xy 225.1915 154.116066) (xy 225.9535 154.116066)
+        (xy 225.9535 154.1225) (xy 226.70825 154.1225) (xy 226.8035 154.02725) (xy 226.803566 154.060453) (xy 226.803434 153.908882)
+        (xy 226.783136 153.86) (xy 226.803434 153.811118) (xy 226.803566 153.659547) (xy 226.803566 153.109547) (xy 226.783114 153.060051)
+        (xy 226.803434 153.011118) (xy 226.803566 152.859547) (xy 226.803566 152.309547) (xy 226.783114 152.260051) (xy 226.803434 152.211118)
+        (xy 226.803566 152.059547) (xy 226.803566 151.509547) (xy 226.783114 151.460051) (xy 226.803434 151.411118) (xy 226.803566 151.259547)
+        (xy 226.803566 150.709547) (xy 226.783114 150.660051) (xy 226.803434 150.611118) (xy 226.803566 150.459547) (xy 226.803566 149.909547)
+        (xy 226.783114 149.860051) (xy 226.803434 149.811118) (xy 226.803566 149.659547) (xy 226.803566 149.109547) (xy 226.783114 149.060051)
+        (xy 226.803434 149.011118) (xy 226.803566 148.859547) (xy 226.803566 148.309547) (xy 226.783114 148.260051) (xy 226.803434 148.211118)
+        (xy 226.803566 148.059547) (xy 226.803566 147.509547) (xy 226.783114 147.460051) (xy 226.803434 147.411118) (xy 226.803566 147.259547)
+        (xy 226.803566 146.709547) (xy 226.783114 146.660051) (xy 226.803434 146.611118) (xy 226.803566 146.459547) (xy 226.803566 145.909547)
+        (xy 226.783114 145.860051) (xy 226.803434 145.811118) (xy 226.803566 145.659547) (xy 226.803566 145.260453) (xy 226.803434 145.108882)
+        (xy 226.745308 144.968899) (xy 226.638037 144.861816) (xy 226.497953 144.803934) (xy 226.04875 144.804) (xy 225.9535 144.89925)
+        (xy 225.9535 145.3225) (xy 226.70825 145.3225) (xy 226.8035 145.22725) (xy 226.803566 145.260453) (xy 226.803566 145.659547)
+        (xy 226.8035 145.69275) (xy 226.70825 145.5975) (xy 225.9535 145.5975) (xy 225.9535 145.603934) (xy 225.1915 145.603934)
+        (xy 225.1915 145.5975) (xy 225.1715 145.5975) (xy 225.1715 145.3225) (xy 225.1915 145.3225) (xy 225.1915 144.89925)
+        (xy 225.09625 144.804) (xy 224.917 144.803973) (xy 224.917 141.401) (xy 226.073904 141.401) (xy 226.073904 141.414511)
+        (xy 225.896518 141.414357) (xy 225.593002 141.539767) (xy 225.360583 141.771781) (xy 225.234643 142.075077) (xy 225.234357 142.403482)
+        (xy 225.359767 142.706998) (xy 225.527565 142.875089) (xy 225.360583 143.041781) (xy 225.234643 143.345077) (xy 225.234357 143.673482)
+        (xy 225.359767 143.976998) (xy 225.591781 144.209417) (xy 225.895077 144.335357) (xy 226.223482 144.335643) (xy 226.526998 144.210233)
+        (xy 226.759417 143.978219) (xy 226.813536 143.847886) (xy 228.331283 143.847886) (xy 228.471367 143.790004) (xy 228.578638 143.682921)
+        (xy 228.636764 143.542938) (xy 228.636896 143.391367) (xy 228.636896 141.401) (xy 230.087111 141.401) (xy 230.08717 141.89075)
+        (xy 230.18242 141.986) (xy 230.9876 141.986) (xy 230.9876 141.966) (xy 231.7496 141.966) (xy 231.7496 141.986)
+        (xy 232.55478 141.986) (xy 232.65003 141.89075) (xy 232.650088 141.401) (xy 243.409 141.401) (xy 243.409 142.457299)
+        (xy 243.344618 142.430566) (xy 243.193047 142.430434) (xy 243.0145 142.4305) (xy 242.91925 142.52575) (xy 242.91925 143.16075)
+        (xy 242.971 143.16075) (xy 242.971 143.85925) (xy 242.91925 143.85925) (xy 242.91925 144.49425) (xy 243.0145 144.5895)
+        (xy 243.193047 144.589566) (xy 243.344618 144.589434) (xy 243.409 144.5627) (xy 243.409 144.653)
       )
     )
   )
@@ -1215,51 +1282,48 @@
     )
     (filled_polygon
       (pts
-        (xy 243.409 154.559) (xy 242.09375 154.559) (xy 242.09375 154.27325) (xy 242.09375 153.63825) (xy 242.09375 152.93975)
-        (xy 242.09375 152.30475) (xy 241.9985 152.2095) (xy 241.819953 152.209434) (xy 241.668382 152.209566) (xy 241.528399 152.267692)
-        (xy 241.421316 152.374963) (xy 241.363434 152.515047) (xy 241.3635 152.8445) (xy 241.45875 152.93975) (xy 242.09375 152.93975)
-        (xy 242.09375 153.63825) (xy 241.45875 153.63825) (xy 241.3635 153.7335) (xy 241.363434 154.062953) (xy 241.421316 154.203037)
-        (xy 241.528399 154.310308) (xy 241.668382 154.368434) (xy 241.819953 154.368566) (xy 241.9985 154.3685) (xy 242.09375 154.27325)
-        (xy 242.09375 154.559) (xy 240.240886 154.559) (xy 240.240886 152.639283) (xy 240.240886 150.687517) (xy 240.183004 150.547433)
-        (xy 240.075921 150.440162) (xy 239.935938 150.382036) (xy 239.784367 150.381904) (xy 239.23625 150.38197) (xy 239.141 150.47722)
-        (xy 239.141 151.2824) (xy 240.14557 151.2824) (xy 240.24082 151.18715) (xy 240.240886 150.687517) (xy 240.240886 152.639283)
-        (xy 240.24082 152.13965) (xy 240.14557 152.0444) (xy 239.141 152.0444) (xy 239.141 152.84958) (xy 239.23625 152.94483)
-        (xy 239.784367 152.944896) (xy 239.935938 152.944764) (xy 240.075921 152.886638) (xy 240.183004 152.779367) (xy 240.240886 152.639283)
-        (xy 240.240886 154.559) (xy 240.181373 154.559) (xy 240.075921 154.453362) (xy 239.935938 154.395236) (xy 239.784367 154.395104)
-        (xy 238.379 154.395104) (xy 238.379 152.84958) (xy 238.379 152.0444) (xy 238.379 151.2824) (xy 238.379 150.47722)
-        (xy 238.28375 150.38197) (xy 237.735633 150.381904) (xy 237.584062 150.382036) (xy 237.444079 150.440162) (xy 237.336996 150.547433)
-        (xy 237.279114 150.687517) (xy 237.27918 151.18715) (xy 237.37443 151.2824) (xy 238.379 151.2824) (xy 238.379 152.0444)
-        (xy 237.37443 152.0444) (xy 237.27918 152.13965) (xy 237.279114 152.639283) (xy 237.336996 152.779367) (xy 237.444079 152.886638)
-        (xy 237.584062 152.944764) (xy 237.735633 152.944896) (xy 238.28375 152.94483) (xy 238.379 152.84958) (xy 238.379 154.395104)
-        (xy 237.584727 154.395104) (xy 237.444643 154.452986) (xy 237.338442 154.559) (xy 236.668479 154.559) (xy 236.668566 154.459547)
-        (xy 236.668566 154.060453) (xy 236.668434 153.908882) (xy 236.648136 153.86) (xy 236.668434 153.811118) (xy 236.668566 153.659547)
-        (xy 236.668566 153.260453) (xy 236.668434 153.108882) (xy 236.648136 153.06) (xy 236.668434 153.011118) (xy 236.668566 152.859547)
-        (xy 236.668566 152.460453) (xy 236.668434 152.308882) (xy 236.648136 152.26) (xy 236.668434 152.211118) (xy 236.668566 152.059547)
-        (xy 236.668566 151.660453) (xy 236.668434 151.508882) (xy 236.648136 151.46) (xy 236.668434 151.411118) (xy 236.668566 151.259547)
-        (xy 236.668566 150.860453) (xy 236.668434 150.708882) (xy 236.648136 150.66) (xy 236.668434 150.611118) (xy 236.668566 150.459547)
-        (xy 236.6685 150.49275) (xy 236.57325 150.3975) (xy 235.8185 150.3975) (xy 235.8185 150.49925) (xy 235.8185 150.82075)
-        (xy 235.8185 150.9225) (xy 236.57325 150.9225) (xy 236.6685 150.82725) (xy 236.668566 150.860453) (xy 236.668566 151.259547)
-        (xy 236.6685 151.29275) (xy 236.57325 151.1975) (xy 235.8185 151.1975) (xy 235.8185 151.29925) (xy 235.8185 151.62075)
-        (xy 235.8185 151.7225) (xy 236.57325 151.7225) (xy 236.6685 151.62725) (xy 236.668566 151.660453) (xy 236.668566 152.059547)
-        (xy 236.6685 152.09275) (xy 236.57325 151.9975) (xy 235.8185 151.9975) (xy 235.8185 152.09925) (xy 235.8185 152.42075)
-        (xy 235.8185 152.5225) (xy 236.57325 152.5225) (xy 236.6685 152.42725) (xy 236.668566 152.460453) (xy 236.668566 152.859547)
-        (xy 236.6685 152.89275) (xy 236.57325 152.7975) (xy 235.8185 152.7975) (xy 235.8185 152.89925) (xy 235.8185 153.22075)
-        (xy 235.8185 153.3225) (xy 236.57325 153.3225) (xy 236.6685 153.22725) (xy 236.668566 153.260453) (xy 236.668566 153.659547)
-        (xy 236.6685 153.69275) (xy 236.57325 153.5975) (xy 235.8185 153.5975) (xy 235.8185 153.69925) (xy 235.8185 154.02075)
-        (xy 235.8185 154.1225) (xy 236.57325 154.1225) (xy 236.6685 154.02725) (xy 236.668566 154.060453) (xy 236.668566 154.459547)
-        (xy 236.6685 154.49275) (xy 236.57325 154.3975) (xy 235.8185 154.3975) (xy 235.8185 154.535) (xy 235.0565 154.535)
-        (xy 235.0565 154.3975) (xy 235.0365 154.3975) (xy 235.0365 154.1225) (xy 235.0565 154.1225) (xy 235.0565 154.02075)
-        (xy 235.0565 153.69925) (xy 235.0565 153.5975) (xy 235.0365 153.5975) (xy 235.0365 153.3225) (xy 235.0565 153.3225)
-        (xy 235.0565 153.22075) (xy 235.0565 152.89925) (xy 235.0565 152.7975) (xy 235.0365 152.7975) (xy 235.0365 152.5225)
-        (xy 235.0565 152.5225) (xy 235.0565 152.42075) (xy 235.0565 152.09925) (xy 235.0565 151.9975) (xy 235.0365 151.9975)
-        (xy 235.0365 151.7225) (xy 235.0565 151.7225) (xy 235.0565 151.62075) (xy 235.0565 151.29925) (xy 235.0565 151.1975)
-        (xy 235.0365 151.1975) (xy 235.0365 150.9225) (xy 235.0565 150.9225) (xy 235.0565 150.82075) (xy 235.0565 150.49925)
-        (xy 235.0565 150.3975) (xy 235.0365 150.3975) (xy 235.0365 150.1225) (xy 235.0565 150.1225) (xy 235.0565 150.116066)
-        (xy 235.8185 150.116066) (xy 235.8185 150.1225) (xy 236.57325 150.1225) (xy 236.58175 150.114) (xy 243.409 150.114)
-        (xy 243.409 152.319181) (xy 243.357601 152.267692) (xy 243.217618 152.209566) (xy 243.066047 152.209434) (xy 242.8875 152.2095)
-        (xy 242.79225 152.30475) (xy 242.79225 152.93975) (xy 242.844 152.93975) (xy 242.844 153.63825) (xy 242.79225 153.63825)
-        (xy 242.79225 154.27325) (xy 242.8875 154.3685) (xy 243.066047 154.368566) (xy 243.217618 154.368434) (xy 243.357601 154.310308)
-        (xy 243.409 154.258818) (xy 243.409 154.559)
+        (xy 243.409 152.617299) (xy 243.344618 152.590566) (xy 243.193047 152.590434) (xy 243.0145 152.5905) (xy 242.91925 152.68575)
+        (xy 242.91925 153.32075) (xy 242.971 153.32075) (xy 242.971 154.01925) (xy 242.91925 154.01925) (xy 242.91925 154.071)
+        (xy 242.22075 154.071) (xy 242.22075 154.01925) (xy 242.22075 153.32075) (xy 242.22075 152.68575) (xy 242.1255 152.5905)
+        (xy 241.946953 152.590434) (xy 241.795382 152.590566) (xy 241.655399 152.648692) (xy 241.548316 152.755963) (xy 241.490434 152.896047)
+        (xy 241.4905 153.2255) (xy 241.58575 153.32075) (xy 242.22075 153.32075) (xy 242.22075 154.01925) (xy 241.58575 154.01925)
+        (xy 241.4905 154.1145) (xy 241.490434 154.443953) (xy 241.53797 154.559) (xy 240.240886 154.559) (xy 240.240886 152.639283)
+        (xy 240.240886 150.687517) (xy 240.183004 150.547433) (xy 240.075921 150.440162) (xy 239.935938 150.382036) (xy 239.784367 150.381904)
+        (xy 239.23625 150.38197) (xy 239.141 150.47722) (xy 239.141 151.2824) (xy 240.14557 151.2824) (xy 240.24082 151.18715)
+        (xy 240.240886 150.687517) (xy 240.240886 152.639283) (xy 240.24082 152.13965) (xy 240.14557 152.0444) (xy 239.141 152.0444)
+        (xy 239.141 152.84958) (xy 239.23625 152.94483) (xy 239.784367 152.944896) (xy 239.935938 152.944764) (xy 240.075921 152.886638)
+        (xy 240.183004 152.779367) (xy 240.240886 152.639283) (xy 240.240886 154.559) (xy 240.181373 154.559) (xy 240.075921 154.453362)
+        (xy 239.935938 154.395236) (xy 239.784367 154.395104) (xy 238.379 154.395104) (xy 238.379 152.84958) (xy 238.379 152.0444)
+        (xy 238.379 151.2824) (xy 238.379 150.47722) (xy 238.28375 150.38197) (xy 237.735633 150.381904) (xy 237.584062 150.382036)
+        (xy 237.444079 150.440162) (xy 237.336996 150.547433) (xy 237.279114 150.687517) (xy 237.27918 151.18715) (xy 237.37443 151.2824)
+        (xy 238.379 151.2824) (xy 238.379 152.0444) (xy 237.37443 152.0444) (xy 237.27918 152.13965) (xy 237.279114 152.639283)
+        (xy 237.336996 152.779367) (xy 237.444079 152.886638) (xy 237.584062 152.944764) (xy 237.735633 152.944896) (xy 238.28375 152.94483)
+        (xy 238.379 152.84958) (xy 238.379 154.395104) (xy 237.584727 154.395104) (xy 237.444643 154.452986) (xy 237.338442 154.559)
+        (xy 236.668479 154.559) (xy 236.668566 154.459547) (xy 236.668566 154.060453) (xy 236.668434 153.908882) (xy 236.648136 153.86)
+        (xy 236.668434 153.811118) (xy 236.668566 153.659547) (xy 236.668566 153.260453) (xy 236.668434 153.108882) (xy 236.648136 153.06)
+        (xy 236.668434 153.011118) (xy 236.668566 152.859547) (xy 236.668566 152.460453) (xy 236.668434 152.308882) (xy 236.648136 152.26)
+        (xy 236.668434 152.211118) (xy 236.668566 152.059547) (xy 236.668566 151.660453) (xy 236.668434 151.508882) (xy 236.648136 151.46)
+        (xy 236.668434 151.411118) (xy 236.668566 151.259547) (xy 236.668566 150.860453) (xy 236.668434 150.708882) (xy 236.648136 150.66)
+        (xy 236.668434 150.611118) (xy 236.668566 150.459547) (xy 236.6685 150.49275) (xy 236.57325 150.3975) (xy 235.8185 150.3975)
+        (xy 235.8185 150.49925) (xy 235.8185 150.82075) (xy 235.8185 150.9225) (xy 236.57325 150.9225) (xy 236.6685 150.82725)
+        (xy 236.668566 150.860453) (xy 236.668566 151.259547) (xy 236.6685 151.29275) (xy 236.57325 151.1975) (xy 235.8185 151.1975)
+        (xy 235.8185 151.29925) (xy 235.8185 151.62075) (xy 235.8185 151.7225) (xy 236.57325 151.7225) (xy 236.6685 151.62725)
+        (xy 236.668566 151.660453) (xy 236.668566 152.059547) (xy 236.6685 152.09275) (xy 236.57325 151.9975) (xy 235.8185 151.9975)
+        (xy 235.8185 152.09925) (xy 235.8185 152.42075) (xy 235.8185 152.5225) (xy 236.57325 152.5225) (xy 236.6685 152.42725)
+        (xy 236.668566 152.460453) (xy 236.668566 152.859547) (xy 236.6685 152.89275) (xy 236.57325 152.7975) (xy 235.8185 152.7975)
+        (xy 235.8185 152.89925) (xy 235.8185 153.22075) (xy 235.8185 153.3225) (xy 236.57325 153.3225) (xy 236.6685 153.22725)
+        (xy 236.668566 153.260453) (xy 236.668566 153.659547) (xy 236.6685 153.69275) (xy 236.57325 153.5975) (xy 235.8185 153.5975)
+        (xy 235.8185 153.69925) (xy 235.8185 154.02075) (xy 235.8185 154.1225) (xy 236.57325 154.1225) (xy 236.6685 154.02725)
+        (xy 236.668566 154.060453) (xy 236.668566 154.459547) (xy 236.6685 154.49275) (xy 236.57325 154.3975) (xy 235.8185 154.3975)
+        (xy 235.8185 154.535) (xy 235.0565 154.535) (xy 235.0565 154.3975) (xy 235.0365 154.3975) (xy 235.0365 154.1225)
+        (xy 235.0565 154.1225) (xy 235.0565 154.02075) (xy 235.0565 153.69925) (xy 235.0565 153.5975) (xy 235.0365 153.5975)
+        (xy 235.0365 153.3225) (xy 235.0565 153.3225) (xy 235.0565 153.22075) (xy 235.0565 152.89925) (xy 235.0565 152.7975)
+        (xy 235.0365 152.7975) (xy 235.0365 152.5225) (xy 235.0565 152.5225) (xy 235.0565 152.42075) (xy 235.0565 152.09925)
+        (xy 235.0565 151.9975) (xy 235.0365 151.9975) (xy 235.0365 151.7225) (xy 235.0565 151.7225) (xy 235.0565 151.62075)
+        (xy 235.0565 151.29925) (xy 235.0565 151.1975) (xy 235.0365 151.1975) (xy 235.0365 150.9225) (xy 235.0565 150.9225)
+        (xy 235.0565 150.82075) (xy 235.0565 150.49925) (xy 235.0565 150.3975) (xy 235.0365 150.3975) (xy 235.0365 150.1225)
+        (xy 235.0565 150.1225) (xy 235.0565 150.116066) (xy 235.8185 150.116066) (xy 235.8185 150.1225) (xy 236.57325 150.1225)
+        (xy 236.58175 150.114) (xy 243.409 150.114) (xy 243.409 152.617299)
       )
     )
   )
@@ -1281,79 +1345,81 @@
         (xy 221.90075 152.30475) (xy 221.8055 152.4) (xy 221.805466 152.5016) (xy 221.424566 152.5016) (xy 221.424566 152.197547)
         (xy 221.366684 152.057463) (xy 221.259601 151.950192) (xy 221.119618 151.892066) (xy 220.968047 151.891934) (xy 219.571047 151.891934)
         (xy 219.430963 151.949816) (xy 219.323692 152.056899) (xy 219.265566 152.196882) (xy 219.265434 152.348453) (xy 219.265434 153.1366)
-        (xy 218.249566 153.1366) (xy 218.249566 152.896047) (xy 218.191684 152.755963) (xy 218.084601 152.648692) (xy 217.944618 152.590566)
-        (xy 217.793047 152.590434) (xy 216.396047 152.590434) (xy 216.331 152.617311) (xy 216.331 152.1827) (xy 216.395382 152.209434)
-        (xy 216.546953 152.209566) (xy 217.943953 152.209566) (xy 218.084037 152.151684) (xy 218.191308 152.044601) (xy 218.249434 151.904618)
-        (xy 218.249566 151.753047) (xy 218.249566 151.3459) (xy 219.27099 151.3459) (xy 219.323316 151.472537) (xy 219.430399 151.579808)
-        (xy 219.570382 151.637934) (xy 219.721953 151.638066) (xy 221.118953 151.638066) (xy 221.259037 151.580184) (xy 221.366308 151.473101)
-        (xy 221.424434 151.333118) (xy 221.424566 151.181547) (xy 221.424566 150.292547) (xy 221.366684 150.152463) (xy 221.259601 150.045192)
-        (xy 221.119618 149.987066) (xy 220.968047 149.986934) (xy 219.571047 149.986934) (xy 219.430963 150.044816) (xy 219.323692 150.151899)
-        (xy 219.270873 150.2791) (xy 218.217771 150.2791) (xy 218.191684 150.215963) (xy 218.084601 150.108692) (xy 217.944618 150.050566)
-        (xy 217.793047 150.050434) (xy 216.396047 150.050434) (xy 216.331 150.077311) (xy 216.331 149.669067) (xy 216.331882 149.669434)
-        (xy 216.483453 149.669566) (xy 217.372453 149.669566) (xy 217.512537 149.611684) (xy 217.619808 149.504601) (xy 217.677934 149.364618)
-        (xy 217.678066 149.213047) (xy 217.678066 147.816047) (xy 217.620184 147.675963) (xy 217.513101 147.568692) (xy 217.3859 147.515873)
-        (xy 217.3859 147.129566) (xy 217.943953 147.129566) (xy 218.084037 147.071684) (xy 218.191308 146.964601) (xy 218.249434 146.824618)
-        (xy 218.249566 146.673047) (xy 218.249566 145.276047) (xy 218.191684 145.135963) (xy 218.084601 145.028692) (xy 217.944618 144.970566)
-        (xy 217.793047 144.970434) (xy 216.396047 144.970434) (xy 216.331 144.997311) (xy 216.331 144.5627) (xy 216.395382 144.589434)
-        (xy 216.546953 144.589566) (xy 217.943953 144.589566) (xy 218.084037 144.531684) (xy 218.090667 144.525065) (xy 218.096899 144.531308)
-        (xy 218.236882 144.589434) (xy 218.388453 144.589566) (xy 219.277453 144.589566) (xy 219.417537 144.531684) (xy 219.524808 144.424601)
-        (xy 219.582934 144.284618) (xy 219.583066 144.133047) (xy 219.583066 142.736047) (xy 219.525184 142.595963) (xy 219.418101 142.488692)
-        (xy 219.278118 142.430566) (xy 219.126547 142.430434) (xy 218.237547 142.430434) (xy 218.097463 142.488316) (xy 218.090832 142.494934)
-        (xy 218.084601 142.488692) (xy 217.944618 142.430566) (xy 217.793047 142.430434) (xy 216.396047 142.430434) (xy 216.331 142.457311)
-        (xy 216.331 141.401) (xy 224.028 141.401) (xy 224.028 147.3266) (xy 223.964566 147.3266) (xy 223.964566 146.887453)
-        (xy 223.964566 145.847547) (xy 223.906684 145.707463) (xy 223.799601 145.600192) (xy 223.659618 145.542066) (xy 223.508047 145.541934)
-        (xy 223.3295 145.542) (xy 223.23425 145.63725) (xy 223.23425 146.14525) (xy 223.86925 146.14525) (xy 223.9645 146.05)
-        (xy 223.964566 145.847547) (xy 223.964566 146.887453) (xy 223.9645 146.685) (xy 223.86925 146.58975) (xy 223.23425 146.58975)
-        (xy 223.23425 147.09775) (xy 223.3295 147.193) (xy 223.508047 147.193066) (xy 223.659618 147.192934) (xy 223.799601 147.134808)
-        (xy 223.906684 147.027537) (xy 223.964566 146.887453) (xy 223.964566 147.3266) (xy 223.2975 147.3266) (xy 222.53575 147.3266)
-        (xy 222.53575 147.09775) (xy 222.53575 146.58975) (xy 222.53575 146.14525) (xy 222.53575 145.63725) (xy 222.4405 145.542)
-        (xy 222.261953 145.541934) (xy 222.110382 145.542066) (xy 221.970399 145.600192) (xy 221.863316 145.707463) (xy 221.805434 145.847547)
-        (xy 221.8055 146.05) (xy 221.90075 146.14525) (xy 222.53575 146.14525) (xy 222.53575 146.58975) (xy 221.90075 146.58975)
-        (xy 221.8055 146.685) (xy 221.805434 146.887453) (xy 221.863316 147.027537) (xy 221.970399 147.134808) (xy 222.110382 147.192934)
-        (xy 222.261953 147.193066) (xy 222.4405 147.193) (xy 222.53575 147.09775) (xy 222.53575 147.3266) (xy 221.488066 147.3266)
-        (xy 221.488066 144.133047) (xy 221.488066 142.886953) (xy 221.487934 142.735382) (xy 221.429808 142.595399) (xy 221.322537 142.488316)
-        (xy 221.182453 142.430434) (xy 220.98 142.4305) (xy 220.88475 142.52575) (xy 220.88475 143.16075) (xy 221.39275 143.16075)
-        (xy 221.488 143.0655) (xy 221.488066 142.886953) (xy 221.488066 144.133047) (xy 221.488 143.9545) (xy 221.39275 143.85925)
-        (xy 220.88475 143.85925) (xy 220.88475 144.49425) (xy 220.98 144.5895) (xy 221.182453 144.589566) (xy 221.322537 144.531684)
-        (xy 221.429808 144.424601) (xy 221.487934 144.284618) (xy 221.488066 144.133047) (xy 221.488066 147.3266) (xy 220.44025 147.3266)
-        (xy 220.44025 144.49425) (xy 220.44025 143.85925) (xy 220.44025 143.16075) (xy 220.44025 142.52575) (xy 220.345 142.4305)
-        (xy 220.142547 142.430434) (xy 220.002463 142.488316) (xy 219.895192 142.595399) (xy 219.837066 142.735382) (xy 219.836934 142.886953)
-        (xy 219.837 143.0655) (xy 219.93225 143.16075) (xy 220.44025 143.16075) (xy 220.44025 143.85925) (xy 219.93225 143.85925)
-        (xy 219.837 143.9545) (xy 219.836934 144.133047) (xy 219.837066 144.284618) (xy 219.895192 144.424601) (xy 220.002463 144.531684)
-        (xy 220.142547 144.589566) (xy 220.345 144.5895) (xy 220.44025 144.49425) (xy 220.44025 147.3266) (xy 219.4875 147.3266)
-        (xy 219.487499 147.3266) (xy 219.446896 147.334676) (xy 219.283377 147.367203) (xy 219.110329 147.482829) (xy 219.110326 147.482832)
-        (xy 219.082724 147.510434) (xy 218.237547 147.510434) (xy 218.097463 147.568316) (xy 217.990192 147.675399) (xy 217.932066 147.815382)
-        (xy 217.931934 147.966953) (xy 217.931934 149.363953) (xy 217.989816 149.504037) (xy 218.096899 149.611308) (xy 218.236882 149.669434)
-        (xy 218.388453 149.669566) (xy 219.277453 149.669566) (xy 219.38203 149.626354) (xy 219.430399 149.674808) (xy 219.570382 149.732934)
-        (xy 219.721953 149.733066) (xy 220.535138 149.733066) (xy 220.53514 149.733066) (xy 220.621896 149.750323) (xy 220.662499 149.7584)
-        (xy 220.662499 149.758399) (xy 220.6625 149.7584) (xy 221.805477 149.7584) (xy 221.805434 149.808453) (xy 221.805434 150.697453)
-        (xy 221.863316 150.837537) (xy 221.970399 150.944808) (xy 222.110382 151.002934) (xy 222.261953 151.003066) (xy 222.956224 151.003066)
-        (xy 223.269829 151.31667) (xy 223.23425 151.35225) (xy 223.23425 151.86025) (xy 223.86925 151.86025) (xy 223.9645 151.765)
-        (xy 223.964555 151.5934) (xy 224.028 151.5934) (xy 224.028 152.281378)
+        (xy 219.075 153.1366) (xy 219.074999 153.1366) (xy 219.034396 153.144676) (xy 218.870877 153.177203) (xy 218.697829 153.292829)
+        (xy 218.697826 153.292832) (xy 216.860224 155.130434) (xy 216.396047 155.130434) (xy 216.331 155.157311) (xy 216.331 152.1827)
+        (xy 216.395382 152.209434) (xy 216.546953 152.209566) (xy 217.943953 152.209566) (xy 218.084037 152.151684) (xy 218.191308 152.044601)
+        (xy 218.249434 151.904618) (xy 218.249566 151.753047) (xy 218.249566 151.3459) (xy 219.27099 151.3459) (xy 219.323316 151.472537)
+        (xy 219.430399 151.579808) (xy 219.570382 151.637934) (xy 219.721953 151.638066) (xy 221.118953 151.638066) (xy 221.259037 151.580184)
+        (xy 221.366308 151.473101) (xy 221.424434 151.333118) (xy 221.424566 151.181547) (xy 221.424566 150.292547) (xy 221.366684 150.152463)
+        (xy 221.259601 150.045192) (xy 221.119618 149.987066) (xy 220.968047 149.986934) (xy 219.571047 149.986934) (xy 219.430963 150.044816)
+        (xy 219.323692 150.151899) (xy 219.270873 150.2791) (xy 218.217771 150.2791) (xy 218.191684 150.215963) (xy 218.084601 150.108692)
+        (xy 217.944618 150.050566) (xy 217.793047 150.050434) (xy 216.396047 150.050434) (xy 216.331 150.077311) (xy 216.331 149.669067)
+        (xy 216.331882 149.669434) (xy 216.483453 149.669566) (xy 217.372453 149.669566) (xy 217.512537 149.611684) (xy 217.619808 149.504601)
+        (xy 217.677934 149.364618) (xy 217.678066 149.213047) (xy 217.678066 147.816047) (xy 217.620184 147.675963) (xy 217.513101 147.568692)
+        (xy 217.3859 147.515873) (xy 217.3859 147.129566) (xy 217.943953 147.129566) (xy 218.084037 147.071684) (xy 218.191308 146.964601)
+        (xy 218.249434 146.824618) (xy 218.249566 146.673047) (xy 218.249566 145.276047) (xy 218.191684 145.135963) (xy 218.084601 145.028692)
+        (xy 217.944618 144.970566) (xy 217.793047 144.970434) (xy 216.396047 144.970434) (xy 216.331 144.997311) (xy 216.331 144.5627)
+        (xy 216.395382 144.589434) (xy 216.546953 144.589566) (xy 217.943953 144.589566) (xy 218.084037 144.531684) (xy 218.090667 144.525065)
+        (xy 218.096899 144.531308) (xy 218.236882 144.589434) (xy 218.388453 144.589566) (xy 219.277453 144.589566) (xy 219.417537 144.531684)
+        (xy 219.524808 144.424601) (xy 219.582934 144.284618) (xy 219.583066 144.133047) (xy 219.583066 142.736047) (xy 219.525184 142.595963)
+        (xy 219.418101 142.488692) (xy 219.278118 142.430566) (xy 219.126547 142.430434) (xy 218.237547 142.430434) (xy 218.097463 142.488316)
+        (xy 218.090832 142.494934) (xy 218.084601 142.488692) (xy 217.944618 142.430566) (xy 217.793047 142.430434) (xy 216.396047 142.430434)
+        (xy 216.331 142.457311) (xy 216.331 141.401) (xy 224.028 141.401) (xy 224.028 147.3266) (xy 223.964566 147.3266)
+        (xy 223.964566 146.887453) (xy 223.964566 145.847547) (xy 223.906684 145.707463) (xy 223.799601 145.600192) (xy 223.659618 145.542066)
+        (xy 223.508047 145.541934) (xy 223.3295 145.542) (xy 223.23425 145.63725) (xy 223.23425 146.14525) (xy 223.86925 146.14525)
+        (xy 223.9645 146.05) (xy 223.964566 145.847547) (xy 223.964566 146.887453) (xy 223.9645 146.685) (xy 223.86925 146.58975)
+        (xy 223.23425 146.58975) (xy 223.23425 147.09775) (xy 223.3295 147.193) (xy 223.508047 147.193066) (xy 223.659618 147.192934)
+        (xy 223.799601 147.134808) (xy 223.906684 147.027537) (xy 223.964566 146.887453) (xy 223.964566 147.3266) (xy 223.2975 147.3266)
+        (xy 222.53575 147.3266) (xy 222.53575 147.09775) (xy 222.53575 146.58975) (xy 222.53575 146.14525) (xy 222.53575 145.63725)
+        (xy 222.4405 145.542) (xy 222.261953 145.541934) (xy 222.110382 145.542066) (xy 221.970399 145.600192) (xy 221.863316 145.707463)
+        (xy 221.805434 145.847547) (xy 221.8055 146.05) (xy 221.90075 146.14525) (xy 222.53575 146.14525) (xy 222.53575 146.58975)
+        (xy 221.90075 146.58975) (xy 221.8055 146.685) (xy 221.805434 146.887453) (xy 221.863316 147.027537) (xy 221.970399 147.134808)
+        (xy 222.110382 147.192934) (xy 222.261953 147.193066) (xy 222.4405 147.193) (xy 222.53575 147.09775) (xy 222.53575 147.3266)
+        (xy 221.488066 147.3266) (xy 221.488066 144.133047) (xy 221.488066 142.886953) (xy 221.487934 142.735382) (xy 221.429808 142.595399)
+        (xy 221.322537 142.488316) (xy 221.182453 142.430434) (xy 220.98 142.4305) (xy 220.88475 142.52575) (xy 220.88475 143.16075)
+        (xy 221.39275 143.16075) (xy 221.488 143.0655) (xy 221.488066 142.886953) (xy 221.488066 144.133047) (xy 221.488 143.9545)
+        (xy 221.39275 143.85925) (xy 220.88475 143.85925) (xy 220.88475 144.49425) (xy 220.98 144.5895) (xy 221.182453 144.589566)
+        (xy 221.322537 144.531684) (xy 221.429808 144.424601) (xy 221.487934 144.284618) (xy 221.488066 144.133047) (xy 221.488066 147.3266)
+        (xy 220.44025 147.3266) (xy 220.44025 144.49425) (xy 220.44025 143.85925) (xy 220.44025 143.16075) (xy 220.44025 142.52575)
+        (xy 220.345 142.4305) (xy 220.142547 142.430434) (xy 220.002463 142.488316) (xy 219.895192 142.595399) (xy 219.837066 142.735382)
+        (xy 219.836934 142.886953) (xy 219.837 143.0655) (xy 219.93225 143.16075) (xy 220.44025 143.16075) (xy 220.44025 143.85925)
+        (xy 219.93225 143.85925) (xy 219.837 143.9545) (xy 219.836934 144.133047) (xy 219.837066 144.284618) (xy 219.895192 144.424601)
+        (xy 220.002463 144.531684) (xy 220.142547 144.589566) (xy 220.345 144.5895) (xy 220.44025 144.49425) (xy 220.44025 147.3266)
+        (xy 219.4875 147.3266) (xy 219.487499 147.3266) (xy 219.446896 147.334676) (xy 219.283377 147.367203) (xy 219.110329 147.482829)
+        (xy 219.110326 147.482832) (xy 219.082724 147.510434) (xy 218.237547 147.510434) (xy 218.097463 147.568316) (xy 217.990192 147.675399)
+        (xy 217.932066 147.815382) (xy 217.931934 147.966953) (xy 217.931934 149.363953) (xy 217.989816 149.504037) (xy 218.096899 149.611308)
+        (xy 218.236882 149.669434) (xy 218.388453 149.669566) (xy 219.277453 149.669566) (xy 219.38203 149.626354) (xy 219.430399 149.674808)
+        (xy 219.570382 149.732934) (xy 219.721953 149.733066) (xy 220.535138 149.733066) (xy 220.53514 149.733066) (xy 220.621896 149.750323)
+        (xy 220.662499 149.7584) (xy 220.662499 149.758399) (xy 220.6625 149.7584) (xy 221.805477 149.7584) (xy 221.805434 149.808453)
+        (xy 221.805434 150.697453) (xy 221.863316 150.837537) (xy 221.970399 150.944808) (xy 222.110382 151.002934) (xy 222.261953 151.003066)
+        (xy 222.956224 151.003066) (xy 223.269829 151.31667) (xy 223.23425 151.35225) (xy 223.23425 151.86025) (xy 223.86925 151.86025)
+        (xy 223.9645 151.765) (xy 223.964555 151.5934) (xy 224.028 151.5934) (xy 224.028 152.281378)
       )
     )
     (filled_polygon
       (pts
-        (xy 224.028 156.414) (xy 223.963926 156.414) (xy 223.964566 156.412453) (xy 223.964566 155.372547) (xy 223.906684 155.232463)
+        (xy 224.028 157.049) (xy 223.964566 157.049) (xy 223.964566 156.412453) (xy 223.964566 155.372547) (xy 223.906684 155.232463)
         (xy 223.799601 155.125192) (xy 223.659618 155.067066) (xy 223.508047 155.066934) (xy 223.3295 155.067) (xy 223.23425 155.16225)
         (xy 223.23425 155.67025) (xy 223.86925 155.67025) (xy 223.9645 155.575) (xy 223.964566 155.372547) (xy 223.964566 156.412453)
-        (xy 223.9645 156.21) (xy 223.86925 156.11475) (xy 223.23425 156.11475) (xy 223.23425 156.2935) (xy 222.53575 156.2935)
-        (xy 222.53575 156.11475) (xy 222.53575 155.67025) (xy 222.53575 155.16225) (xy 222.4405 155.067) (xy 222.261953 155.066934)
-        (xy 222.110382 155.067066) (xy 221.970399 155.125192) (xy 221.863316 155.232463) (xy 221.805434 155.372547) (xy 221.8055 155.575)
-        (xy 221.90075 155.67025) (xy 222.53575 155.67025) (xy 222.53575 156.11475) (xy 221.90075 156.11475) (xy 221.8055 156.21)
-        (xy 221.805434 156.412453) (xy 221.806073 156.414) (xy 221.424566 156.414) (xy 221.424566 155.142453) (xy 221.4245 154.94)
-        (xy 221.32925 154.84475) (xy 220.69425 154.84475) (xy 220.69425 155.35275) (xy 220.7895 155.448) (xy 220.968047 155.448066)
-        (xy 221.119618 155.447934) (xy 221.259601 155.389808) (xy 221.366684 155.282537) (xy 221.424566 155.142453) (xy 221.424566 156.414)
-        (xy 219.99575 156.414) (xy 219.99575 155.35275) (xy 219.99575 154.84475) (xy 219.36075 154.84475) (xy 219.2655 154.94)
-        (xy 219.265434 155.142453) (xy 219.323316 155.282537) (xy 219.430399 155.389808) (xy 219.570382 155.447934) (xy 219.721953 155.448066)
-        (xy 219.9005 155.448) (xy 219.99575 155.35275) (xy 219.99575 156.414) (xy 216.331 156.414) (xy 216.331 154.7227)
-        (xy 216.395382 154.749434) (xy 216.546953 154.749566) (xy 217.943953 154.749566) (xy 218.084037 154.691684) (xy 218.191308 154.584601)
-        (xy 218.249434 154.444618) (xy 218.249566 154.293047) (xy 218.249566 154.2034) (xy 219.265466 154.2034) (xy 219.2655 154.305)
-        (xy 219.36075 154.40025) (xy 219.99575 154.40025) (xy 219.99575 154.2215) (xy 220.69425 154.2215) (xy 220.69425 154.40025)
-        (xy 221.32925 154.40025) (xy 221.4245 154.305) (xy 221.424533 154.2034) (xy 221.805434 154.2034) (xy 221.805434 154.507453)
-        (xy 221.863316 154.647537) (xy 221.970399 154.754808) (xy 222.110382 154.812934) (xy 222.261953 154.813066) (xy 223.658953 154.813066)
-        (xy 223.799037 154.755184) (xy 223.906308 154.648101) (xy 223.959126 154.5209) (xy 223.9645 154.5209) (xy 224.028 154.508268)
-        (xy 224.028 156.414)
+        (xy 223.9645 156.21) (xy 223.86925 156.11475) (xy 223.23425 156.11475) (xy 223.23425 156.62275) (xy 223.3295 156.718)
+        (xy 223.508047 156.718066) (xy 223.659618 156.717934) (xy 223.799601 156.659808) (xy 223.906684 156.552537) (xy 223.964566 156.412453)
+        (xy 223.964566 157.049) (xy 222.53575 157.049) (xy 222.53575 156.62275) (xy 222.53575 156.11475) (xy 222.53575 155.67025)
+        (xy 222.53575 155.16225) (xy 222.4405 155.067) (xy 222.261953 155.066934) (xy 222.110382 155.067066) (xy 221.970399 155.125192)
+        (xy 221.863316 155.232463) (xy 221.805434 155.372547) (xy 221.8055 155.575) (xy 221.90075 155.67025) (xy 222.53575 155.67025)
+        (xy 222.53575 156.11475) (xy 221.90075 156.11475) (xy 221.8055 156.21) (xy 221.805434 156.412453) (xy 221.863316 156.552537)
+        (xy 221.970399 156.659808) (xy 222.110382 156.717934) (xy 222.261953 156.718066) (xy 222.4405 156.718) (xy 222.53575 156.62275)
+        (xy 222.53575 157.049) (xy 221.424566 157.049) (xy 221.424566 155.142453) (xy 221.4245 154.94) (xy 221.32925 154.84475)
+        (xy 220.69425 154.84475) (xy 220.69425 155.35275) (xy 220.7895 155.448) (xy 220.968047 155.448066) (xy 221.119618 155.447934)
+        (xy 221.259601 155.389808) (xy 221.366684 155.282537) (xy 221.424566 155.142453) (xy 221.424566 157.049) (xy 219.99575 157.049)
+        (xy 219.99575 155.35275) (xy 219.99575 154.84475) (xy 219.36075 154.84475) (xy 219.2655 154.94) (xy 219.265434 155.142453)
+        (xy 219.323316 155.282537) (xy 219.430399 155.389808) (xy 219.570382 155.447934) (xy 219.721953 155.448066) (xy 219.9005 155.448)
+        (xy 219.99575 155.35275) (xy 219.99575 157.049) (xy 218.2227 157.049) (xy 218.249434 156.984618) (xy 218.249566 156.833047)
+        (xy 218.249566 155.436047) (xy 218.195103 155.304238) (xy 219.265476 154.233864) (xy 219.2655 154.305) (xy 219.36075 154.40025)
+        (xy 219.99575 154.40025) (xy 219.99575 154.2215) (xy 220.69425 154.2215) (xy 220.69425 154.40025) (xy 221.32925 154.40025)
+        (xy 221.4245 154.305) (xy 221.424523 154.233864) (xy 221.555326 154.364667) (xy 221.555329 154.364671) (xy 221.728376 154.480296)
+        (xy 221.728377 154.480297) (xy 221.805434 154.495624) (xy 221.805434 154.507453) (xy 221.863316 154.647537) (xy 221.970399 154.754808)
+        (xy 222.110382 154.812934) (xy 222.261953 154.813066) (xy 223.658953 154.813066) (xy 223.799037 154.755184) (xy 223.906308 154.648101)
+        (xy 223.959126 154.5209) (xy 223.9645 154.5209) (xy 224.028 154.508268) (xy 224.028 157.049)
       )
     )
   )

hardware/PowerSSO-24_breakout/PowerSSO-24_breakout.net

@@ -1,7 +1,7 @@
 (export (version D)
   (design
     (source C:/Users/LJ/Desktop/Jared/daecu/Hardware/trunk/rusefi.com/PowerSSO-24_breakout/PowerSSO-24_breakout.sch)
-    (date "1/3/2015 6:56:13 PM")
+    (date "1/3/2015 7:42:06 PM")
     (tool "eeschema (2013-07-07 BZR 4022)-stable"))
   (components
     (comp (ref P108)
@@ -105,7 +105,13 @@
       (footprint "DO-214AA(SMB)")
       (libsource (lib device) (part ZENER))
       (sheetpath (names /) (tstamps /))
-      (tstamp 54A84AB3)))
+      (tstamp 54A84AB3))
+    (comp (ref P104)
+      (value CONN_5)
+      (footprint SIL-5)
+      (libsource (lib conn) (part CONN_5))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 54A88BBE)))
   (libparts
     (libpart (lib device) (part R)
       (description Resistance)
@@ -152,6 +158,17 @@
       (pins
         (pin (num 1) (name P1) (type passive))
         (pin (num 2) (name PM) (type passive))))
+    (libpart (lib conn) (part CONN_5)
+      (description "Symbole general de connecteur")
+      (fields
+        (field (name Reference) P)
+        (field (name Value) CONN_5))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive))
+        (pin (num 3) (name ~) (type passive))
+        (pin (num 4) (name ~) (type passive))
+        (pin (num 5) (name ~) (type passive))))
     (libpart (lib vnd5e025aktr) (part VND5E025AKTR)
       (footprints
         (fp PowerSSO-24))
@@ -197,69 +214,79 @@
     (net (code 1) (name "")
       (node (ref P101) (pin 1))
       (node (ref R101) (pin 1)))
-    (net (code 2) (name /IN1)
-      (node (ref R103) (pin 2))
-      (node (ref U101) (pin 6)))
-    (net (code 3) (name "")
-      (node (ref R103) (pin 1))
-      (node (ref P103) (pin 1)))
-    (net (code 4) (name "")
-      (node (ref R102) (pin 1))
-      (node (ref P102) (pin 1)))
-    (net (code 5) (name /O1)
-      (node (ref U101) (pin 18))
-      (node (ref U101) (pin 15))
-      (node (ref U101) (pin 16))
-      (node (ref U101) (pin 17))
-      (node (ref D103) (pin 2))
-      (node (ref U101) (pin 14))
-      (node (ref P108) (pin 1))
-      (node (ref U101) (pin 13)))
-    (net (code 6) (name /VCC)
-      (node (ref U101) (pin 1))
-      (node (ref U101) (pin 12))
-      (node (ref D101) (pin 2))
-      (node (ref U101) (pin EXP))
-      (node (ref P107) (pin 1)))
-    (net (code 7) (name /O2)
-      (node (ref U101) (pin 20))
-      (node (ref U101) (pin 19))
-      (node (ref U101) (pin 24))
-      (node (ref U101) (pin 21))
-      (node (ref U101) (pin 22))
-      (node (ref U101) (pin 23))
-      (node (ref D102) (pin 2))
-      (node (ref P107) (pin 2)))
-    (net (code 8) (name "")
-      (node (ref U101) (pin 9)))
-    (net (code 9) (name "")
-      (node (ref U101) (pin 7)))
-    (net (code 10) (name "")
-      (node (ref U101) (pin 5)))
-    (net (code 11) (name "")
-      (node (ref U101) (pin 3)))
-    (net (code 12) (name /CS_DIS)
-      (node (ref U101) (pin 11))
-      (node (ref R108) (pin 1))
-      (node (ref P106) (pin 1)))
-    (net (code 13) (name /I2)
-      (node (ref U101) (pin 10))
-      (node (ref R110) (pin 1)))
-    (net (code 14) (name GND)
+    (net (code 2) (name GND)
       (node (ref R109) (pin 2))
+      (node (ref U101) (pin 2))
+      (node (ref R110) (pin 2))
       (node (ref R108) (pin 2))
-      (node (ref D103) (pin 1))
       (node (ref R106) (pin 2))
       (node (ref R101) (pin 2))
       (node (ref D102) (pin 1))
-      (node (ref D101) (pin 1))
-      (node (ref R110) (pin 2))
       (node (ref P108) (pin 2))
-      (node (ref U101) (pin 2)))
-    (net (code 15) (name /I1)
-      (node (ref U101) (pin 8))
-      (node (ref R109) (pin 1)))
-    (net (code 16) (name /IN2)
-      (node (ref R106) (pin 1))
+      (node (ref D103) (pin 1))
+      (node (ref D101) (pin 1)))
+    (net (code 3) (name /IN1)
+      (node (ref R103) (pin 2))
+      (node (ref U101) (pin 6)))
+    (net (code 4) (name "")
+      (node (ref R103) (pin 1))
+      (node (ref P103) (pin 1)))
+    (net (code 5) (name "")
+      (node (ref P102) (pin 1))
+      (node (ref R102) (pin 1)))
+    (net (code 6) (name "")
+      (node (ref P104) (pin 5)))
+    (net (code 7) (name "")
+      (node (ref P104) (pin 4)))
+    (net (code 8) (name "")
+      (node (ref P104) (pin 3)))
+    (net (code 9) (name "")
+      (node (ref P104) (pin 2)))
+    (net (code 10) (name "")
+      (node (ref P104) (pin 1)))
+    (net (code 11) (name /O1)
+      (node (ref U101) (pin 13))
+      (node (ref U101) (pin 18))
+      (node (ref U101) (pin 17))
+      (node (ref U101) (pin 16))
+      (node (ref U101) (pin 15))
+      (node (ref U101) (pin 14))
+      (node (ref P108) (pin 1))
+      (node (ref D103) (pin 2)))
+    (net (code 12) (name /VCC)
+      (node (ref U101) (pin 1))
+      (node (ref U101) (pin 12))
+      (node (ref D101) (pin 2))
+      (node (ref P107) (pin 1))
+      (node (ref U101) (pin EXP)))
+    (net (code 13) (name /O2)
+      (node (ref U101) (pin 22))
+      (node (ref D102) (pin 2))
+      (node (ref U101) (pin 23))
+      (node (ref U101) (pin 19))
+      (node (ref U101) (pin 21))
+      (node (ref U101) (pin 24))
+      (node (ref P107) (pin 2))
+      (node (ref U101) (pin 20)))
+    (net (code 14) (name "")
+      (node (ref U101) (pin 9)))
+    (net (code 15) (name "")
+      (node (ref U101) (pin 7)))
+    (net (code 16) (name "")
+      (node (ref U101) (pin 5)))
+    (net (code 17) (name "")
+      (node (ref U101) (pin 3)))
+    (net (code 18) (name /CS_DIS)
+      (node (ref U101) (pin 11))
+      (node (ref R108) (pin 1))
+      (node (ref P106) (pin 1)))
+    (net (code 19) (name /I2)
+      (node (ref R110) (pin 1))
+      (node (ref U101) (pin 10)))
+    (net (code 20) (name /I1)
+      (node (ref R109) (pin 1))
+      (node (ref U101) (pin 8)))
+    (net (code 21) (name /IN2)
       (node (ref R102) (pin 2))
+      (node (ref R106) (pin 1))
       (node (ref U101) (pin 4)))))

hardware/PowerSSO-24_breakout/PowerSSO-24_breakout.pro

@@ -1,50 +1,10 @@
-update=1/3/2015 6:40:55 PM
-last_client=pcbnew
+update=1/3/2015 8:02:45 PM
+last_client=eeschema
 [cvpcb]
 version=1
 NetIExt=net
 [cvpcb/libraries]
 EquName1=devcms
-[eeschema]
-version=1
-LibDir=../rusefi_lib
-NetFmtName=PcbnewAdvanced
-RptD_X=0
-RptD_Y=100
-RptLab=1
-LabSize=60
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=special
-LibName13=microcontrollers
-LibName14=dsp
-LibName15=microchip
-LibName16=analog_switches
-LibName17=motorola
-LibName18=texas
-LibName19=intel
-LibName20=audio
-LibName21=interface
-LibName22=digital-audio
-LibName23=philips
-LibName24=display
-LibName25=cypress
-LibName26=siliconi
-LibName27=opto
-LibName28=atmel
-LibName29=contrib
-LibName30=valves
-LibName31=vnd5e025aktr
 [pcbnew]
 version=1
 LastNetListRead=PowerSSO-24_breakout.net
@@ -85,3 +45,43 @@ LibName16=valves
 LibName17=SM0805-Jumper
 LibName18=d2pak_TO263AB
 LibName19=PowerSSO-24
+[eeschema]
+version=1
+LibDir=../rusefi_lib
+NetFmtName=PcbnewAdvanced
+RptD_X=0
+RptD_Y=100
+RptLab=1
+LabSize=60
+[eeschema/libraries]
+LibName1=power
+LibName2=device
+LibName3=transistors
+LibName4=conn
+LibName5=linear
+LibName6=regul
+LibName7=74xx
+LibName8=cmos4000
+LibName9=adc-dac
+LibName10=memory
+LibName11=xilinx
+LibName12=special
+LibName13=microcontrollers
+LibName14=dsp
+LibName15=microchip
+LibName16=analog_switches
+LibName17=motorola
+LibName18=texas
+LibName19=intel
+LibName20=audio
+LibName21=interface
+LibName22=digital-audio
+LibName23=philips
+LibName24=display
+LibName25=cypress
+LibName26=siliconi
+LibName27=opto
+LibName28=atmel
+LibName29=contrib
+LibName30=valves
+LibName31=vnd5e025aktr

hardware/PowerSSO-24_breakout/PowerSSO-24_breakout.sch

@@ -37,7 +37,7 @@ $Descr A 11000 8500
 encoding utf-8
 Sheet 1 1
 Title "pOWERsso-24 breakout"
-Date "3 jan 2015"
+Date "4 jan 2015"
 Rev "R0.1"
 Comp "rusEFI"
 Comment1 ""
@@ -449,4 +449,22 @@ Text Notes 6100 4500 0    60   ~ 0
 MCU GND\n\nMCU TTL\n\nMCU TTL
 Wire Wire Line
 	8550 4100 8550 4150
+$Comp
+L CONN_5 P104
+U 1 1 54A88BBE
+P 10050 6750
+F 0 "P104" V 10000 6750 50  0000 C CNN
+F 1 "CONN_5" V 10100 6750 50  0000 C CNN
+F 2 "SIL-5" H 10050 6750 60  0001 C CNN
+F 3 "" H 10050 6750 60  0000 C CNN
+	1    10050 6750
+	1    0    0    -1  
+$EndComp
+Text Notes 9550 6400 0    60   ~ 0
+Mounting connector
+NoConn ~ 9650 6550
+NoConn ~ 9650 6650
+NoConn ~ 9650 6750
+NoConn ~ 9650 6850
+NoConn ~ 9650 6950
 $EndSCHEMATC