diff --git a/Firmware/ActiveCables/PSXGun.ino b/Firmware/ActiveCables/PSXGun.ino new file mode 100644 index 0000000..30e6213 --- /dev/null +++ b/Firmware/ActiveCables/PSXGun.ino @@ -0,0 +1,155 @@ +// Need pullup on RX. Goes to any digital IO of LightGunVerter +// Everything else goes to PSX and shouldn't need pull ups/downs + +#define IN_CMD MOSI +#define OUT_DATA MISO +#define OUT_ACK 7 +#define IN_ATT SS +#define IN_CLK SCK +#define OUT_LED 2 + +#define GUNCON 0 +#define CONTROLLER_DATA_SIZE 8 // From LightGunVerter + +#include + +#if GUNCON +#define DATA_SIZE 8 // From PSX +uint8_t ReadMask[DATA_SIZE] = { 0xFF, 0xFF, 0, 0, 0, 0, 0, 0 }; +uint8_t ReadExpect[DATA_SIZE] = { 0x01, 0x42, 0, 0, 0, 0, 0, 0 }; +uint8_t Reply[DATA_SIZE] = { 0x63, 0x5A, 0xFF, 0xFF, 0x01, 0x00, 0x05, 0x00 }; +#else +#define DATA_SIZE 4 // From PSX +uint8_t ReadMask[DATA_SIZE] = { 0xFF, 0xFF, 0, 0 }; +uint8_t ReadExpect[DATA_SIZE] = { 0x01, 0x42, 0, 0 }; +uint8_t Reply[DATA_SIZE] = { 0x31, 0x5A, 0xFF, 0xFF }; +#endif + +uint8_t ControllerReadIndex = 0; +uint8_t ControllerData[CONTROLLER_DATA_SIZE]; +uint8_t DataIndex = 0; +bool bDataGood = true; + +#define ReadAttention() (PINB&(1<<2)) +#define WriteAckLow() (DDRD|=(1<<7)) +#define WriteAckHigh() (DDRD&=~(1<<7)) +#define WriteLEDLow() (PORTD&=~(1<<2)) +#define WriteLEDHigh() (PORTD|=(1<<2)) +#define DelayMicro() asm("NOP\nNOP\nNOP\nNOP\nNOP\nNOP\nNOP\nNOP\n") + +inline int ReadCommand() +{ + return digitalRead(IN_CMD); +} + +void setup() +{ + // LED for debugging + pinMode(OUT_LED, OUTPUT); + digitalWrite(OUT_LED, LOW); + + // Ack (open collector) + pinMode(OUT_ACK, INPUT); + digitalWrite(OUT_ACK, 0); + + // Set up SPI + pinMode(MISO, OUTPUT); + SPCR |= bit (SPE)|bit(DORD)|bit(CPOL)|bit(CPHA); + SPI.attachInterrupt(); + + // Set up LightGunVerter serial + Serial.begin(9600); +} + +ISR (SPI_STC_vect) +{ + uint8_t DataIn = SPDR; + + if (DataIndex < DATA_SIZE) // Acknowledge + { + bDataGood &= ((DataIn & ReadMask[DataIndex]) == ReadExpect[DataIndex]); + if (bDataGood) + { + SPDR = Reply[DataIndex]; + + WriteAckLow(); + DelayMicro(); + DelayMicro(); + DelayMicro(); + DelayMicro(); + WriteAckHigh(); + } + else + { + SPDR = 0xFF; + } + DataIndex++; + } + else + { + SPDR = 0xFF; + } +} + +void loop() +{ + if (ReadAttention() != 0) + { + if (DataIndex != 0) + { + DataIndex = 0; + bDataGood = true; + } + if (Serial.available()) + { + uint8_t SerialData = Serial.read(); + if (SerialData == 0x80) + { + if (ControllerReadIndex == CONTROLLER_DATA_SIZE) // Last lot of serial data was good + { + if (ControllerData[0] == 0x80 && ControllerData[1] == 0x00) // Player 1 data + { + uint16_t Buttons = 0xFFFF; + if (ControllerData[7] & (1<<0)) // Left + Buttons &= ~(1<<3); + if (ControllerData[7] & (1<<1)) // Right + Buttons &= ~(1<<14); +#if GUNCON + if (ControllerData[6] & (1<<3)) // B + Buttons &= ~(1<<13); +#else + if (ControllerData[6] & (1<<3)) // B + Buttons &= ~(1<<15); + uint16_t GunX = (ControllerData[2] << 7) + ControllerData[3]; + uint16_t GunY = (ControllerData[4] << 7) + ControllerData[5]; + if (GunX == 0x3FFF && GunY == 0x3FFF) + { + GunX = 0x01; + GunY = 0x0A; + } + else + { + GunX = 0x4D + (((1023 - GunX) * 3) >> 3); + GunY = 0x20 + ((GunY * 11) >> 5); + } +#endif + Reply[2] = Buttons & 0xFF; + Reply[3] = Buttons >> 8; +#if GUNCON + Reply[4] = GunX & 0xFF; + Reply[5] = GunX >> 8; + Reply[6] = GunY & 0xFF; + Reply[7] = GunY >> 8; +#endif + } + } + ControllerReadIndex = 0; + } + if (ControllerReadIndex < CONTROLLER_DATA_SIZE) + { + ControllerData[ControllerReadIndex] = SerialData; + } + ControllerReadIndex++; + } + } +} diff --git a/Firmware/main/main.cpp b/Firmware/main/main.cpp index d67da61..b9bda7e 100755 --- a/Firmware/main/main.cpp +++ b/Firmware/main/main.cpp @@ -298,7 +298,7 @@ class PlayerInput ReticuleXPosition[PlayerIdx] = TIMING_BACK_PORCH + (LineDuration*(int)Spot.X) / 1024; ReticuleStartLineNum[PlayerIdx] = TIMING_BLANKED_LINES + (VisibleLines*(int)Spot.Y) / 1024; SpotX = (uint16_t)Spot.X; - SpotY = (uint16_t)Spot.Y; + SpotY = (uint16_t)((Spot.Y * 3) / 4); } else { @@ -655,10 +655,10 @@ void WiimoteTask(void *pvParameters) ToTransmit[8 * i + 7] = (Buttons & 0x7F); } - gpio_matrix_out(OUT_PLAYER1_TRIGGER1_PULLED, U1TXD_OUT_IDX, false, false); - gpio_matrix_out(OUT_PLAYER1_TRIGGER2_PULLED, U1TXD_OUT_IDX, false, false); - gpio_matrix_out(OUT_PLAYER2_TRIGGER1_PULLED, U1TXD_OUT_IDX, false, false); - gpio_matrix_out(OUT_PLAYER2_TRIGGER2_PULLED, U1TXD_OUT_IDX, false, false); + gpio_matrix_out(OUT_PLAYER1_TRIGGER1_PULLED, U1TXD_OUT_IDX, true, false); + gpio_matrix_out(OUT_PLAYER1_TRIGGER2_PULLED, U1TXD_OUT_IDX, true, false); + gpio_matrix_out(OUT_PLAYER2_TRIGGER1_PULLED, U1TXD_OUT_IDX, true, false); + gpio_matrix_out(OUT_PLAYER2_TRIGGER2_PULLED, U1TXD_OUT_IDX, true, false); uart_tx_chars(UART_NUM_1, (char*)ToTransmit, sizeof(ToTransmit)); } @@ -979,7 +979,7 @@ int IRAM_ATTR SetupLine(uint32_t Bank, const int *StartingLine) { SourcePlayer = LastActivePlayer; } - if (CurrentLine == StartingLine[SourcePlayer] + ARRAY_NUM(ReticuleSizeLookup[0])/2) + if (CurrentLine == StartingLine[SourcePlayer]) { int Channel = RMT_TRIGGER_CHANNEL + Player; int DelayChannel = RMT_DELAY_TRIGGER_CHANNEL + Player; @@ -996,6 +996,10 @@ int IRAM_ATTR SetupLine(uint32_t Bank, const int *StartingLine) RMTMEM.chan[DelayChannel].data32[1].val = EndTerminator.val; Active |= (2 << Player); } + else if (CurrentLine > StartingLine[SourcePlayer] && CurrentLine < StartingLine[SourcePlayer] + ARRAY_NUM(ReticuleSizeLookup[0])) + { + Active |= (2 << Player); + } } return Active; diff --git a/KiCad/LCDZapperPro.kicad_pcb b/KiCad/LCDZapperPro.kicad_pcb index bf24b68..b03c55c 100644 --- a/KiCad/LCDZapperPro.kicad_pcb +++ b/KiCad/LCDZapperPro.kicad_pcb @@ -1,14 +1,14 @@ (kicad_pcb (version 4) (host pcbnew 4.0.6) (general - (links 242) + (links 246) (no_connects 0) (area 102.924999 63.924999 193.075001 140.575001) (thickness 1.6) (drawings 48) - (tracks 1229) + (tracks 1250) (zones 0) - (modules 123) + (modules 125) (nets 109) ) @@ -20,10 +20,10 @@ (33 F.Adhes user hide) (34 B.Paste user hide) (35 F.Paste user hide) - (36 B.SilkS user) + (36 B.SilkS user hide) (37 F.SilkS user) - (38 B.Mask user hide) - (39 F.Mask user hide) + (38 B.Mask user) + (39 F.Mask user) (40 Dwgs.User user hide) (41 Cmts.User user hide) (42 Eco1.User user hide) @@ -58,13 +58,13 @@ (mod_edge_width 0.15) (mod_text_size 0.75 0.75) (mod_text_width 0.125) - (pad_size 2.5 0.7) + (pad_size 6 6) (pad_drill 0) (pad_to_mask_clearance 0.2) (aux_axis_origin 0 0) (visible_elements FFFFFF7F) (pcbplotparams - (layerselection 0x010f0_80000001) + (layerselection 0x210f0_80000001) (usegerberextensions false) (excludeedgelayer true) (linewidth 0.100000) @@ -327,7 +327,7 @@ ) (module KiCad:LightGunVerterLogoLarge (layer B.Cu) (tedit 0) (tstamp 59F483A6) - (at 151 99.5 180) + (at 153.67 104.902 180) (fp_text reference G*** (at 0 0 180) (layer B.SilkS) hide (effects (font (thickness 0.3)) (justify mirror)) ) @@ -440,7 +440,7 @@ (xy 8.835535 6.249953) (xy 10.420733 6.480048) (xy 12.102996 6.383692)) (layer B.SilkS) (width 0.01)) ) - (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 56C35ED0) (tstamp 5990C14D) + (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 5B5399BB) (tstamp 5990C14D) (at 110 83) (descr "Mesurement Point, Round, SMD Pad, DM 1.5mm,") (tags "Mesurement Point Round SMD Pad 1.5mm") @@ -449,7 +449,7 @@ (fp_text reference TP1 (at 0 1.27) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value TEST_5V (at 0 2) (layer F.Fab) + (fp_text value TEST_5V (at -3.828 0.058) (layer F.Fab) hide (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05)) @@ -466,7 +466,7 @@ (fp_text reference R2 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 12K (at 0 2.3 180) (layer F.Fab) + (fp_text value 12K (at -4.858 0.134 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -499,7 +499,7 @@ (fp_text reference R1 (at 0 0.127 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 470 (at 0 2.3 180) (layer F.Fab) + (fp_text value 470 (at 0 -0.132 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -532,7 +532,7 @@ (fp_text reference U1 (at 1.245 0 450) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value AMS1117-3.3 (at 0 4.5 180) (layer F.Fab) + (fp_text value AMS1117-3.3 (at -0.23 -0.222 270) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start 1.91 3.41) (end 1.91 2.15) (layer F.SilkS) (width 0.12)) @@ -570,7 +570,7 @@ (fp_text reference R29 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 1K (at 0 2.3 180) (layer F.Fab) + (fp_text value 1K (at 0 0.058 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -603,7 +603,7 @@ (fp_text reference C8 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 220u (at 0 2.3) (layer F.Fab) + (fp_text value 220u (at 0.032 1.898) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.15)) @@ -636,7 +636,7 @@ (fp_text reference R28 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 100K (at 0 2.3 180) (layer F.Fab) + (fp_text value 100K (at 0.084 -1.836 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -669,7 +669,7 @@ (fp_text reference R19 (at 0 0 270) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 220 (at 0 2.3 90) (layer F.Fab) + (fp_text value 220 (at 0 -1.618 90) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -702,7 +702,7 @@ (fp_text reference R20 (at 0 0 270) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 220 (at 0 2.3 90) (layer F.Fab) + (fp_text value 220 (at 0.166 -1.618 90) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -735,7 +735,7 @@ (fp_text reference C6 (at 0 0 360) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 5.6n (at 0 2.3 180) (layer F.Fab) + (fp_text value 5.6n (at -0.17 1.76 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.15)) @@ -768,7 +768,7 @@ (fp_text reference R30 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 100K (at 0 2.3) (layer F.Fab) + (fp_text value 100K (at 0 1.836) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -801,7 +801,7 @@ (fp_text reference R27 (at 0 0 360) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 10K (at 0 2.3 180) (layer F.Fab) + (fp_text value 10K (at 4.404 0.06 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -834,7 +834,7 @@ (fp_text reference C7 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 5.6n (at 0 2.3) (layer F.Fab) + (fp_text value 5.6n (at 0 -1.76) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.15)) @@ -858,7 +858,7 @@ ) ) - (module Capacitors_SMD:C_1206_HandSoldering (layer F.Cu) (tedit 541A9C03) (tstamp 58E81881) + (module Capacitors_SMD:C_1206_HandSoldering (layer F.Cu) (tedit 5B539D39) (tstamp 58E81881) (at 189.5 90.5) (descr "Capacitor SMD 1206, hand soldering") (tags "capacitor 1206") @@ -867,7 +867,7 @@ (fp_text reference C3 (at 0 -0.127 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 1uF (at 0 2.3) (layer F.Fab) + (fp_text value 1u (at 0 0.178) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.15)) @@ -900,7 +900,7 @@ (fp_text reference C4 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 0.1u (at 0 2.3 180) (layer F.Fab) + (fp_text value 0.1u (at 5.005816 0.085088 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.15)) @@ -933,7 +933,7 @@ (fp_text reference C5 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 0.1u (at 0 2.3 180) (layer F.Fab) + (fp_text value 0.1u (at 4.93 0.168 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.15)) @@ -965,7 +965,7 @@ (fp_text reference J1 (at 1.27 13.97 90) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value PROGRAM (at 0 15.09) (layer F.Fab) + (fp_text value PROGRAM (at -2.234 6.474 90) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.27 -1.27) (end -1.27 13.97) (layer F.Fab) (width 0.1)) @@ -1010,7 +1010,7 @@ (fp_text reference R3 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 75 (at 0 2.3 180) (layer F.Fab) + (fp_text value 75 (at -0.074184 -0.128912 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1043,7 +1043,7 @@ (fp_text reference R4 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 10K (at 0 2.3) (layer F.Fab) + (fp_text value 10K (at 4.742 -0.06) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1076,7 +1076,7 @@ (fp_text reference R5 (at 0 0 360) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 12K (at 0 2.3 180) (layer F.Fab) + (fp_text value 12K (at 0 0.082 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1109,7 +1109,7 @@ (fp_text reference R6 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 330 (at 0 2.3) (layer F.Fab) + (fp_text value 330 (at -4.676 0.046) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1142,7 +1142,7 @@ (fp_text reference R7 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 10K (at 0 2.3 180) (layer F.Fab) + (fp_text value 10K (at -4.742 0.1 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1175,7 +1175,7 @@ (fp_text reference R8 (at 0 0 360) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 1K (at 0 2.3 180) (layer F.Fab) + (fp_text value 1K (at -0.032 -0.102 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1208,7 +1208,7 @@ (fp_text reference R9 (at 0 0 360) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 1K (at 0 2.3 180) (layer F.Fab) + (fp_text value 1K (at -0.032 -0.142 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1241,7 +1241,7 @@ (fp_text reference R10 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 5.6K (at 0 2.3) (layer F.Fab) + (fp_text value 5.6K (at 0.148 0.092) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1274,7 +1274,7 @@ (fp_text reference R11 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 75 (at 0 2.3) (layer F.Fab) + (fp_text value 75 (at 0 0.12) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1307,7 +1307,7 @@ (fp_text reference R12 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 33 (at 0 2.3 180) (layer F.Fab) + (fp_text value 33 (at -0.074184 -0.000912 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1340,7 +1340,7 @@ (fp_text reference R13 (at 0 0 360) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 100 (at 0 2.3 180) (layer F.Fab) + (fp_text value 100 (at 0 -0.16 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1373,7 +1373,7 @@ (fp_text reference R14 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 5.6K (at 0 2.3 180) (layer F.Fab) + (fp_text value 5.6K (at 0 -0.052 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1406,7 +1406,7 @@ (fp_text reference R15 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 68 (at 0 2.3 180) (layer F.Fab) + (fp_text value 68 (at 0.014 -0.12 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1439,7 +1439,7 @@ (fp_text reference R17 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 100 (at 0 2.3 180) (layer F.Fab) + (fp_text value 100 (at 0 -0.158 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1472,7 +1472,7 @@ (fp_text reference R18 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 2.2K (at 0 2.3) (layer F.Fab) + (fp_text value 2.2K (at 0.148 0.12) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1505,7 +1505,7 @@ (fp_text reference R21 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 100 (at 0 2.3) (layer F.Fab) + (fp_text value 100 (at 0 1.884) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1538,7 +1538,7 @@ (fp_text reference R22 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 2.2K (at 0 2.3) (layer F.Fab) + (fp_text value 2.2K (at 0.148 0.118) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1571,7 +1571,7 @@ (fp_text reference R23 (at 0 0 360) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 270 (at 0 2.3 180) (layer F.Fab) + (fp_text value 270 (at 0.014 -0.08 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1604,7 +1604,7 @@ (fp_text reference R24 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 560 (at 0 2.3) (layer F.Fab) + (fp_text value 560 (at -3.778 0.062 270) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1637,7 +1637,7 @@ (fp_text reference R25 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 100 (at 0 2.3) (layer F.Fab) + (fp_text value 100 (at 0.148 0.104) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1670,7 +1670,7 @@ (fp_text reference R26 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 10K (at 0 2.3) (layer F.Fab) + (fp_text value 10K (at -4.404 -0.1) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1694,13 +1694,13 @@ ) ) - (module ESP32-footprints-Lib:ESP32-WROOM (layer F.Cu) (tedit 5A520800) (tstamp 58E81A33) + (module ESP32-footprints-Lib:ESP32-WROOM (layer F.Cu) (tedit 5B5398DC) (tstamp 58E81A33) (at 186.75 102.5 90) (path /58E78087) (fp_text reference U2 (at 10.1854 -13.589 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value ESP32-WROOM (at 5.715 14.224 90) (layer F.Fab) + (fp_text value ESP32-WROOM (at -0.116 2.734 90) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_text user "Espressif Systems" (at -0.335 9.615 270) (layer F.SilkS) @@ -1715,35 +1715,35 @@ (fp_line (start -9 12.75) (end -9 -12.75) (layer F.SilkS) (width 0.15)) (fp_line (start -9 -12.75) (end 9 -12.75) (layer F.SilkS) (width 0.15)) (fp_line (start -9 12.75) (end 9 12.75) (layer F.SilkS) (width 0.15)) - (pad 38 smd oval (at -9 5.25 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 38 smd oval (at -9 5.25 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 2 GND)) - (pad 37 smd oval (at -9 3.98 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 37 smd oval (at -9 3.98 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 15 DIM)) - (pad 36 smd oval (at -9 2.71 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 36 smd oval (at -9 2.71 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 40 DIM_INV)) - (pad 35 smd oval (at -9 1.44 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 35 smd oval (at -9 1.44 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 12 TXD)) - (pad 34 smd oval (at -9 0.17 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 34 smd oval (at -9 0.17 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 11 RXD)) - (pad 33 smd oval (at -9 -1.1 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 33 smd oval (at -9 -1.1 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 16 CSYNC)) (pad 32 smd oval (at -9 -2.37 90) (size 2.5 0.7) (layers F.Cu) (net 96 "Net-(U2-Pad32)")) - (pad 31 smd oval (at -9 -3.64 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 31 smd oval (at -9 -3.64 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 13 WHITE)) - (pad 30 smd oval (at -9 -4.91 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 30 smd oval (at -9 -4.91 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 44 SELECT2)) - (pad 29 smd oval (at -9 -6.18 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 29 smd oval (at -9 -6.18 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 68 SELECT2_DELAY)) - (pad 28 smd oval (at -9 -7.45 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 28 smd oval (at -9 -7.45 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 43 SELECT1)) - (pad 27 smd oval (at -9 -8.72 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 27 smd oval (at -9 -8.72 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 69 SELECT1_DELAY)) - (pad 26 smd oval (at -9 -9.99 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 26 smd oval (at -9 -9.99 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 66 FRONTLED1)) - (pad 25 smd oval (at -9 -11.26 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 25 smd oval (at -9 -11.26 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 9 IO0)) - (pad 24 smd oval (at -5.715 -12.75 90) (size 0.7 2.5) (layers F.Cu F.Paste F.Mask) + (pad 24 smd oval (at -5.715 -12.75 90) (size 0.7 2.5) (layers F.Cu F.Mask) (net 65 "Net-(R10-Pad2)")) (pad 23 smd oval (at -4.445 -12.75 90) (size 0.7 2.5) (layers F.Cu) (net 97 "Net-(U2-Pad23)")) @@ -1759,23 +1759,23 @@ (net 102 "Net-(U2-Pad18)")) (pad 17 smd oval (at 3.175 -12.75 90) (size 0.7 2.5) (layers F.Cu) (net 103 "Net-(U2-Pad17)")) - (pad 16 smd oval (at 4.445 -12.75 90) (size 0.7 2.5) (layers F.Cu F.Paste F.Mask) + (pad 16 smd oval (at 4.445 -12.75 90) (size 0.7 2.5) (layers F.Cu F.Mask) (net 89 WHITE_LEVEL)) (pad 15 smd oval (at 5.715 -12.75 90) (size 0.7 2.5) (layers F.Cu F.Paste F.Mask) (net 2 GND)) (pad 14 smd oval (at 9 -11.26 90) (size 2.5 0.7) (layers F.Cu) (net 104 "Net-(U2-Pad14)")) - (pad 13 smd oval (at 9 -9.99 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 13 smd oval (at 9 -9.99 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 48 SIG1_2)) - (pad 12 smd oval (at 9 -8.72 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 12 smd oval (at 9 -8.72 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 47 SIG1_1)) - (pad 11 smd oval (at 9 -7.45 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 11 smd oval (at 9 -7.45 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 50 SIG2_2)) - (pad 10 smd oval (at 9 -6.18 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 10 smd oval (at 9 -6.18 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 49 SIG2_1)) - (pad 9 smd oval (at 9 -4.91 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 9 smd oval (at 9 -4.91 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 91 DIM1)) - (pad 8 smd oval (at 9 -3.64 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 8 smd oval (at 9 -3.64 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 67 FRONTLED2)) (pad 7 smd oval (at 9 -2.37 90) (size 2.5 0.7) (layers F.Cu) (net 105 "Net-(U2-Pad7)")) @@ -1785,13 +1785,13 @@ (net 107 "Net-(U2-Pad5)")) (pad 4 smd oval (at 9 1.44 90) (size 2.5 0.7) (layers F.Cu) (net 108 "Net-(U2-Pad4)")) - (pad 3 smd oval (at 9 2.71 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 3 smd oval (at 9 2.71 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 10 EN)) - (pad 2 smd oval (at 9 3.98 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 2 smd oval (at 9 3.98 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 3 +3V3)) - (pad 1 smd oval (at 9 5.25 90) (size 2.5 0.7) (layers F.Cu F.Paste F.Mask) + (pad 1 smd oval (at 9 5.25 90) (size 2.5 0.7) (layers F.Cu F.Mask) (net 2 GND)) - (pad 39 smd rect (at 0.3 -2.45 90) (size 6 6) (layers F.Cu F.Paste F.Mask) + (pad 39 smd rect (at 0.3 -2.45 90) (size 6 6) (layers F.Cu F.Mask) (net 2 GND)) ) @@ -1804,7 +1804,7 @@ (fp_text reference C9 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 0.1u (at 0 2.3 180) (layer F.Fab) + (fp_text value 0.1u (at 4.93 0.272 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.15)) @@ -1837,7 +1837,7 @@ (fp_text reference C10 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 1u (at 0 2.3 180) (layer F.Fab) + (fp_text value 1u (at -0.008 0.114 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.15)) @@ -1870,7 +1870,7 @@ (fp_text reference C11 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 0.1u (at 0 2.3 180) (layer F.Fab) + (fp_text value 0.1u (at 4.93 -0.02 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.15)) @@ -1903,7 +1903,7 @@ (fp_text reference C12 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 220p (at 0 2.3 180) (layer F.Fab) + (fp_text value 220p (at -4.834 -0.06 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.15)) @@ -1936,7 +1936,7 @@ (fp_text reference R31 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 75 (at 0 2.3) (layer F.Fab) + (fp_text value 75 (at 0.15 -0.058) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -1969,7 +1969,7 @@ (fp_text reference R32 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 330 (at 0 2.3) (layer F.Fab) + (fp_text value 330 (at -4.676 -0.02) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -2002,7 +2002,7 @@ (fp_text reference R33 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 47 (at 0 2.3 180) (layer F.Fab) + (fp_text value 47 (at 0.104 -0.06 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -2035,7 +2035,7 @@ (fp_text reference R34 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 560 (at 0 2.3 180) (layer F.Fab) + (fp_text value 560 (at -4.58 -0.1 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -2068,7 +2068,7 @@ (fp_text reference R35 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 330 (at 0 2.3 180) (layer F.Fab) + (fp_text value 330 (at -4.58 0.02 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -2101,7 +2101,7 @@ (fp_text reference R36 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 39 (at 0 2.3) (layer F.Fab) + (fp_text value 39 (at 0.008 0.02) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -2134,7 +2134,7 @@ (fp_text reference R37 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 10K (at 0 2.3 180) (layer F.Fab) + (fp_text value 10K (at 0 0.014 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -2167,7 +2167,7 @@ (fp_text reference R38 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 10K (at 0 2.3 180) (layer F.Fab) + (fp_text value 10K (at 0 0.016 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -2200,7 +2200,7 @@ (fp_text reference R43 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 10K (at 0 2.3 180) (layer F.Fab) + (fp_text value 10K (at 0 -0.026 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -2233,7 +2233,7 @@ (fp_text reference R44 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 10K (at 0 2.3 180) (layer F.Fab) + (fp_text value 10K (at 0 -0.066 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -2266,7 +2266,7 @@ (fp_text reference R46 (at 0.095 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 10K (at 0 2.3) (layer F.Fab) + (fp_text value 10K (at 0.148 0.024) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -2299,7 +2299,7 @@ (fp_text reference R47 (at 0 0 360) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 10K (at 0 2.3 180) (layer F.Fab) + (fp_text value 10K (at 0 -0.064 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -2332,7 +2332,7 @@ (fp_text reference R53 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 10K (at 0 2.3) (layer F.Fab) + (fp_text value 10K (at -0.106 -0.054) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -2365,7 +2365,7 @@ (fp_text reference R54 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 10K (at 0 2.3 180) (layer F.Fab) + (fp_text value 10K (at 0 0.056 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -2397,7 +2397,7 @@ (fp_text reference SW1 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value RESET (at 0 3) (layer F.Fab) + (fp_text value RESET (at 0 1.752) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.4 -0.7) (end 1.4 -0.7) (layer F.SilkS) (width 0.15)) @@ -2428,7 +2428,7 @@ (fp_text reference SW2 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value PROG_SW (at 0 3) (layer F.Fab) + (fp_text value PROG_SW (at 0.148 -1.782) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.4 -0.7) (end 1.4 -0.7) (layer F.SilkS) (width 0.15)) @@ -2451,7 +2451,7 @@ (net 9 IO0)) ) - (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 56C35ED0) (tstamp 5990C151) + (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 5B5399C0) (tstamp 5990C151) (at 127 76.5) (descr "Mesurement Point, Round, SMD Pad, DM 1.5mm,") (tags "Mesurement Point Round SMD Pad 1.5mm") @@ -2460,7 +2460,7 @@ (fp_text reference TP2 (at 0 1.5) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value TEST_3.3 (at 0 2) (layer F.Fab) + (fp_text value TEST_3.3 (at 0 1.478) (layer F.Fab) hide (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05)) @@ -2468,7 +2468,7 @@ (net 3 +3V3)) ) - (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 56C35ED0) (tstamp 5990C155) + (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 5B539A30) (tstamp 5990C155) (at 123 122.5) (descr "Mesurement Point, Round, SMD Pad, DM 1.5mm,") (tags "Mesurement Point Round SMD Pad 1.5mm") @@ -2477,7 +2477,7 @@ (fp_text reference TP3 (at 0 1.5) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value TEST_VIN (at 0 2) (layer F.Fab) + (fp_text value TEST_VIN (at 0 2) (layer F.Fab) hide (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05)) @@ -2485,7 +2485,7 @@ (net 4 "Net-(C4-Pad1)")) ) - (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 56C35ED0) (tstamp 5990C159) + (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 5B539ABF) (tstamp 5990C159) (at 134 133.5) (descr "Mesurement Point, Round, SMD Pad, DM 1.5mm,") (tags "Mesurement Point Round SMD Pad 1.5mm") @@ -2494,7 +2494,7 @@ (fp_text reference TP5 (at 0 1.5) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value TEST_VDIM (at 0 2) (layer F.Fab) + (fp_text value TEST_VDIM (at 0 2) (layer F.Fab) hide (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05)) @@ -2502,7 +2502,7 @@ (net 17 "Net-(R15-Pad2)")) ) - (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 56C35ED0) (tstamp 5990C15D) + (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 5B539AE9) (tstamp 5990C15D) (at 146.5 131.5 270) (descr "Mesurement Point, Round, SMD Pad, DM 1.5mm,") (tags "Mesurement Point Round SMD Pad 1.5mm") @@ -2511,7 +2511,7 @@ (fp_text reference TP6 (at 0 -2 360) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value TEST_DIM (at 0 2 270) (layer F.Fab) + (fp_text value TEST_DIM (at 0 2 270) (layer F.Fab) hide (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05)) @@ -2519,7 +2519,7 @@ (net 15 DIM)) ) - (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 56C35ED0) (tstamp 5990C161) + (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 5B539AC2) (tstamp 5990C161) (at 134 130.5) (descr "Mesurement Point, Round, SMD Pad, DM 1.5mm,") (tags "Mesurement Point Round SMD Pad 1.5mm") @@ -2528,7 +2528,7 @@ (fp_text reference TP7 (at 0 1.5) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value TEST_VOUT (at 0 2) (layer F.Fab) + (fp_text value TEST_VOUT (at 0 2) (layer F.Fab) hide (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05)) @@ -2536,7 +2536,7 @@ (net 19 "Net-(C8-Pad2)")) ) - (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 56C35ED0) (tstamp 5990C165) + (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 5B539C3C) (tstamp 5990C165) (at 152 102.5 180) (descr "Mesurement Point, Round, SMD Pad, DM 1.5mm,") (tags "Mesurement Point Round SMD Pad 1.5mm") @@ -2545,7 +2545,7 @@ (fp_text reference TP9 (at 0 -1.5 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value TEST_SEL1 (at 0 2 180) (layer F.Fab) + (fp_text value TEST_SEL1 (at 0 2 180) (layer F.Fab) hide (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05)) @@ -2553,7 +2553,7 @@ (net 44 SELECT2)) ) - (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 56C35ED0) (tstamp 5990C171) + (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 5B539C3F) (tstamp 5990C171) (at 152 100 180) (descr "Mesurement Point, Round, SMD Pad, DM 1.5mm,") (tags "Mesurement Point Round SMD Pad 1.5mm") @@ -2562,7 +2562,7 @@ (fp_text reference TP13 (at 0 1.5 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value TEST_TRIG1 (at 0 2 180) (layer F.Fab) + (fp_text value TEST_TRIG1 (at 0 2 180) (layer F.Fab) hide (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05)) @@ -2570,7 +2570,7 @@ (net 45 "Net-(TP13-Pad1)")) ) - (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 56C35ED0) (tstamp 5990C175) + (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 5B5399D1) (tstamp 5990C175) (at 139 100 180) (descr "Mesurement Point, Round, SMD Pad, DM 1.5mm,") (tags "Mesurement Point Round SMD Pad 1.5mm") @@ -2579,7 +2579,7 @@ (fp_text reference TP14 (at 0 1.5 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value TEST_TRIG2 (at 0 2 180) (layer F.Fab) + (fp_text value TEST_TRIG2 (at 0 2 180) (layer F.Fab) hide (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05)) @@ -2587,7 +2587,7 @@ (net 46 "Net-(TP14-Pad1)")) ) - (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 56C35ED0) (tstamp 5990C179) + (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 5B5399AE) (tstamp 5990C179) (at 122.5 103.5 270) (descr "Mesurement Point, Round, SMD Pad, DM 1.5mm,") (tags "Mesurement Point Round SMD Pad 1.5mm") @@ -2596,7 +2596,7 @@ (fp_text reference TP15 (at 1.5 0.127 360) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value TEST_CIN (at 0 2 270) (layer F.Fab) + (fp_text value TEST_CIN (at -0.122 -0.182 270) (layer F.Fab) hide (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05)) @@ -2604,7 +2604,7 @@ (net 20 "Net-(C9-Pad1)")) ) - (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 56C35ED0) (tstamp 5990C17D) + (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 5B5399CA) (tstamp 5990C17D) (at 132 104 180) (descr "Mesurement Point, Round, SMD Pad, DM 1.5mm,") (tags "Mesurement Point Round SMD Pad 1.5mm") @@ -2613,7 +2613,7 @@ (fp_text reference TP17 (at 0 1.5 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value TEST_CSYNC (at 0 2 180) (layer F.Fab) + (fp_text value TEST_CSYNC (at 0 2 180) (layer F.Fab) hide (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05)) @@ -2621,7 +2621,7 @@ (net 16 CSYNC)) ) - (module Capacitors_SMD:C_1206_HandSoldering (layer F.Cu) (tedit 541A9C03) (tstamp 5999BFBB) + (module Capacitors_SMD:C_1206_HandSoldering (layer F.Cu) (tedit 5B539AB6) (tstamp 5999BFBB) (at 129 129) (descr "Capacitor SMD 1206, hand soldering") (tags "capacitor 1206") @@ -2630,7 +2630,7 @@ (fp_text reference C18 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 1uF (at 0 2.3) (layer F.Fab) + (fp_text value 1u (at 0.032 0.032) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.15)) @@ -2662,7 +2662,7 @@ (fp_text reference J10 (at 1.27 -0.635 90) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value CONN_01X02 (at 0 4.93) (layer F.Fab) + (fp_text value CONN_01X02 (at -2.368 1.63 90) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.27 -1.27) (end -1.27 3.81) (layer F.Fab) (width 0.1)) @@ -2699,7 +2699,7 @@ (fp_text reference R55 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 0 (at 0 2.3) (layer F.Fab) + (fp_text value 0 (at 0.032 0.08) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -2723,7 +2723,7 @@ ) ) - (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 56C35ED0) (tstamp 5999BFCB) + (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 5B5399CE) (tstamp 5999BFCB) (at 139 102.5) (descr "Mesurement Point, Round, SMD Pad, DM 1.5mm,") (tags "Mesurement Point Round SMD Pad 1.5mm") @@ -2732,7 +2732,7 @@ (fp_text reference TP10 (at 0 1.5 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value TEST_SEL2 (at 0 2) (layer F.Fab) + (fp_text value TEST_SEL2 (at 0 2) (layer F.Fab) hide (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05)) @@ -2740,7 +2740,7 @@ (net 43 SELECT1)) ) - (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 56C35ED0) (tstamp 5999BFD0) + (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 5B5399D5) (tstamp 5999BFD0) (at 135.5 103) (descr "Mesurement Point, Round, SMD Pad, DM 1.5mm,") (tags "Mesurement Point Round SMD Pad 1.5mm") @@ -2749,7 +2749,7 @@ (fp_text reference TP12 (at 0 1.5 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value TEST_WHITE (at 0 2) (layer F.Fab) + (fp_text value TEST_WHITE (at 0 2) (layer F.Fab) hide (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05)) @@ -2765,7 +2765,7 @@ (fp_text reference C1 (at 0.087 1.905 90) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 220uF (at 1.25 4.81) (layer F.Fab) + (fp_text value 220u (at 1.332 1.884) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 1.25 0) (end 5 0) (layer F.Fab) (width 0.1)) @@ -2942,7 +2942,7 @@ (fp_text reference C2 (at -0.254 -2.032 270) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 220uF (at 1.25 4.81 180) (layer F.Fab) + (fp_text value 220u (at 1.254 -1.63 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 1.25 0) (end 5 0) (layer F.Fab) (width 0.1)) @@ -3120,7 +3120,7 @@ (fp_text reference U3 (at -0.127 -0.254 90) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value CLC2007 (at 0 3.5) (layer F.Fab) + (fp_text value CLC2007 (at 0 0.214 90) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.95 -2.45) (end 1.95 -2.45) (layer F.Fab) (width 0.15)) @@ -3171,7 +3171,7 @@ (fp_text reference U4 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value TS3022 (at 0 3.5) (layer F.Fab) + (fp_text value TS3022 (at 0.074 0.045 90) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.95 -2.45) (end 1.95 -2.45) (layer F.Fab) (width 0.15)) @@ -3222,7 +3222,7 @@ (fp_text reference D5 (at -0.151 0.127 270) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5 270) (layer F.Fab) + (fp_text value D_Schottky (at -0.572 5.962 360) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -3264,7 +3264,7 @@ (fp_text reference D8 (at -0.23 0.066 270) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5 270) (layer F.Fab) + (fp_text value D_Schottky (at 1.902 4.642 360) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -3306,7 +3306,7 @@ (fp_text reference D2 (at 0 -1.5 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value LED (at 0 2 180) (layer F.Fab) + (fp_text value LED (at -4.858 0.094 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.5 -0.5) (end -0.5 0.5) (layer F.Fab) (width 0.15)) @@ -3353,7 +3353,7 @@ (fp_text reference U5 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 74LCX08 (at 0 5.375 180) (layer F.Fab) + (fp_text value 74LCX08 (at -0.092 -0.036 270) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.95 -4.35) (end 1.95 -4.35) (layer F.Fab) (width 0.15)) @@ -3416,7 +3416,7 @@ (fp_text reference U6 (at 0.323164 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 74LV32 (at 0 5.375 180) (layer F.Fab) + (fp_text value 74LV32 (at 0 0.028 270) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.95 -4.35) (end 1.95 -4.35) (layer F.Fab) (width 0.15)) @@ -3479,7 +3479,7 @@ (fp_text reference U7 (at 0 0 270) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 74LV06 (at 0 5.375 180) (layer F.Fab) + (fp_text value 74LV06 (at -0.092 0.022 270) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.95 -4.35) (end 1.95 -4.35) (layer F.Fab) (width 0.15)) @@ -3542,7 +3542,7 @@ (fp_text reference J2 (at 0 0.30036) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value USB_B (at 0 -7.0993) (layer F.Fab) + (fp_text value USB_B (at 0.0309 -0.26608) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -4.85 -5.7) (end 4.85 -5.7) (layer F.CrtYd) (width 0.05)) @@ -3695,7 +3695,7 @@ (fp_text reference D1 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5) (layer F.Fab) + (fp_text value D_Schottky (at 1.498 -2.552) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -3737,7 +3737,7 @@ (fp_text reference D3 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5 180) (layer F.Fab) + (fp_text value D_Schottky (at -6.686 -0.062 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -3779,7 +3779,7 @@ (fp_text reference D4 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5 180) (layer F.Fab) + (fp_text value D_Schottky (at -1.686 -2.274 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -3821,7 +3821,7 @@ (fp_text reference D6 (at 0 0 90) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5 90) (layer F.Fab) + (fp_text value D_Schottky (at -2.074 -1.696 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -3863,7 +3863,7 @@ (fp_text reference D7 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5) (layer F.Fab) + (fp_text value D_Schottky (at -1.094 2.5) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -3905,7 +3905,7 @@ (fp_text reference D9 (at 0 0 90) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5 90) (layer F.Fab) + (fp_text value D_Schottky (at 1.736 1.73 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -3946,7 +3946,7 @@ (fp_text reference J5 (at 2 1.54 360) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value CONN_01X02 (at 0 4.93 270) (layer F.Fab) + (fp_text value CONN_01X02 (at 2.414 1.6 360) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.27 -1.27) (end -1.27 3.81) (layer F.Fab) (width 0.1)) @@ -4077,7 +4077,7 @@ (fp_text reference R39 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 330K (at 0 2.3) (layer F.Fab) + (fp_text value 330K (at -4.93 0.08) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -4110,7 +4110,7 @@ (fp_text reference R40 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 330K (at 0 2.3 180) (layer F.Fab) + (fp_text value 330K (at 5.042 0.058 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -4291,7 +4291,7 @@ (fp_text reference C13 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 1u (at 0 2.3) (layer F.Fab) + (fp_text value 1u (at -0.086 0.086) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.15)) @@ -4324,7 +4324,7 @@ (fp_text reference C14 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 220p (at 0 2.3 180) (layer F.Fab) + (fp_text value 220p (at 5.048 0.486 360) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.15)) @@ -4357,7 +4357,7 @@ (fp_text reference D10 (at -0.5 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5 180) (layer F.Fab) + (fp_text value D_Schottky (at -6.602 0 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -4399,7 +4399,7 @@ (fp_text reference D11 (at -0.5 -0.05 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5 180) (layer F.Fab) + (fp_text value D_Schottky (at -6.602 0.098 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -4441,7 +4441,7 @@ (fp_text reference D12 (at -0.5 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5 180) (layer F.Fab) + (fp_text value D_Schottky (at -6.602 -0.016 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -4483,7 +4483,7 @@ (fp_text reference D13 (at -0.5 -0.05 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5 180) (layer F.Fab) + (fp_text value D_Schottky (at -6.602 -0.072 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -4525,7 +4525,7 @@ (fp_text reference D14 (at -0.5 -0.05) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5) (layer F.Fab) + (fp_text value D_Schottky (at 6.856 -0.126) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -4567,7 +4567,7 @@ (fp_text reference D15 (at -0.5 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5) (layer F.Fab) + (fp_text value D_Schottky (at 6.602 -0.406) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -4609,7 +4609,7 @@ (fp_text reference D16 (at -0.5 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5 180) (layer F.Fab) + (fp_text value D_Schottky (at -6.856 0.112 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -4651,7 +4651,7 @@ (fp_text reference D17 (at -0.5 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5 180) (layer F.Fab) + (fp_text value D_Schottky (at -6.602 0.096 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -4693,7 +4693,7 @@ (fp_text reference D18 (at -0.5 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5 180) (layer F.Fab) + (fp_text value D_Schottky (at -6.602 0.04 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -4735,7 +4735,7 @@ (fp_text reference D19 (at -0.5 -0.05 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5 180) (layer F.Fab) + (fp_text value D_Schottky (at -6.602 0.056 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -4777,7 +4777,7 @@ (fp_text reference R41 (at 0 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 56K (at 0 2.3) (layer F.Fab) + (fp_text value 56K (at 4.486 0.046) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -5331,7 +5331,7 @@ (fp_text reference D21 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_TVS_x2_AAC (at 0 2.5 180) (layer F.Fab) + (fp_text value D_TVS_x2_AAC (at -0.044 2.68 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12)) @@ -5368,7 +5368,7 @@ (fp_text reference D22 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value D_Schottky (at 0 2.5 180) (layer F.Fab) + (fp_text value D_Schottky (at -6.432 -0.024 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -0.15 -0.45) (end -0.4 -0.45) (layer F.Fab) (width 0.1)) @@ -5410,7 +5410,7 @@ (fp_text reference R16 (at 0 0 180) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value 470 (at 0 2.3 180) (layer F.Fab) + (fp_text value 470 (at -1.764 1.484 180) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) @@ -5434,7 +5434,7 @@ ) ) - (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 5A520348) (tstamp 5A520945) + (module Measurement_Points:Measurement_Point_Round-SMD-Pad_Small (layer F.Cu) (tedit 5B539AED) (tstamp 5A520945) (at 146.5 125.75) (descr "Mesurement Point, Round, SMD Pad, DM 1.5mm,") (tags "Mesurement Point Round SMD Pad 1.5mm") @@ -5443,7 +5443,7 @@ (fp_text reference TP4 (at 2.25 0) (layer F.SilkS) (effects (font (size 0.75 0.75) (thickness 0.125))) ) - (fp_text value TEST_DIM2 (at 0 2) (layer F.Fab) + (fp_text value TEST_DIM2 (at 0 2) (layer F.Fab) hide (effects (font (size 1 1) (thickness 0.15))) ) (fp_circle (center 0 0) (end 1 0) (layer F.CrtYd) (width 0.05)) @@ -5451,6 +5451,72 @@ (net 91 DIM1)) ) + (module Resistors_SMD:R_1206_HandSoldering (layer F.Cu) (tedit 5B545CE3) (tstamp 5B5461AE) + (at 147.606 107.442) + (descr "Resistor SMD 1206, hand soldering") + (tags "resistor 1206") + (path /5B547A74) + (attr smd) + (fp_text reference R42 (at 0 0) (layer F.SilkS) + (effects (font (size 0.75 0.75) (thickness 0.15))) + ) + (fp_text value 10K (at 4.54 0) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) + (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1)) + (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1)) + (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1)) + (fp_line (start -3.3 -1.2) (end 3.3 -1.2) (layer F.CrtYd) (width 0.05)) + (fp_line (start -3.3 1.2) (end 3.3 1.2) (layer F.CrtYd) (width 0.05)) + (fp_line (start -3.3 -1.2) (end -3.3 1.2) (layer F.CrtYd) (width 0.05)) + (fp_line (start 3.3 -1.2) (end 3.3 1.2) (layer F.CrtYd) (width 0.05)) + (fp_line (start 1 1.075) (end -1 1.075) (layer F.SilkS) (width 0.15)) + (fp_line (start -1 -1.075) (end 1 -1.075) (layer F.SilkS) (width 0.15)) + (pad 1 smd rect (at -2 0) (size 2 1.7) (layers F.Cu F.Paste F.Mask) + (net 44 SELECT2)) + (pad 2 smd rect (at 2 0) (size 2 1.7) (layers F.Cu F.Paste F.Mask) + (net 2 GND)) + (model Resistors_SMD.3dshapes/R_1206_HandSoldering.wrl + (at (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (module Resistors_SMD:R_1206_HandSoldering (layer F.Cu) (tedit 5B545CEA) (tstamp 5B5461B4) + (at 147.606 109.728) + (descr "Resistor SMD 1206, hand soldering") + (tags "resistor 1206") + (path /5B5498CC) + (attr smd) + (fp_text reference R45 (at 0 0) (layer F.SilkS) + (effects (font (size 0.75 0.75) (thickness 0.15))) + ) + (fp_text value 10K (at 4.54 0) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) + (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1)) + (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1)) + (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1)) + (fp_line (start -3.3 -1.2) (end 3.3 -1.2) (layer F.CrtYd) (width 0.05)) + (fp_line (start -3.3 1.2) (end 3.3 1.2) (layer F.CrtYd) (width 0.05)) + (fp_line (start -3.3 -1.2) (end -3.3 1.2) (layer F.CrtYd) (width 0.05)) + (fp_line (start 3.3 -1.2) (end 3.3 1.2) (layer F.CrtYd) (width 0.05)) + (fp_line (start 1 1.075) (end -1 1.075) (layer F.SilkS) (width 0.15)) + (fp_line (start -1 -1.075) (end 1 -1.075) (layer F.SilkS) (width 0.15)) + (pad 1 smd rect (at -2 0) (size 2 1.7) (layers F.Cu F.Paste F.Mask) + (net 43 SELECT1)) + (pad 2 smd rect (at 2 0) (size 2 1.7) (layers F.Cu F.Paste F.Mask) + (net 2 GND)) + (model Resistors_SMD.3dshapes/R_1206_HandSoldering.wrl + (at (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + (gr_line (start 125.5 133.275) (end 132.5 133.275) (layer F.SilkS) (width 0.2)) (gr_line (start 117 109) (end 117 106) (layer F.SilkS) (width 0.2)) (gr_line (start 124 109) (end 117 109) (layer F.SilkS) (width 0.2)) @@ -5461,7 +5527,7 @@ (gr_line (start 132.5 133) (end 132.5 136) (layer F.SilkS) (width 0.2)) (gr_line (start 132.5 130.5) (end 132.5 133) (layer F.SilkS) (width 0.2)) (gr_line (start 125.5 130.5) (end 132.5 130.5) (layer F.SilkS) (width 0.2)) - (gr_text V4.2 (at 134.5 121.5) (layer F.SilkS) (tstamp 59C62D73) + (gr_text V4.3 (at 134.5 121.5) (layer F.SilkS) (tstamp 59C62D73) (effects (font (size 1 1) (thickness 0.25))) ) (gr_text Progamming (at 159.5 103.5 90) (layer F.SilkS) @@ -5622,6 +5688,11 @@ (segment (start 113 86) (end 110 83) (width 1) (layer F.Cu) (net 1)) (segment (start 122.3 71.9) (end 122.55 71.9) (width 1) (layer F.Cu) (net 1)) (segment (start 122.55 71.9) (end 126.95 67.5) (width 1) (layer F.Cu) (net 1)) + (segment (start 142 116.5) (end 149.606 116.5) (width 1) (layer F.Cu) (net 2)) + (segment (start 149.606 116.5) (end 152 116.5) (width 1) (layer F.Cu) (net 2)) + (segment (start 149.606 111.578) (end 149.606 116.5) (width 1) (layer F.Cu) (net 2)) + (segment (start 149.606 109.728) (end 149.606 111.578) (width 1) (layer F.Cu) (net 2)) + (segment (start 149.606 107.442) (end 149.606 109.728) (width 1) (layer F.Cu) (net 2)) (segment (start 160 71.5) (end 156.54 71.5) (width 1) (layer F.Cu) (net 2)) (segment (start 159.289998 122.95) (end 156.25 119.910002) (width 1) (layer F.Cu) (net 2)) (segment (start 156.25 119.910002) (end 152.839998 116.5) (width 1) (layer F.Cu) (net 2)) @@ -5673,7 +5744,6 @@ (segment (start 181.306571 119.592571) (end 181.306571 128.121429) (width 1) (layer B.Cu) (net 2)) (segment (start 181.306571 128.121429) (end 180.606569 128.821431) (width 1) (layer B.Cu) (net 2)) (segment (start 180.606569 128.821431) (end 179.856 129.572) (width 1) (layer B.Cu) (net 2)) - (segment (start 142 116.5) (end 152 116.5) (width 1) (layer F.Cu) (net 2)) (segment (start 160 122.95) (end 159.289998 122.95) (width 1) (layer F.Cu) (net 2)) (segment (start 152.839998 116.5) (end 152 116.5) (width 1) (layer F.Cu) (net 2)) (segment (start 125.5 109.81) (end 125.5 111.11) (width 1) (layer F.Cu) (net 2)) @@ -6372,12 +6442,20 @@ (segment (start 127.724989 106.859989) (end 127.724989 98.125011) (width 0.25) (layer F.Cu) (net 42)) (segment (start 127.724989 98.125011) (end 129.35 96.5) (width 0.25) (layer F.Cu) (net 42)) (segment (start 129.35 96.5) (end 129.5 96.5) (width 0.25) (layer F.Cu) (net 42)) + (segment (start 144.526 105.664) (end 144.226001 105.963999) (width 0.25) (layer F.Cu) (net 43)) + (segment (start 144.226001 105.963999) (end 144.226001 108.498001) (width 0.25) (layer F.Cu) (net 43)) + (segment (start 144.226001 108.498001) (end 145.456 109.728) (width 0.25) (layer F.Cu) (net 43)) + (segment (start 145.456 109.728) (end 145.606 109.728) (width 0.25) (layer F.Cu) (net 43)) + (segment (start 142.748 102) (end 140.5 102) (width 0.25) (layer B.Cu) (net 43)) + (segment (start 159 102) (end 142.748 102) (width 0.25) (layer B.Cu) (net 43)) + (segment (start 142.748 102) (end 142.748 103.886) (width 0.25) (layer B.Cu) (net 43)) + (segment (start 142.748 103.886) (end 144.526 105.664) (width 0.25) (layer B.Cu) (net 43)) + (via (at 144.526 105.664) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 43)) (segment (start 140 101.5) (end 140.5 101) (width 0.25) (layer F.Cu) (net 43)) (segment (start 140.5 101) (end 141.46 100.04) (width 0.25) (layer F.Cu) (net 43)) (segment (start 140.025011 101.525011) (end 140.5 101.050022) (width 0.25) (layer F.Cu) (net 43)) (segment (start 140.5 101.050022) (end 140.5 101) (width 0.25) (layer F.Cu) (net 43)) (segment (start 140.5 102) (end 140.025011 101.525011) (width 0.25) (layer F.Cu) (net 43)) - (segment (start 159 102) (end 140.5 102) (width 0.25) (layer B.Cu) (net 43)) (via (at 140.5 102) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 43)) (segment (start 179.3 111.5) (end 179.3 112.3) (width 0.25) (layer F.Cu) (net 43)) (via (at 159 102) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 43)) @@ -6388,6 +6466,11 @@ (segment (start 158.874999 102.125001) (end 159 102) (width 0.25) (layer F.Cu) (net 43)) (segment (start 139 102.5) (end 140 101.5) (width 0.25) (layer F.Cu) (net 43)) (segment (start 141.46 100.04) (end 142.5 100.04) (width 0.25) (layer F.Cu) (net 43)) + (segment (start 145.542 105.664) (end 145.542 107.378) (width 0.25) (layer F.Cu) (net 44)) + (segment (start 145.542 107.378) (end 145.606 107.442) (width 0.25) (layer F.Cu) (net 44)) + (segment (start 150.65 103.85) (end 147.356 103.85) (width 0.25) (layer B.Cu) (net 44)) + (segment (start 147.356 103.85) (end 145.542 105.664) (width 0.25) (layer B.Cu) (net 44)) + (via (at 145.542 105.664) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 44)) (segment (start 157 104) (end 150.8 104) (width 0.25) (layer B.Cu) (net 44)) (segment (start 150.8 104) (end 150.65 103.85) (width 0.25) (layer B.Cu) (net 44)) (via (at 150.65 103.85) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 44)) @@ -6772,17 +6855,21 @@ (segment (start 142.5 134.5) (end 141.25 133.25) (width 0.25) (layer F.Cu) (net 88)) (segment (start 141.25 133.25) (end 141.25 133.1) (width 0.25) (layer F.Cu) (net 88)) (segment (start 141.25 133.1) (end 140.15 132) (width 0.25) (layer F.Cu) (net 88)) + (segment (start 139.5 114) (end 145.842 114) (width 0.25) (layer F.Cu) (net 89)) + (segment (start 145.842 114) (end 147.574 112.268) (width 0.25) (layer F.Cu) (net 89)) + (segment (start 147.574 112.268) (end 147.574 107.038998) (width 0.25) (layer F.Cu) (net 89)) + (segment (start 147.574 107.038998) (end 148.417987 106.195011) (width 0.25) (layer F.Cu) (net 89)) + (segment (start 148.417987 106.195011) (end 150.532401 106.195011) (width 0.25) (layer F.Cu) (net 89)) + (segment (start 150.532401 106.195011) (end 158.25 98.477412) (width 0.25) (layer F.Cu) (net 89)) + (segment (start 158.25 98.477412) (end 158.25 96.5) (width 0.25) (layer F.Cu) (net 89)) (segment (start 158.25 96.5) (end 160.834998 96.5) (width 0.25) (layer B.Cu) (net 89)) (segment (start 160.834998 96.5) (end 160.889999 96.555001) (width 0.25) (layer B.Cu) (net 89)) (segment (start 160.889999 96.555001) (end 168.520735 96.555001) (width 0.25) (layer B.Cu) (net 89)) (segment (start 168.520735 96.555001) (end 168.575736 96.5) (width 0.25) (layer B.Cu) (net 89)) (segment (start 168.575736 96.5) (end 169 96.5) (width 0.25) (layer B.Cu) (net 89)) - (segment (start 142.727412 114) (end 158.25 98.477412) (width 0.25) (layer F.Cu) (net 89)) - (segment (start 158.25 98.477412) (end 158.25 96.5) (width 0.25) (layer F.Cu) (net 89)) (via (at 158.25 96.5) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 89)) (segment (start 170.5 96.5) (end 169 96.5) (width 0.25) (layer F.Cu) (net 89)) (via (at 169 96.5) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 89)) - (segment (start 139.5 114) (end 142.727412 114) (width 0.25) (layer F.Cu) (net 89)) (segment (start 174 98.055) (end 172.055 98.055) (width 0.25) (layer F.Cu) (net 89)) (segment (start 172.055 98.055) (end 170.5 96.5) (width 0.25) (layer F.Cu) (net 89)) (segment (start 144 129.5) (end 146.15 129.5) (width 0.25) (layer F.Cu) (net 90)) @@ -6901,233 +6988,230 @@ (xy 138.797852 96.290839) (xy 138.962599 96.537401) (xy 143.564878 101.13968) (xy 143.564838 101.185167) (xy 143.587494 101.24) (xy 141.062463 101.24) (xy 141.030327 101.207808) (xy 140.686799 101.065162) (xy 140.314833 101.064838) (xy 139.971057 101.206883) (xy 139.707808 101.469673) (xy 139.565162 101.813201) (xy 139.564838 102.185167) (xy 139.706883 102.528943) (xy 139.969673 102.792192) - (xy 140.313201 102.934838) (xy 140.685167 102.935162) (xy 141.028943 102.793117) (xy 141.062118 102.76) (xy 143.087253 102.76) - (xy 143.065162 102.813201) (xy 143.064838 103.185167) (xy 143.206883 103.528943) (xy 143.469673 103.792192) (xy 143.813201 103.934838) - (xy 144.185167 103.935162) (xy 144.528943 103.793117) (xy 144.562118 103.76) (xy 149.715078 103.76) (xy 149.714838 104.035167) - (xy 149.739892 104.095803) (xy 149.471057 104.206883) (xy 149.207808 104.469673) (xy 149.065162 104.813201) (xy 149.064838 105.185167) - (xy 149.206883 105.528943) (xy 149.469673 105.792192) (xy 149.493411 105.802049) (xy 133.413294 105.802049) (xy 133.381158 105.769857) - (xy 133.03763 105.627211) (xy 132.665664 105.626887) (xy 132.321888 105.768932) (xy 132.058639 106.031722) (xy 131.915993 106.37525) - (xy 131.915669 106.747216) (xy 132.057714 107.090992) (xy 132.320504 107.354241) (xy 132.664032 107.496887) (xy 133.035998 107.497211) - (xy 133.379774 107.355166) (xy 133.412949 107.322049) (xy 154.121396 107.322049) (xy 154.206883 107.528943) (xy 154.469673 107.792192) - (xy 154.813201 107.934838) (xy 155.185167 107.935162) (xy 155.528943 107.793117) (xy 155.792192 107.530327) (xy 155.934838 107.186799) - (xy 155.935162 106.814833) (xy 155.793117 106.471057) (xy 155.530327 106.207808) (xy 155.186799 106.065162) (xy 155.139923 106.065121) - (xy 155.09945 106.024648) (xy 154.852888 105.859901) (xy 154.562049 105.802049) (xy 150.507326 105.802049) (xy 150.528943 105.793117) - (xy 150.562118 105.76) (xy 155.437537 105.76) (xy 155.469673 105.792192) (xy 155.813201 105.934838) (xy 156.185167 105.935162) - (xy 156.528943 105.793117) (xy 156.792192 105.530327) (xy 156.934838 105.186799) (xy 156.935057 104.934944) (xy 157.185167 104.935162) - (xy 157.528943 104.793117) (xy 157.792192 104.530327) (xy 157.934838 104.186799) (xy 157.935162 103.814833) (xy 157.912506 103.76) - (xy 158.937537 103.76) (xy 158.969673 103.792192) (xy 159.313201 103.934838) (xy 159.365001 103.934883) (xy 159.365001 124.125001) - (xy 159.422853 124.41584) (xy 159.5876 124.662402) (xy 160.44 125.514802) (xy 160.44 127.637537) (xy 160.407808 127.669673) - (xy 160.265162 128.013201) (xy 160.264838 128.385167) (xy 160.406883 128.728943) (xy 160.669673 128.992192) (xy 161.013201 129.134838) - (xy 161.266865 129.135059) (xy 161.297852 129.290839) (xy 161.462599 129.537401) (xy 162.064878 130.13968) (xy 162.064838 130.185167) - (xy 162.206883 130.528943) (xy 162.469673 130.792192) (xy 162.813201 130.934838) (xy 163.185167 130.935162) (xy 163.528943 130.793117) - (xy 163.792192 130.530327) (xy 163.934838 130.186799) (xy 163.935162 129.814833) (xy 163.793117 129.471057) (xy 163.530327 129.207808) - (xy 163.186799 129.065162) (xy 163.139923 129.065121) (xy 162.76 128.685198) (xy 162.76 123.834802) (xy 167.564878 128.63968) - (xy 167.564838 128.685167) (xy 167.706883 129.028943) (xy 167.969673 129.292192) (xy 168.313201 129.434838) (xy 168.685167 129.435162) - (xy 169.028943 129.293117) (xy 169.137081 129.185167) (xy 176.564838 129.185167) (xy 176.706883 129.528943) (xy 176.969673 129.792192) - (xy 177.313201 129.934838) (xy 177.360077 129.934879) (xy 178.61017 131.184972) (xy 178.629758 131.19806) (xy 178.470671 131.581184) - (xy 178.47019 132.132398) (xy 178.680686 132.641837) (xy 179.070113 133.031944) (xy 179.579184 133.243329) (xy 180.130398 133.24381) - (xy 180.639837 133.033314) (xy 181.029944 132.643887) (xy 181.241329 132.134816) (xy 181.241623 131.797688) (xy 186.739008 131.797688) - (xy 187.082439 132.628854) (xy 187.717801 133.265326) (xy 188.548366 133.610207) (xy 189.447688 133.610992) (xy 190.278854 133.267561) - (xy 190.915326 132.632199) (xy 191.260207 131.801634) (xy 191.260992 130.902312) (xy 190.917561 130.071146) (xy 190.282199 129.434674) - (xy 189.451634 129.089793) (xy 188.552312 129.089008) (xy 187.721146 129.432439) (xy 187.084674 130.067801) (xy 186.739793 130.898366) - (xy 186.739008 131.797688) (xy 181.241623 131.797688) (xy 181.24181 131.583602) (xy 181.169075 131.407571) (xy 184.944275 131.407571) - (xy 185.235114 131.349719) (xy 185.481676 131.184972) (xy 188.072972 128.593676) (xy 188.237719 128.347114) (xy 188.295571 128.056275) - (xy 188.295571 126.583571) (xy 188.237719 126.292732) (xy 188.072972 126.04617) (xy 187.835438 125.808636) (xy 187.845329 125.784816) - (xy 187.84581 125.233602) (xy 187.635314 124.724163) (xy 187.403493 124.491937) (xy 187.633944 124.261887) (xy 187.845329 123.752816) - (xy 187.84581 123.201602) (xy 187.835106 123.175696) (xy 188.072972 122.93783) (xy 188.237719 122.691268) (xy 188.295571 122.400429) - (xy 188.295571 120.927725) (xy 188.269013 120.794209) (xy 188.548366 120.910207) (xy 189.447688 120.910992) (xy 190.278854 120.567561) - (xy 190.915326 119.932199) (xy 191.260207 119.101634) (xy 191.260992 118.202312) (xy 190.917561 117.371146) (xy 190.282199 116.734674) - (xy 189.451634 116.389793) (xy 188.552312 116.389008) (xy 187.721146 116.732439) (xy 187.084674 117.367801) (xy 186.739793 118.198366) - (xy 186.739008 119.097688) (xy 186.950042 119.608429) (xy 185.181725 119.608429) (xy 184.890886 119.666281) (xy 184.644324 119.831028) - (xy 182.462599 122.012753) (xy 182.297852 122.259315) (xy 182.267951 122.409635) (xy 182.207808 122.469673) (xy 182.065162 122.813201) - (xy 182.064838 123.185167) (xy 182.206883 123.528943) (xy 182.469673 123.792192) (xy 182.813201 123.934838) (xy 183.185167 123.935162) - (xy 183.460121 123.821554) (xy 183.296671 124.215184) (xy 183.29619 124.766398) (xy 183.506686 125.275837) (xy 183.738507 125.508063) - (xy 183.508056 125.738113) (xy 183.296671 126.247184) (xy 183.29619 126.798398) (xy 183.506686 127.307837) (xy 183.896113 127.697944) - (xy 184.079839 127.774234) (xy 184.682 128.376395) (xy 184.696143 128.362253) (xy 184.875748 128.541858) (xy 184.861605 128.556) - (xy 184.875748 128.570143) (xy 184.696143 128.749748) (xy 184.682 128.735605) (xy 183.889675 129.52793) (xy 183.957735 129.768931) - (xy 184.291056 129.887571) (xy 181.214399 129.887571) (xy 181.253767 129.776966) (xy 181.225805 129.226462) (xy 181.068931 128.847735) - (xy 180.82793 128.779675) (xy 180.035605 129.572) (xy 180.049748 129.586143) (xy 179.870143 129.765748) (xy 179.856 129.751605) - (xy 179.841858 129.765748) (xy 179.662253 129.586143) (xy 179.676395 129.572) (xy 178.88407 128.779675) (xy 178.643069 128.847735) - (xy 178.585179 129.010377) (xy 178.435122 128.86032) (xy 178.435162 128.814833) (xy 178.346424 128.60007) (xy 179.063675 128.60007) - (xy 179.856 129.392395) (xy 180.648325 128.60007) (xy 180.580265 128.359069) (xy 180.557691 128.351034) (xy 183.284233 128.351034) - (xy 183.312195 128.901538) (xy 183.469069 129.280265) (xy 183.71007 129.348325) (xy 184.502395 128.556) (xy 183.71007 127.763675) - (xy 183.469069 127.831735) (xy 183.284233 128.351034) (xy 180.557691 128.351034) (xy 180.060966 128.174233) (xy 179.510462 128.202195) - (xy 179.131735 128.359069) (xy 179.063675 128.60007) (xy 178.346424 128.60007) (xy 178.293117 128.471057) (xy 178.030327 128.207808) - (xy 177.686799 128.065162) (xy 177.314833 128.064838) (xy 176.971057 128.206883) (xy 176.707808 128.469673) (xy 176.565162 128.813201) - (xy 176.564838 129.185167) (xy 169.137081 129.185167) (xy 169.292192 129.030327) (xy 169.434838 128.686799) (xy 169.435162 128.314833) - (xy 169.293117 127.971057) (xy 169.030327 127.707808) (xy 168.686799 127.565162) (xy 168.639923 127.565121) (xy 164.793782 123.71898) - (xy 165 123.76) (xy 178.937537 123.76) (xy 178.969673 123.792192) (xy 179.313201 123.934838) (xy 179.685167 123.935162) - (xy 180.028943 123.793117) (xy 180.292192 123.530327) (xy 180.434838 123.186799) (xy 180.435162 122.814833) (xy 180.293117 122.471057) - (xy 180.030327 122.207808) (xy 179.686799 122.065162) (xy 179.314833 122.064838) (xy 178.971057 122.206883) (xy 178.937882 122.24) - (xy 165.404242 122.24) (xy 165.293117 121.971057) (xy 165.030327 121.707808) (xy 164.686799 121.565162) (xy 164.314833 121.564838) - (xy 163.971057 121.706883) (xy 163.76 121.917572) (xy 163.76 121) (xy 166.865 121) (xy 166.951397 121.434345) - (xy 167.197434 121.802566) (xy 167.565655 122.048603) (xy 168 122.135) (xy 168.434345 122.048603) (xy 168.802566 121.802566) - (xy 169.902734 120.702398) (xy 178.47019 120.702398) (xy 178.680686 121.211837) (xy 179.070113 121.601944) (xy 179.579184 121.813329) - (xy 180.130398 121.81381) (xy 180.639837 121.603314) (xy 181.029944 121.213887) (xy 181.241329 120.704816) (xy 181.24181 120.153602) - (xy 181.031314 119.644163) (xy 180.641887 119.254056) (xy 180.61223 119.241741) (xy 180.648325 119.11393) (xy 179.856 118.321605) - (xy 179.063675 119.11393) (xy 179.099653 119.241327) (xy 179.072163 119.252686) (xy 178.682056 119.642113) (xy 178.470671 120.151184) - (xy 178.47019 120.702398) (xy 169.902734 120.702398) (xy 172.668098 117.937034) (xy 178.458233 117.937034) (xy 178.486195 118.487538) - (xy 178.643069 118.866265) (xy 178.88407 118.934325) (xy 179.676395 118.142) (xy 180.035605 118.142) (xy 180.82793 118.934325) - (xy 181.068931 118.866265) (xy 181.253767 118.346966) (xy 181.225805 117.796462) (xy 181.068931 117.417735) (xy 180.82793 117.349675) - (xy 180.035605 118.142) (xy 179.676395 118.142) (xy 178.88407 117.349675) (xy 178.643069 117.417735) (xy 178.458233 117.937034) - (xy 172.668098 117.937034) (xy 173.435062 117.17007) (xy 179.063675 117.17007) (xy 179.856 117.962395) (xy 180.648325 117.17007) - (xy 180.580265 116.929069) (xy 180.060966 116.744233) (xy 179.510462 116.772195) (xy 179.131735 116.929069) (xy 179.063675 117.17007) - (xy 173.435062 117.17007) (xy 173.970132 116.635) (xy 185.5 116.635) (xy 185.934346 116.548603) (xy 186.302566 116.302566) - (xy 186.548603 115.934346) (xy 186.635 115.5) (xy 186.548603 115.065654) (xy 186.302566 114.697434) (xy 185.934346 114.451397) - (xy 185.5 114.365) (xy 173.5 114.365) (xy 173.065655 114.451396) (xy 172.697434 114.697434) (xy 167.197434 120.197434) - (xy 166.951397 120.565655) (xy 166.865 121) (xy 163.76 121) (xy 163.76 114.5) (xy 163.702148 114.209161) - (xy 163.537401 113.962599) (xy 161.584999 112.010197) (xy 161.584999 109.488238) (xy 161.970907 109.565) (xy 162.029093 109.565) - (xy 162.597378 109.451961) (xy 163.079147 109.130054) (xy 163.401054 108.648285) (xy 163.505981 108.120783) (xy 164.797598 109.4124) - (xy 165.04416 109.577147) (xy 165.334999 109.634999) (xy 166.564882 109.634999) (xy 166.564838 109.685167) (xy 166.706883 110.028943) - (xy 166.969673 110.292192) (xy 167.313201 110.434838) (xy 167.685167 110.435162) (xy 168.028943 110.293117) (xy 168.292192 110.030327) - (xy 168.434838 109.686799) (xy 168.434883 109.634999) (xy 172.139158 109.634999) (xy 172.065162 109.813201) (xy 172.065121 109.860077) - (xy 165.86032 116.064878) (xy 165.814833 116.064838) (xy 165.471057 116.206883) (xy 165.207808 116.469673) (xy 165.065162 116.813201) - (xy 165.064838 117.185167) (xy 165.206883 117.528943) (xy 165.469673 117.792192) (xy 165.813201 117.934838) (xy 166.185167 117.935162) - (xy 166.528943 117.793117) (xy 166.792192 117.530327) (xy 166.934838 117.186799) (xy 166.934879 117.139923) (xy 173.13968 110.935122) - (xy 173.185167 110.935162) (xy 173.528943 110.793117) (xy 173.792192 110.530327) (xy 173.934838 110.186799) (xy 173.935162 109.814833) - (xy 173.860856 109.634999) (xy 186.812536 109.634999) (xy 186.844672 109.667191) (xy 187.1882 109.809837) (xy 187.560166 109.810161) - (xy 187.903942 109.668116) (xy 188.167191 109.405326) (xy 188.309837 109.061798) (xy 188.310161 108.689832) (xy 188.168116 108.346056) - (xy 187.905326 108.082807) (xy 187.561798 107.940161) (xy 187.189832 107.939837) (xy 186.846056 108.081882) (xy 186.812881 108.114999) - (xy 171.427894 108.114999) (xy 171.548603 107.934346) (xy 171.635 107.5) (xy 171.635 100.970132) (xy 172.802566 99.802566) - (xy 173.048603 99.434346) (xy 173.134999 99) (xy 173.08726 98.76) (xy 177 98.76) (xy 177.290839 98.702148) - (xy 177.537401 98.537401) (xy 179.314802 96.76) (xy 188.937537 96.76) (xy 188.969673 96.792192) (xy 189.313201 96.934838) - (xy 189.685167 96.935162) (xy 190.028943 96.793117) (xy 190.190601 96.631741) (xy 190.190601 114.204267) (xy 189.697434 114.697434) - (xy 189.451397 115.065655) (xy 189.365 115.5) (xy 189.451397 115.934345) (xy 189.697434 116.302566) (xy 190.065655 116.548603) - (xy 190.5 116.635) (xy 190.934345 116.548603) (xy 191.302566 116.302566) (xy 192.128167 115.476965) (xy 192.2365 115.314833) - (xy 192.29 115.234765) (xy 192.29 137.873) (xy 103.71 137.873) (xy 103.71 133.963055) (xy 104.282352 134.200716) - (xy 104.932795 134.201284) (xy 105.533943 133.952894) (xy 105.994278 133.493363) (xy 106.243716 132.892648) (xy 106.244284 132.242205) - (xy 105.995894 131.641057) (xy 105.536363 131.180722) (xy 104.935648 130.931284) (xy 104.285205 130.930716) (xy 103.71 131.168387) - (xy 103.71 128.443) (xy 106.34951 128.443) (xy 106.34951 129.04244) (xy 106.522529 129.658265) (xy 106.918044 130.161002) - (xy 107.475841 130.474113) (xy 107.603646 130.505059) (xy 107.857 130.385705) (xy 107.857 128.443) (xy 108.111 128.443) - (xy 108.111 130.385705) (xy 108.364354 130.505059) (xy 108.492159 130.474113) (xy 109.049956 130.161002) (xy 109.445471 129.658265) - (xy 109.61849 129.04244) (xy 109.61849 128.443) (xy 108.111 128.443) (xy 107.857 128.443) (xy 106.34951 128.443) - (xy 103.71 128.443) (xy 103.71 127.58956) (xy 106.34951 127.58956) (xy 106.34951 128.189) (xy 107.857 128.189) - (xy 107.857 126.246295) (xy 108.111 126.246295) (xy 108.111 128.189) (xy 109.61849 128.189) (xy 109.61849 127.58956) - (xy 109.445471 126.973735) (xy 109.049956 126.470998) (xy 108.492159 126.157887) (xy 108.364354 126.126941) (xy 108.111 126.246295) - (xy 107.857 126.246295) (xy 107.603646 126.126941) (xy 107.475841 126.157887) (xy 106.918044 126.470998) (xy 106.522529 126.973735) - (xy 106.34951 127.58956) (xy 103.71 127.58956) (xy 103.71 125.463055) (xy 104.282352 125.700716) (xy 104.932795 125.701284) - (xy 105.533943 125.452894) (xy 105.994278 124.993363) (xy 106.171734 124.566) (xy 109.700316 124.566) (xy 109.824773 125.191687) - (xy 110.179196 125.72212) (xy 110.709629 126.076543) (xy 111.335316 126.201) (xy 111.474 126.201) (xy 111.474 130.431) - (xy 111.335316 130.431) (xy 110.709629 130.555457) (xy 110.179196 130.90988) (xy 109.824773 131.440313) (xy 109.700316 132.066) - (xy 109.824773 132.691687) (xy 110.179196 133.22212) (xy 110.709629 133.576543) (xy 111.335316 133.701) (xy 113.132684 133.701) - (xy 113.758371 133.576543) (xy 114.288804 133.22212) (xy 114.643227 132.691687) (xy 114.767684 132.066) (xy 114.643227 131.440313) - (xy 114.288804 130.90988) (xy 113.758371 130.555457) (xy 113.132684 130.431) (xy 112.994 130.431) (xy 112.994 126.201) - (xy 113.132684 126.201) (xy 113.758371 126.076543) (xy 114.288804 125.72212) (xy 114.643227 125.191687) (xy 114.767684 124.566) - (xy 114.643227 123.940313) (xy 114.288804 123.40988) (xy 113.758371 123.055457) (xy 113.132684 122.931) (xy 111.335316 122.931) - (xy 110.709629 123.055457) (xy 110.179196 123.40988) (xy 109.824773 123.940313) (xy 109.700316 124.566) (xy 106.171734 124.566) - (xy 106.243716 124.392648) (xy 106.244284 123.742205) (xy 105.995894 123.141057) (xy 105.536363 122.680722) (xy 104.935648 122.431284) - (xy 104.285205 122.430716) (xy 103.71 122.668387) (xy 103.71 121.832402) (xy 104.256952 122.059516) (xy 104.907395 122.060084) - (xy 105.508543 121.811694) (xy 105.968878 121.352163) (xy 106.218316 120.751448) (xy 106.218884 120.101005) (xy 106.146078 119.9248) - (xy 109.674916 119.9248) (xy 109.799373 120.550487) (xy 110.153796 121.08092) (xy 110.684229 121.435343) (xy 111.309916 121.5598) - (xy 113.107284 121.5598) (xy 113.407918 121.5) (xy 131.365 121.5) (xy 131.365 129) (xy 131.451397 129.434346) - (xy 131.697434 129.802566) (xy 132.065654 130.048603) (xy 132.5 130.135) (xy 132.934346 130.048603) (xy 133.302566 129.802566) - (xy 133.548603 129.434346) (xy 133.635 129) (xy 133.635 126.435167) (xy 143.814838 126.435167) (xy 143.956883 126.778943) - (xy 144.219673 127.042192) (xy 144.563201 127.184838) (xy 144.935167 127.185162) (xy 145.278943 127.043117) (xy 145.312118 127.01) - (xy 148.935198 127.01) (xy 154.564878 132.63968) (xy 154.564838 132.685167) (xy 154.706883 133.028943) (xy 154.969673 133.292192) - (xy 155.313201 133.434838) (xy 155.685167 133.435162) (xy 156.028943 133.293117) (xy 156.292192 133.030327) (xy 156.434838 132.686799) - (xy 156.435162 132.314833) (xy 156.293117 131.971057) (xy 156.030327 131.707808) (xy 155.686799 131.565162) (xy 155.639923 131.565121) - (xy 149.787401 125.712599) (xy 149.540839 125.547852) (xy 149.25 125.49) (xy 145.312463 125.49) (xy 145.280327 125.457808) - (xy 144.936799 125.315162) (xy 144.564833 125.314838) (xy 144.221057 125.456883) (xy 143.957808 125.719673) (xy 143.815162 126.063201) - (xy 143.814838 126.435167) (xy 133.635 126.435167) (xy 133.635 121.5) (xy 133.548603 121.065654) (xy 133.302566 120.697434) - (xy 132.934346 120.451397) (xy 132.5 120.365) (xy 132.065654 120.451397) (xy 131.697434 120.697434) (xy 131.451397 121.065654) - (xy 131.365 121.5) (xy 113.407918 121.5) (xy 113.732971 121.435343) (xy 114.263404 121.08092) (xy 114.617827 120.550487) - (xy 114.742284 119.9248) (xy 114.617827 119.299113) (xy 114.263404 118.76868) (xy 113.732971 118.414257) (xy 113.107284 118.2898) - (xy 111.309916 118.2898) (xy 110.684229 118.414257) (xy 110.153796 118.76868) (xy 109.799373 119.299113) (xy 109.674916 119.9248) - (xy 106.146078 119.9248) (xy 105.970494 119.499857) (xy 105.510963 119.039522) (xy 104.910248 118.790084) (xy 104.259805 118.789516) - (xy 103.71 119.016691) (xy 103.71 116.3018) (xy 106.32411 116.3018) (xy 106.32411 116.90124) (xy 106.497129 117.517065) - (xy 106.892644 118.019802) (xy 107.450441 118.332913) (xy 107.578246 118.363859) (xy 107.8316 118.244505) (xy 107.8316 116.3018) - (xy 108.0856 116.3018) (xy 108.0856 118.244505) (xy 108.338954 118.363859) (xy 108.466759 118.332913) (xy 109.024556 118.019802) - (xy 109.420071 117.517065) (xy 109.59309 116.90124) (xy 109.59309 116.3018) (xy 108.0856 116.3018) (xy 107.8316 116.3018) - (xy 106.32411 116.3018) (xy 103.71 116.3018) (xy 103.71 115.44836) (xy 106.32411 115.44836) (xy 106.32411 116.0478) - (xy 107.8316 116.0478) (xy 107.8316 114.105095) (xy 108.0856 114.105095) (xy 108.0856 116.0478) (xy 109.59309 116.0478) - (xy 109.59309 115.44836) (xy 109.420071 114.832535) (xy 109.024556 114.329798) (xy 108.466759 114.016687) (xy 108.338954 113.985741) - (xy 108.0856 114.105095) (xy 107.8316 114.105095) (xy 107.578246 113.985741) (xy 107.450441 114.016687) (xy 106.892644 114.329798) - (xy 106.497129 114.832535) (xy 106.32411 115.44836) (xy 103.71 115.44836) (xy 103.71 113.332402) (xy 104.256952 113.559516) - (xy 104.907395 113.560084) (xy 105.508543 113.311694) (xy 105.968878 112.852163) (xy 106.146334 112.4248) (xy 109.674916 112.4248) - (xy 109.799373 113.050487) (xy 110.153796 113.58092) (xy 110.684229 113.935343) (xy 111.309916 114.0598) (xy 113.107284 114.0598) - (xy 113.407918 114) (xy 123.365 114) (xy 123.451397 114.434345) (xy 123.697434 114.802566) (xy 124.065655 115.048603) - (xy 124.5 115.135) (xy 124.934345 115.048603) (xy 125.302566 114.802566) (xy 127.895121 112.210011) (xy 138.35 112.210011) - (xy 138.784346 112.123614) (xy 139.152566 111.877577) (xy 139.398603 111.509357) (xy 139.485 111.075011) (xy 139.398603 110.640665) - (xy 139.152566 110.272445) (xy 138.784346 110.026408) (xy 138.35 109.940011) (xy 127.424989 109.940011) (xy 126.990643 110.026408) - (xy 126.622423 110.272445) (xy 123.697434 113.197434) (xy 123.451397 113.565655) (xy 123.365 114) (xy 113.407918 114) - (xy 113.732971 113.935343) (xy 114.263404 113.58092) (xy 114.617827 113.050487) (xy 114.742284 112.4248) (xy 114.617827 111.799113) - (xy 114.263404 111.26868) (xy 113.732971 110.914257) (xy 113.107284 110.7898) (xy 113.01 110.7898) (xy 113.01 108.685167) - (xy 151.564838 108.685167) (xy 151.706883 109.028943) (xy 151.74 109.062118) (xy 151.74 122.187537) (xy 151.707808 122.219673) - (xy 151.565162 122.563201) (xy 151.564838 122.935167) (xy 151.706883 123.278943) (xy 151.969673 123.542192) (xy 152.313201 123.684838) - (xy 152.685167 123.685162) (xy 153.028943 123.543117) (xy 153.292192 123.280327) (xy 153.434838 122.936799) (xy 153.435162 122.564833) - (xy 153.293117 122.221057) (xy 153.26 122.187882) (xy 153.26 109.062463) (xy 153.292192 109.030327) (xy 153.434838 108.686799) - (xy 153.435162 108.314833) (xy 153.293117 107.971057) (xy 153.030327 107.707808) (xy 152.686799 107.565162) (xy 152.314833 107.564838) - (xy 151.971057 107.706883) (xy 151.707808 107.969673) (xy 151.565162 108.313201) (xy 151.564838 108.685167) (xy 113.01 108.685167) - (xy 113.01 104.385) (xy 113.148684 104.385) (xy 113.774371 104.260543) (xy 114.304804 103.90612) (xy 114.659227 103.375687) - (xy 114.783684 102.75) (xy 114.659227 102.124313) (xy 114.304804 101.59388) (xy 113.774371 101.239457) (xy 113.148684 101.115) - (xy 111.351316 101.115) (xy 110.725629 101.239457) (xy 110.195196 101.59388) (xy 109.840773 102.124313) (xy 109.716316 102.75) - (xy 109.840773 103.375687) (xy 110.195196 103.90612) (xy 110.725629 104.260543) (xy 111.351316 104.385) (xy 111.49 104.385) - (xy 111.49 110.7898) (xy 111.309916 110.7898) (xy 110.684229 110.914257) (xy 110.153796 111.26868) (xy 109.799373 111.799113) - (xy 109.674916 112.4248) (xy 106.146334 112.4248) (xy 106.218316 112.251448) (xy 106.218884 111.601005) (xy 105.970494 110.999857) - (xy 105.510963 110.539522) (xy 104.910248 110.290084) (xy 104.259805 110.289516) (xy 103.71 110.516691) (xy 103.71 104.640412) - (xy 104.298352 104.884716) (xy 104.948795 104.885284) (xy 105.549943 104.636894) (xy 106.010278 104.177363) (xy 106.259716 103.576648) - (xy 106.260284 102.926205) (xy 106.011894 102.325057) (xy 105.552363 101.864722) (xy 104.951648 101.615284) (xy 104.301205 101.614716) - (xy 103.71 101.858998) (xy 103.71 99.127) (xy 106.36551 99.127) (xy 106.36551 99.72644) (xy 106.538529 100.342265) - (xy 106.934044 100.845002) (xy 107.491841 101.158113) (xy 107.619646 101.189059) (xy 107.873 101.069705) (xy 107.873 99.127) - (xy 108.127 99.127) (xy 108.127 101.069705) (xy 108.380354 101.189059) (xy 108.508159 101.158113) (xy 109.065956 100.845002) - (xy 109.461471 100.342265) (xy 109.63449 99.72644) (xy 109.63449 99.127) (xy 108.127 99.127) (xy 107.873 99.127) - (xy 106.36551 99.127) (xy 103.71 99.127) (xy 103.71 98.27356) (xy 106.36551 98.27356) (xy 106.36551 98.873) - (xy 107.873 98.873) (xy 107.873 96.930295) (xy 108.127 96.930295) (xy 108.127 98.873) (xy 109.63449 98.873) - (xy 109.63449 98.27356) (xy 109.461471 97.657735) (xy 109.065956 97.154998) (xy 108.508159 96.841887) (xy 108.380354 96.810941) - (xy 108.127 96.930295) (xy 107.873 96.930295) (xy 107.619646 96.810941) (xy 107.491841 96.841887) (xy 106.934044 97.154998) - (xy 106.538529 97.657735) (xy 106.36551 98.27356) (xy 103.71 98.27356) (xy 103.71 96.140412) (xy 104.298352 96.384716) - (xy 104.948795 96.385284) (xy 105.549943 96.136894) (xy 106.010278 95.677363) (xy 106.187734 95.25) (xy 109.716316 95.25) - (xy 109.840773 95.875687) (xy 110.195196 96.40612) (xy 110.725629 96.760543) (xy 111.351316 96.885) (xy 113.148684 96.885) - (xy 113.774371 96.760543) (xy 114.304804 96.40612) (xy 114.659227 95.875687) (xy 114.783684 95.25) (xy 114.659227 94.624313) - (xy 114.304804 94.09388) (xy 113.774371 93.739457) (xy 113.148684 93.615) (xy 111.351316 93.615) (xy 110.725629 93.739457) - (xy 110.195196 94.09388) (xy 109.840773 94.624313) (xy 109.716316 95.25) (xy 106.187734 95.25) (xy 106.259716 95.076648) - (xy 106.260284 94.426205) (xy 106.011894 93.825057) (xy 105.552363 93.364722) (xy 104.951648 93.115284) (xy 104.301205 93.114716) - (xy 103.71 93.358998) (xy 103.71 88.89689) (xy 104.558524 88.89689) (xy 104.728355 89.306924) (xy 105.118642 89.735183) - (xy 105.643108 89.981486) (xy 105.873 89.860819) (xy 105.873 88.667) (xy 106.127 88.667) (xy 106.127 89.860819) - (xy 106.356892 89.981486) (xy 106.881358 89.735183) (xy 107.271645 89.306924) (xy 107.441476 88.89689) (xy 107.320155 88.667) - (xy 106.127 88.667) (xy 105.873 88.667) (xy 104.679845 88.667) (xy 104.558524 88.89689) (xy 103.71 88.89689) - (xy 103.71 86.28575) (xy 104.515 86.28575) (xy 104.515 86.97631) (xy 104.611673 87.209699) (xy 104.790302 87.388327) - (xy 104.999878 87.475136) (xy 104.728355 87.773076) (xy 104.558524 88.18311) (xy 104.679845 88.413) (xy 105.873 88.413) - (xy 105.873 86.127) (xy 106.127 86.127) (xy 106.127 88.413) (xy 107.320155 88.413) (xy 107.441476 88.18311) - (xy 107.271645 87.773076) (xy 107.000122 87.475136) (xy 107.209698 87.388327) (xy 107.388327 87.209699) (xy 107.485 86.97631) - (xy 107.485 86.28575) (xy 107.32625 86.127) (xy 106.127 86.127) (xy 105.873 86.127) (xy 104.67375 86.127) - (xy 104.515 86.28575) (xy 103.71 86.28575) (xy 103.71 85.02369) (xy 104.515 85.02369) (xy 104.515 85.71425) - (xy 104.67375 85.873) (xy 105.873 85.873) (xy 105.873 84.67375) (xy 106.127 84.67375) (xy 106.127 85.873) - (xy 107.32625 85.873) (xy 107.485 85.71425) (xy 107.485 85.02369) (xy 107.388327 84.790301) (xy 107.209698 84.611673) - (xy 106.976309 84.515) (xy 106.28575 84.515) (xy 106.127 84.67375) (xy 105.873 84.67375) (xy 105.71425 84.515) - (xy 105.023691 84.515) (xy 104.790302 84.611673) (xy 104.611673 84.790301) (xy 104.515 85.02369) (xy 103.71 85.02369) - (xy 103.71 77.86451) (xy 106.415232 77.86451) (xy 106.580002 78.263283) (xy 106.884833 78.568646) (xy 107.283317 78.734111) - (xy 107.71479 78.734488) (xy 108.113563 78.569718) (xy 108.418926 78.264887) (xy 108.584391 77.866403) (xy 108.584768 77.43493) - (xy 108.419998 77.036157) (xy 108.115167 76.730794) (xy 107.716683 76.565329) (xy 107.28521 76.564952) (xy 106.886437 76.729722) - (xy 106.581074 77.034553) (xy 106.415609 77.433037) (xy 106.415232 77.86451) (xy 103.71 77.86451) (xy 103.71 73.46523) - (xy 106.415232 73.46523) (xy 106.580002 73.864003) (xy 106.884833 74.169366) (xy 107.283317 74.334831) (xy 107.71479 74.335208) - (xy 108.113563 74.170438) (xy 108.418926 73.865607) (xy 108.584391 73.467123) (xy 108.584768 73.03565) (xy 108.419998 72.636877) - (xy 108.115167 72.331514) (xy 107.716683 72.166049) (xy 107.28521 72.165672) (xy 106.886437 72.330442) (xy 106.581074 72.635273) - (xy 106.415609 73.033757) (xy 106.415232 73.46523) (xy 103.71 73.46523) (xy 103.71 71.5) (xy 113.365 71.5) - (xy 113.451397 71.934345) (xy 113.697434 72.302566) (xy 113.865 72.470132) (xy 113.865 84.660982) (xy 113.748559 84.73591) - (xy 113.603569 84.94811) (xy 113.55256 85.2) (xy 113.55256 86.8) (xy 113.596838 87.035317) (xy 113.73591 87.251441) - (xy 113.94811 87.396431) (xy 114.2 87.44744) (xy 115.8 87.44744) (xy 116.035317 87.403162) (xy 116.251441 87.26409) - (xy 116.396431 87.05189) (xy 116.40537 87.007745) (xy 116.671861 87.007745) (xy 116.745995 87.253864) (xy 117.283223 87.446965) - (xy 117.853454 87.419778) (xy 118.254005 87.253864) (xy 118.328139 87.007745) (xy 124.671861 87.007745) (xy 124.745995 87.253864) - (xy 125.283223 87.446965) (xy 125.853454 87.419778) (xy 126.254005 87.253864) (xy 126.328139 87.007745) (xy 125.5 86.179605) - (xy 124.671861 87.007745) (xy 118.328139 87.007745) (xy 117.5 86.179605) (xy 116.671861 87.007745) (xy 116.40537 87.007745) - (xy 116.444646 86.813799) (xy 116.492255 86.828139) (xy 117.320395 86) (xy 117.679605 86) (xy 118.507745 86.828139) - (xy 118.753864 86.754005) (xy 118.946965 86.216777) (xy 118.926295 85.783223) (xy 124.053035 85.783223) (xy 124.080222 86.353454) - (xy 124.246136 86.754005) (xy 124.492255 86.828139) (xy 125.320395 86) (xy 125.679605 86) (xy 126.507745 86.828139) - (xy 126.555167 86.813855) (xy 126.596838 87.035317) (xy 126.73591 87.251441) (xy 126.94811 87.396431) (xy 127.2 87.44744) - (xy 128.8 87.44744) (xy 129.035317 87.403162) (xy 129.251441 87.26409) (xy 129.396431 87.05189) (xy 129.44744 86.8) - (xy 129.44744 85.2) (xy 129.403162 84.964683) (xy 129.26409 84.748559) (xy 129.05189 84.603569) (xy 128.8 84.55256) - (xy 127.2 84.55256) (xy 126.964683 84.596838) (xy 126.748559 84.73591) (xy 126.603569 84.94811) (xy 126.555354 85.186201) - (xy 126.507745 85.171861) (xy 125.679605 86) (xy 125.320395 86) (xy 124.492255 85.171861) (xy 124.246136 85.245995) - (xy 124.053035 85.783223) (xy 118.926295 85.783223) (xy 118.919778 85.646546) (xy 118.753864 85.245995) (xy 118.507745 85.171861) - (xy 117.679605 86) (xy 117.320395 86) (xy 116.492255 85.171861) (xy 116.444833 85.186145) (xy 116.408351 84.992255) - (xy 116.671861 84.992255) (xy 117.5 85.820395) (xy 118.328139 84.992255) (xy 124.671861 84.992255) (xy 125.5 85.820395) - (xy 126.328139 84.992255) (xy 126.254005 84.746136) (xy 125.716777 84.553035) (xy 125.146546 84.580222) (xy 124.745995 84.746136) - (xy 124.671861 84.992255) (xy 118.328139 84.992255) (xy 118.254005 84.746136) (xy 117.716777 84.553035) (xy 117.146546 84.580222) - (xy 116.745995 84.746136) (xy 116.671861 84.992255) (xy 116.408351 84.992255) (xy 116.403162 84.964683) (xy 116.26409 84.748559) - (xy 116.135 84.660356) (xy 116.135 72) (xy 116.048603 71.565654) (xy 115.802566 71.197434) (xy 115.302566 70.697434) - (xy 114.934345 70.451397) (xy 114.5 70.365) (xy 114.065655 70.451397) (xy 113.697434 70.697434) (xy 113.451397 71.065655) - (xy 113.365 71.5) (xy 103.71 71.5) (xy 103.71 66.627) (xy 164.302846 66.627) + (xy 140.313201 102.934838) (xy 140.685167 102.935162) (xy 141.028943 102.793117) (xy 141.062118 102.76) (xy 141.988 102.76) + (xy 141.988 103.886) (xy 142.045852 104.176839) (xy 142.210599 104.423401) (xy 143.589247 105.802049) (xy 133.413294 105.802049) + (xy 133.381158 105.769857) (xy 133.03763 105.627211) (xy 132.665664 105.626887) (xy 132.321888 105.768932) (xy 132.058639 106.031722) + (xy 131.915993 106.37525) (xy 131.915669 106.747216) (xy 132.057714 107.090992) (xy 132.320504 107.354241) (xy 132.664032 107.496887) + (xy 133.035998 107.497211) (xy 133.379774 107.355166) (xy 133.412949 107.322049) (xy 154.121396 107.322049) (xy 154.206883 107.528943) + (xy 154.469673 107.792192) (xy 154.813201 107.934838) (xy 155.185167 107.935162) (xy 155.528943 107.793117) (xy 155.792192 107.530327) + (xy 155.934838 107.186799) (xy 155.935162 106.814833) (xy 155.793117 106.471057) (xy 155.530327 106.207808) (xy 155.186799 106.065162) + (xy 155.139923 106.065121) (xy 155.09945 106.024648) (xy 154.852888 105.859901) (xy 154.562049 105.802049) (xy 150.507326 105.802049) + (xy 150.528943 105.793117) (xy 150.562118 105.76) (xy 155.437537 105.76) (xy 155.469673 105.792192) (xy 155.813201 105.934838) + (xy 156.185167 105.935162) (xy 156.528943 105.793117) (xy 156.792192 105.530327) (xy 156.934838 105.186799) (xy 156.935057 104.934944) + (xy 157.185167 104.935162) (xy 157.528943 104.793117) (xy 157.792192 104.530327) (xy 157.934838 104.186799) (xy 157.935162 103.814833) + (xy 157.912506 103.76) (xy 158.937537 103.76) (xy 158.969673 103.792192) (xy 159.313201 103.934838) (xy 159.365001 103.934883) + (xy 159.365001 124.125001) (xy 159.422853 124.41584) (xy 159.5876 124.662402) (xy 160.44 125.514802) (xy 160.44 127.637537) + (xy 160.407808 127.669673) (xy 160.265162 128.013201) (xy 160.264838 128.385167) (xy 160.406883 128.728943) (xy 160.669673 128.992192) + (xy 161.013201 129.134838) (xy 161.266865 129.135059) (xy 161.297852 129.290839) (xy 161.462599 129.537401) (xy 162.064878 130.13968) + (xy 162.064838 130.185167) (xy 162.206883 130.528943) (xy 162.469673 130.792192) (xy 162.813201 130.934838) (xy 163.185167 130.935162) + (xy 163.528943 130.793117) (xy 163.792192 130.530327) (xy 163.934838 130.186799) (xy 163.935162 129.814833) (xy 163.793117 129.471057) + (xy 163.530327 129.207808) (xy 163.186799 129.065162) (xy 163.139923 129.065121) (xy 162.76 128.685198) (xy 162.76 123.834802) + (xy 167.564878 128.63968) (xy 167.564838 128.685167) (xy 167.706883 129.028943) (xy 167.969673 129.292192) (xy 168.313201 129.434838) + (xy 168.685167 129.435162) (xy 169.028943 129.293117) (xy 169.137081 129.185167) (xy 176.564838 129.185167) (xy 176.706883 129.528943) + (xy 176.969673 129.792192) (xy 177.313201 129.934838) (xy 177.360077 129.934879) (xy 178.61017 131.184972) (xy 178.629758 131.19806) + (xy 178.470671 131.581184) (xy 178.47019 132.132398) (xy 178.680686 132.641837) (xy 179.070113 133.031944) (xy 179.579184 133.243329) + (xy 180.130398 133.24381) (xy 180.639837 133.033314) (xy 181.029944 132.643887) (xy 181.241329 132.134816) (xy 181.241623 131.797688) + (xy 186.739008 131.797688) (xy 187.082439 132.628854) (xy 187.717801 133.265326) (xy 188.548366 133.610207) (xy 189.447688 133.610992) + (xy 190.278854 133.267561) (xy 190.915326 132.632199) (xy 191.260207 131.801634) (xy 191.260992 130.902312) (xy 190.917561 130.071146) + (xy 190.282199 129.434674) (xy 189.451634 129.089793) (xy 188.552312 129.089008) (xy 187.721146 129.432439) (xy 187.084674 130.067801) + (xy 186.739793 130.898366) (xy 186.739008 131.797688) (xy 181.241623 131.797688) (xy 181.24181 131.583602) (xy 181.169075 131.407571) + (xy 184.944275 131.407571) (xy 185.235114 131.349719) (xy 185.481676 131.184972) (xy 188.072972 128.593676) (xy 188.237719 128.347114) + (xy 188.295571 128.056275) (xy 188.295571 126.583571) (xy 188.237719 126.292732) (xy 188.072972 126.04617) (xy 187.835438 125.808636) + (xy 187.845329 125.784816) (xy 187.84581 125.233602) (xy 187.635314 124.724163) (xy 187.403493 124.491937) (xy 187.633944 124.261887) + (xy 187.845329 123.752816) (xy 187.84581 123.201602) (xy 187.835106 123.175696) (xy 188.072972 122.93783) (xy 188.237719 122.691268) + (xy 188.295571 122.400429) (xy 188.295571 120.927725) (xy 188.269013 120.794209) (xy 188.548366 120.910207) (xy 189.447688 120.910992) + (xy 190.278854 120.567561) (xy 190.915326 119.932199) (xy 191.260207 119.101634) (xy 191.260992 118.202312) (xy 190.917561 117.371146) + (xy 190.282199 116.734674) (xy 189.451634 116.389793) (xy 188.552312 116.389008) (xy 187.721146 116.732439) (xy 187.084674 117.367801) + (xy 186.739793 118.198366) (xy 186.739008 119.097688) (xy 186.950042 119.608429) (xy 185.181725 119.608429) (xy 184.890886 119.666281) + (xy 184.644324 119.831028) (xy 182.462599 122.012753) (xy 182.297852 122.259315) (xy 182.267951 122.409635) (xy 182.207808 122.469673) + (xy 182.065162 122.813201) (xy 182.064838 123.185167) (xy 182.206883 123.528943) (xy 182.469673 123.792192) (xy 182.813201 123.934838) + (xy 183.185167 123.935162) (xy 183.460121 123.821554) (xy 183.296671 124.215184) (xy 183.29619 124.766398) (xy 183.506686 125.275837) + (xy 183.738507 125.508063) (xy 183.508056 125.738113) (xy 183.296671 126.247184) (xy 183.29619 126.798398) (xy 183.506686 127.307837) + (xy 183.896113 127.697944) (xy 184.079839 127.774234) (xy 184.682 128.376395) (xy 184.696143 128.362253) (xy 184.875748 128.541858) + (xy 184.861605 128.556) (xy 184.875748 128.570143) (xy 184.696143 128.749748) (xy 184.682 128.735605) (xy 183.889675 129.52793) + (xy 183.957735 129.768931) (xy 184.291056 129.887571) (xy 181.214399 129.887571) (xy 181.253767 129.776966) (xy 181.225805 129.226462) + (xy 181.068931 128.847735) (xy 180.82793 128.779675) (xy 180.035605 129.572) (xy 180.049748 129.586143) (xy 179.870143 129.765748) + (xy 179.856 129.751605) (xy 179.841858 129.765748) (xy 179.662253 129.586143) (xy 179.676395 129.572) (xy 178.88407 128.779675) + (xy 178.643069 128.847735) (xy 178.585179 129.010377) (xy 178.435122 128.86032) (xy 178.435162 128.814833) (xy 178.346424 128.60007) + (xy 179.063675 128.60007) (xy 179.856 129.392395) (xy 180.648325 128.60007) (xy 180.580265 128.359069) (xy 180.557691 128.351034) + (xy 183.284233 128.351034) (xy 183.312195 128.901538) (xy 183.469069 129.280265) (xy 183.71007 129.348325) (xy 184.502395 128.556) + (xy 183.71007 127.763675) (xy 183.469069 127.831735) (xy 183.284233 128.351034) (xy 180.557691 128.351034) (xy 180.060966 128.174233) + (xy 179.510462 128.202195) (xy 179.131735 128.359069) (xy 179.063675 128.60007) (xy 178.346424 128.60007) (xy 178.293117 128.471057) + (xy 178.030327 128.207808) (xy 177.686799 128.065162) (xy 177.314833 128.064838) (xy 176.971057 128.206883) (xy 176.707808 128.469673) + (xy 176.565162 128.813201) (xy 176.564838 129.185167) (xy 169.137081 129.185167) (xy 169.292192 129.030327) (xy 169.434838 128.686799) + (xy 169.435162 128.314833) (xy 169.293117 127.971057) (xy 169.030327 127.707808) (xy 168.686799 127.565162) (xy 168.639923 127.565121) + (xy 164.793782 123.71898) (xy 165 123.76) (xy 178.937537 123.76) (xy 178.969673 123.792192) (xy 179.313201 123.934838) + (xy 179.685167 123.935162) (xy 180.028943 123.793117) (xy 180.292192 123.530327) (xy 180.434838 123.186799) (xy 180.435162 122.814833) + (xy 180.293117 122.471057) (xy 180.030327 122.207808) (xy 179.686799 122.065162) (xy 179.314833 122.064838) (xy 178.971057 122.206883) + (xy 178.937882 122.24) (xy 165.404242 122.24) (xy 165.293117 121.971057) (xy 165.030327 121.707808) (xy 164.686799 121.565162) + (xy 164.314833 121.564838) (xy 163.971057 121.706883) (xy 163.76 121.917572) (xy 163.76 121) (xy 166.865 121) + (xy 166.951397 121.434345) (xy 167.197434 121.802566) (xy 167.565655 122.048603) (xy 168 122.135) (xy 168.434345 122.048603) + (xy 168.802566 121.802566) (xy 169.902734 120.702398) (xy 178.47019 120.702398) (xy 178.680686 121.211837) (xy 179.070113 121.601944) + (xy 179.579184 121.813329) (xy 180.130398 121.81381) (xy 180.639837 121.603314) (xy 181.029944 121.213887) (xy 181.241329 120.704816) + (xy 181.24181 120.153602) (xy 181.031314 119.644163) (xy 180.641887 119.254056) (xy 180.61223 119.241741) (xy 180.648325 119.11393) + (xy 179.856 118.321605) (xy 179.063675 119.11393) (xy 179.099653 119.241327) (xy 179.072163 119.252686) (xy 178.682056 119.642113) + (xy 178.470671 120.151184) (xy 178.47019 120.702398) (xy 169.902734 120.702398) (xy 172.668098 117.937034) (xy 178.458233 117.937034) + (xy 178.486195 118.487538) (xy 178.643069 118.866265) (xy 178.88407 118.934325) (xy 179.676395 118.142) (xy 180.035605 118.142) + (xy 180.82793 118.934325) (xy 181.068931 118.866265) (xy 181.253767 118.346966) (xy 181.225805 117.796462) (xy 181.068931 117.417735) + (xy 180.82793 117.349675) (xy 180.035605 118.142) (xy 179.676395 118.142) (xy 178.88407 117.349675) (xy 178.643069 117.417735) + (xy 178.458233 117.937034) (xy 172.668098 117.937034) (xy 173.435062 117.17007) (xy 179.063675 117.17007) (xy 179.856 117.962395) + (xy 180.648325 117.17007) (xy 180.580265 116.929069) (xy 180.060966 116.744233) (xy 179.510462 116.772195) (xy 179.131735 116.929069) + (xy 179.063675 117.17007) (xy 173.435062 117.17007) (xy 173.970132 116.635) (xy 185.5 116.635) (xy 185.934346 116.548603) + (xy 186.302566 116.302566) (xy 186.548603 115.934346) (xy 186.635 115.5) (xy 186.548603 115.065654) (xy 186.302566 114.697434) + (xy 185.934346 114.451397) (xy 185.5 114.365) (xy 173.5 114.365) (xy 173.065655 114.451396) (xy 172.697434 114.697434) + (xy 167.197434 120.197434) (xy 166.951397 120.565655) (xy 166.865 121) (xy 163.76 121) (xy 163.76 114.5) + (xy 163.702148 114.209161) (xy 163.537401 113.962599) (xy 161.584999 112.010197) (xy 161.584999 109.488238) (xy 161.970907 109.565) + (xy 162.029093 109.565) (xy 162.597378 109.451961) (xy 163.079147 109.130054) (xy 163.401054 108.648285) (xy 163.505981 108.120783) + (xy 164.797598 109.4124) (xy 165.04416 109.577147) (xy 165.334999 109.634999) (xy 166.564882 109.634999) (xy 166.564838 109.685167) + (xy 166.706883 110.028943) (xy 166.969673 110.292192) (xy 167.313201 110.434838) (xy 167.685167 110.435162) (xy 168.028943 110.293117) + (xy 168.292192 110.030327) (xy 168.434838 109.686799) (xy 168.434883 109.634999) (xy 172.139158 109.634999) (xy 172.065162 109.813201) + (xy 172.065121 109.860077) (xy 165.86032 116.064878) (xy 165.814833 116.064838) (xy 165.471057 116.206883) (xy 165.207808 116.469673) + (xy 165.065162 116.813201) (xy 165.064838 117.185167) (xy 165.206883 117.528943) (xy 165.469673 117.792192) (xy 165.813201 117.934838) + (xy 166.185167 117.935162) (xy 166.528943 117.793117) (xy 166.792192 117.530327) (xy 166.934838 117.186799) (xy 166.934879 117.139923) + (xy 173.13968 110.935122) (xy 173.185167 110.935162) (xy 173.528943 110.793117) (xy 173.792192 110.530327) (xy 173.934838 110.186799) + (xy 173.935162 109.814833) (xy 173.860856 109.634999) (xy 186.812536 109.634999) (xy 186.844672 109.667191) (xy 187.1882 109.809837) + (xy 187.560166 109.810161) (xy 187.903942 109.668116) (xy 188.167191 109.405326) (xy 188.309837 109.061798) (xy 188.310161 108.689832) + (xy 188.168116 108.346056) (xy 187.905326 108.082807) (xy 187.561798 107.940161) (xy 187.189832 107.939837) (xy 186.846056 108.081882) + (xy 186.812881 108.114999) (xy 171.427894 108.114999) (xy 171.548603 107.934346) (xy 171.635 107.5) (xy 171.635 100.970132) + (xy 172.802566 99.802566) (xy 173.048603 99.434346) (xy 173.134999 99) (xy 173.08726 98.76) (xy 177 98.76) + (xy 177.290839 98.702148) (xy 177.537401 98.537401) (xy 179.314802 96.76) (xy 188.937537 96.76) (xy 188.969673 96.792192) + (xy 189.313201 96.934838) (xy 189.685167 96.935162) (xy 190.028943 96.793117) (xy 190.190601 96.631741) (xy 190.190601 114.204267) + (xy 189.697434 114.697434) (xy 189.451397 115.065655) (xy 189.365 115.5) (xy 189.451397 115.934345) (xy 189.697434 116.302566) + (xy 190.065655 116.548603) (xy 190.5 116.635) (xy 190.934345 116.548603) (xy 191.302566 116.302566) (xy 192.128167 115.476965) + (xy 192.2365 115.314833) (xy 192.29 115.234765) (xy 192.29 137.873) (xy 103.71 137.873) (xy 103.71 133.963055) + (xy 104.282352 134.200716) (xy 104.932795 134.201284) (xy 105.533943 133.952894) (xy 105.994278 133.493363) (xy 106.243716 132.892648) + (xy 106.244284 132.242205) (xy 105.995894 131.641057) (xy 105.536363 131.180722) (xy 104.935648 130.931284) (xy 104.285205 130.930716) + (xy 103.71 131.168387) (xy 103.71 128.443) (xy 106.34951 128.443) (xy 106.34951 129.04244) (xy 106.522529 129.658265) + (xy 106.918044 130.161002) (xy 107.475841 130.474113) (xy 107.603646 130.505059) (xy 107.857 130.385705) (xy 107.857 128.443) + (xy 108.111 128.443) (xy 108.111 130.385705) (xy 108.364354 130.505059) (xy 108.492159 130.474113) (xy 109.049956 130.161002) + (xy 109.445471 129.658265) (xy 109.61849 129.04244) (xy 109.61849 128.443) (xy 108.111 128.443) (xy 107.857 128.443) + (xy 106.34951 128.443) (xy 103.71 128.443) (xy 103.71 127.58956) (xy 106.34951 127.58956) (xy 106.34951 128.189) + (xy 107.857 128.189) (xy 107.857 126.246295) (xy 108.111 126.246295) (xy 108.111 128.189) (xy 109.61849 128.189) + (xy 109.61849 127.58956) (xy 109.445471 126.973735) (xy 109.049956 126.470998) (xy 108.492159 126.157887) (xy 108.364354 126.126941) + (xy 108.111 126.246295) (xy 107.857 126.246295) (xy 107.603646 126.126941) (xy 107.475841 126.157887) (xy 106.918044 126.470998) + (xy 106.522529 126.973735) (xy 106.34951 127.58956) (xy 103.71 127.58956) (xy 103.71 125.463055) (xy 104.282352 125.700716) + (xy 104.932795 125.701284) (xy 105.533943 125.452894) (xy 105.994278 124.993363) (xy 106.171734 124.566) (xy 109.700316 124.566) + (xy 109.824773 125.191687) (xy 110.179196 125.72212) (xy 110.709629 126.076543) (xy 111.335316 126.201) (xy 111.474 126.201) + (xy 111.474 130.431) (xy 111.335316 130.431) (xy 110.709629 130.555457) (xy 110.179196 130.90988) (xy 109.824773 131.440313) + (xy 109.700316 132.066) (xy 109.824773 132.691687) (xy 110.179196 133.22212) (xy 110.709629 133.576543) (xy 111.335316 133.701) + (xy 113.132684 133.701) (xy 113.758371 133.576543) (xy 114.288804 133.22212) (xy 114.643227 132.691687) (xy 114.767684 132.066) + (xy 114.643227 131.440313) (xy 114.288804 130.90988) (xy 113.758371 130.555457) (xy 113.132684 130.431) (xy 112.994 130.431) + (xy 112.994 126.201) (xy 113.132684 126.201) (xy 113.758371 126.076543) (xy 114.288804 125.72212) (xy 114.643227 125.191687) + (xy 114.767684 124.566) (xy 114.643227 123.940313) (xy 114.288804 123.40988) (xy 113.758371 123.055457) (xy 113.132684 122.931) + (xy 111.335316 122.931) (xy 110.709629 123.055457) (xy 110.179196 123.40988) (xy 109.824773 123.940313) (xy 109.700316 124.566) + (xy 106.171734 124.566) (xy 106.243716 124.392648) (xy 106.244284 123.742205) (xy 105.995894 123.141057) (xy 105.536363 122.680722) + (xy 104.935648 122.431284) (xy 104.285205 122.430716) (xy 103.71 122.668387) (xy 103.71 121.832402) (xy 104.256952 122.059516) + (xy 104.907395 122.060084) (xy 105.508543 121.811694) (xy 105.968878 121.352163) (xy 106.218316 120.751448) (xy 106.218884 120.101005) + (xy 106.146078 119.9248) (xy 109.674916 119.9248) (xy 109.799373 120.550487) (xy 110.153796 121.08092) (xy 110.684229 121.435343) + (xy 111.309916 121.5598) (xy 113.107284 121.5598) (xy 113.407918 121.5) (xy 131.365 121.5) (xy 131.365 129) + (xy 131.451397 129.434346) (xy 131.697434 129.802566) (xy 132.065654 130.048603) (xy 132.5 130.135) (xy 132.934346 130.048603) + (xy 133.302566 129.802566) (xy 133.548603 129.434346) (xy 133.635 129) (xy 133.635 126.435167) (xy 143.814838 126.435167) + (xy 143.956883 126.778943) (xy 144.219673 127.042192) (xy 144.563201 127.184838) (xy 144.935167 127.185162) (xy 145.278943 127.043117) + (xy 145.312118 127.01) (xy 148.935198 127.01) (xy 154.564878 132.63968) (xy 154.564838 132.685167) (xy 154.706883 133.028943) + (xy 154.969673 133.292192) (xy 155.313201 133.434838) (xy 155.685167 133.435162) (xy 156.028943 133.293117) (xy 156.292192 133.030327) + (xy 156.434838 132.686799) (xy 156.435162 132.314833) (xy 156.293117 131.971057) (xy 156.030327 131.707808) (xy 155.686799 131.565162) + (xy 155.639923 131.565121) (xy 149.787401 125.712599) (xy 149.540839 125.547852) (xy 149.25 125.49) (xy 145.312463 125.49) + (xy 145.280327 125.457808) (xy 144.936799 125.315162) (xy 144.564833 125.314838) (xy 144.221057 125.456883) (xy 143.957808 125.719673) + (xy 143.815162 126.063201) (xy 143.814838 126.435167) (xy 133.635 126.435167) (xy 133.635 121.5) (xy 133.548603 121.065654) + (xy 133.302566 120.697434) (xy 132.934346 120.451397) (xy 132.5 120.365) (xy 132.065654 120.451397) (xy 131.697434 120.697434) + (xy 131.451397 121.065654) (xy 131.365 121.5) (xy 113.407918 121.5) (xy 113.732971 121.435343) (xy 114.263404 121.08092) + (xy 114.617827 120.550487) (xy 114.742284 119.9248) (xy 114.617827 119.299113) (xy 114.263404 118.76868) (xy 113.732971 118.414257) + (xy 113.107284 118.2898) (xy 111.309916 118.2898) (xy 110.684229 118.414257) (xy 110.153796 118.76868) (xy 109.799373 119.299113) + (xy 109.674916 119.9248) (xy 106.146078 119.9248) (xy 105.970494 119.499857) (xy 105.510963 119.039522) (xy 104.910248 118.790084) + (xy 104.259805 118.789516) (xy 103.71 119.016691) (xy 103.71 116.3018) (xy 106.32411 116.3018) (xy 106.32411 116.90124) + (xy 106.497129 117.517065) (xy 106.892644 118.019802) (xy 107.450441 118.332913) (xy 107.578246 118.363859) (xy 107.8316 118.244505) + (xy 107.8316 116.3018) (xy 108.0856 116.3018) (xy 108.0856 118.244505) (xy 108.338954 118.363859) (xy 108.466759 118.332913) + (xy 109.024556 118.019802) (xy 109.420071 117.517065) (xy 109.59309 116.90124) (xy 109.59309 116.3018) (xy 108.0856 116.3018) + (xy 107.8316 116.3018) (xy 106.32411 116.3018) (xy 103.71 116.3018) (xy 103.71 115.44836) (xy 106.32411 115.44836) + (xy 106.32411 116.0478) (xy 107.8316 116.0478) (xy 107.8316 114.105095) (xy 108.0856 114.105095) (xy 108.0856 116.0478) + (xy 109.59309 116.0478) (xy 109.59309 115.44836) (xy 109.420071 114.832535) (xy 109.024556 114.329798) (xy 108.466759 114.016687) + (xy 108.338954 113.985741) (xy 108.0856 114.105095) (xy 107.8316 114.105095) (xy 107.578246 113.985741) (xy 107.450441 114.016687) + (xy 106.892644 114.329798) (xy 106.497129 114.832535) (xy 106.32411 115.44836) (xy 103.71 115.44836) (xy 103.71 113.332402) + (xy 104.256952 113.559516) (xy 104.907395 113.560084) (xy 105.508543 113.311694) (xy 105.968878 112.852163) (xy 106.146334 112.4248) + (xy 109.674916 112.4248) (xy 109.799373 113.050487) (xy 110.153796 113.58092) (xy 110.684229 113.935343) (xy 111.309916 114.0598) + (xy 113.107284 114.0598) (xy 113.407918 114) (xy 123.365 114) (xy 123.451397 114.434345) (xy 123.697434 114.802566) + (xy 124.065655 115.048603) (xy 124.5 115.135) (xy 124.934345 115.048603) (xy 125.302566 114.802566) (xy 127.895121 112.210011) + (xy 138.35 112.210011) (xy 138.784346 112.123614) (xy 139.152566 111.877577) (xy 139.398603 111.509357) (xy 139.485 111.075011) + (xy 139.398603 110.640665) (xy 139.152566 110.272445) (xy 138.784346 110.026408) (xy 138.35 109.940011) (xy 127.424989 109.940011) + (xy 126.990643 110.026408) (xy 126.622423 110.272445) (xy 123.697434 113.197434) (xy 123.451397 113.565655) (xy 123.365 114) + (xy 113.407918 114) (xy 113.732971 113.935343) (xy 114.263404 113.58092) (xy 114.617827 113.050487) (xy 114.742284 112.4248) + (xy 114.617827 111.799113) (xy 114.263404 111.26868) (xy 113.732971 110.914257) (xy 113.107284 110.7898) (xy 113.01 110.7898) + (xy 113.01 108.685167) (xy 151.564838 108.685167) (xy 151.706883 109.028943) (xy 151.74 109.062118) (xy 151.74 122.187537) + (xy 151.707808 122.219673) (xy 151.565162 122.563201) (xy 151.564838 122.935167) (xy 151.706883 123.278943) (xy 151.969673 123.542192) + (xy 152.313201 123.684838) (xy 152.685167 123.685162) (xy 153.028943 123.543117) (xy 153.292192 123.280327) (xy 153.434838 122.936799) + (xy 153.435162 122.564833) (xy 153.293117 122.221057) (xy 153.26 122.187882) (xy 153.26 109.062463) (xy 153.292192 109.030327) + (xy 153.434838 108.686799) (xy 153.435162 108.314833) (xy 153.293117 107.971057) (xy 153.030327 107.707808) (xy 152.686799 107.565162) + (xy 152.314833 107.564838) (xy 151.971057 107.706883) (xy 151.707808 107.969673) (xy 151.565162 108.313201) (xy 151.564838 108.685167) + (xy 113.01 108.685167) (xy 113.01 104.385) (xy 113.148684 104.385) (xy 113.774371 104.260543) (xy 114.304804 103.90612) + (xy 114.659227 103.375687) (xy 114.783684 102.75) (xy 114.659227 102.124313) (xy 114.304804 101.59388) (xy 113.774371 101.239457) + (xy 113.148684 101.115) (xy 111.351316 101.115) (xy 110.725629 101.239457) (xy 110.195196 101.59388) (xy 109.840773 102.124313) + (xy 109.716316 102.75) (xy 109.840773 103.375687) (xy 110.195196 103.90612) (xy 110.725629 104.260543) (xy 111.351316 104.385) + (xy 111.49 104.385) (xy 111.49 110.7898) (xy 111.309916 110.7898) (xy 110.684229 110.914257) (xy 110.153796 111.26868) + (xy 109.799373 111.799113) (xy 109.674916 112.4248) (xy 106.146334 112.4248) (xy 106.218316 112.251448) (xy 106.218884 111.601005) + (xy 105.970494 110.999857) (xy 105.510963 110.539522) (xy 104.910248 110.290084) (xy 104.259805 110.289516) (xy 103.71 110.516691) + (xy 103.71 104.640412) (xy 104.298352 104.884716) (xy 104.948795 104.885284) (xy 105.549943 104.636894) (xy 106.010278 104.177363) + (xy 106.259716 103.576648) (xy 106.260284 102.926205) (xy 106.011894 102.325057) (xy 105.552363 101.864722) (xy 104.951648 101.615284) + (xy 104.301205 101.614716) (xy 103.71 101.858998) (xy 103.71 99.127) (xy 106.36551 99.127) (xy 106.36551 99.72644) + (xy 106.538529 100.342265) (xy 106.934044 100.845002) (xy 107.491841 101.158113) (xy 107.619646 101.189059) (xy 107.873 101.069705) + (xy 107.873 99.127) (xy 108.127 99.127) (xy 108.127 101.069705) (xy 108.380354 101.189059) (xy 108.508159 101.158113) + (xy 109.065956 100.845002) (xy 109.461471 100.342265) (xy 109.63449 99.72644) (xy 109.63449 99.127) (xy 108.127 99.127) + (xy 107.873 99.127) (xy 106.36551 99.127) (xy 103.71 99.127) (xy 103.71 98.27356) (xy 106.36551 98.27356) + (xy 106.36551 98.873) (xy 107.873 98.873) (xy 107.873 96.930295) (xy 108.127 96.930295) (xy 108.127 98.873) + (xy 109.63449 98.873) (xy 109.63449 98.27356) (xy 109.461471 97.657735) (xy 109.065956 97.154998) (xy 108.508159 96.841887) + (xy 108.380354 96.810941) (xy 108.127 96.930295) (xy 107.873 96.930295) (xy 107.619646 96.810941) (xy 107.491841 96.841887) + (xy 106.934044 97.154998) (xy 106.538529 97.657735) (xy 106.36551 98.27356) (xy 103.71 98.27356) (xy 103.71 96.140412) + (xy 104.298352 96.384716) (xy 104.948795 96.385284) (xy 105.549943 96.136894) (xy 106.010278 95.677363) (xy 106.187734 95.25) + (xy 109.716316 95.25) (xy 109.840773 95.875687) (xy 110.195196 96.40612) (xy 110.725629 96.760543) (xy 111.351316 96.885) + (xy 113.148684 96.885) (xy 113.774371 96.760543) (xy 114.304804 96.40612) (xy 114.659227 95.875687) (xy 114.783684 95.25) + (xy 114.659227 94.624313) (xy 114.304804 94.09388) (xy 113.774371 93.739457) (xy 113.148684 93.615) (xy 111.351316 93.615) + (xy 110.725629 93.739457) (xy 110.195196 94.09388) (xy 109.840773 94.624313) (xy 109.716316 95.25) (xy 106.187734 95.25) + (xy 106.259716 95.076648) (xy 106.260284 94.426205) (xy 106.011894 93.825057) (xy 105.552363 93.364722) (xy 104.951648 93.115284) + (xy 104.301205 93.114716) (xy 103.71 93.358998) (xy 103.71 88.89689) (xy 104.558524 88.89689) (xy 104.728355 89.306924) + (xy 105.118642 89.735183) (xy 105.643108 89.981486) (xy 105.873 89.860819) (xy 105.873 88.667) (xy 106.127 88.667) + (xy 106.127 89.860819) (xy 106.356892 89.981486) (xy 106.881358 89.735183) (xy 107.271645 89.306924) (xy 107.441476 88.89689) + (xy 107.320155 88.667) (xy 106.127 88.667) (xy 105.873 88.667) (xy 104.679845 88.667) (xy 104.558524 88.89689) + (xy 103.71 88.89689) (xy 103.71 86.28575) (xy 104.515 86.28575) (xy 104.515 86.97631) (xy 104.611673 87.209699) + (xy 104.790302 87.388327) (xy 104.999878 87.475136) (xy 104.728355 87.773076) (xy 104.558524 88.18311) (xy 104.679845 88.413) + (xy 105.873 88.413) (xy 105.873 86.127) (xy 106.127 86.127) (xy 106.127 88.413) (xy 107.320155 88.413) + (xy 107.441476 88.18311) (xy 107.271645 87.773076) (xy 107.000122 87.475136) (xy 107.209698 87.388327) (xy 107.388327 87.209699) + (xy 107.485 86.97631) (xy 107.485 86.28575) (xy 107.32625 86.127) (xy 106.127 86.127) (xy 105.873 86.127) + (xy 104.67375 86.127) (xy 104.515 86.28575) (xy 103.71 86.28575) (xy 103.71 85.02369) (xy 104.515 85.02369) + (xy 104.515 85.71425) (xy 104.67375 85.873) (xy 105.873 85.873) (xy 105.873 84.67375) (xy 106.127 84.67375) + (xy 106.127 85.873) (xy 107.32625 85.873) (xy 107.485 85.71425) (xy 107.485 85.02369) (xy 107.388327 84.790301) + (xy 107.209698 84.611673) (xy 106.976309 84.515) (xy 106.28575 84.515) (xy 106.127 84.67375) (xy 105.873 84.67375) + (xy 105.71425 84.515) (xy 105.023691 84.515) (xy 104.790302 84.611673) (xy 104.611673 84.790301) (xy 104.515 85.02369) + (xy 103.71 85.02369) (xy 103.71 77.86451) (xy 106.415232 77.86451) (xy 106.580002 78.263283) (xy 106.884833 78.568646) + (xy 107.283317 78.734111) (xy 107.71479 78.734488) (xy 108.113563 78.569718) (xy 108.418926 78.264887) (xy 108.584391 77.866403) + (xy 108.584768 77.43493) (xy 108.419998 77.036157) (xy 108.115167 76.730794) (xy 107.716683 76.565329) (xy 107.28521 76.564952) + (xy 106.886437 76.729722) (xy 106.581074 77.034553) (xy 106.415609 77.433037) (xy 106.415232 77.86451) (xy 103.71 77.86451) + (xy 103.71 73.46523) (xy 106.415232 73.46523) (xy 106.580002 73.864003) (xy 106.884833 74.169366) (xy 107.283317 74.334831) + (xy 107.71479 74.335208) (xy 108.113563 74.170438) (xy 108.418926 73.865607) (xy 108.584391 73.467123) (xy 108.584768 73.03565) + (xy 108.419998 72.636877) (xy 108.115167 72.331514) (xy 107.716683 72.166049) (xy 107.28521 72.165672) (xy 106.886437 72.330442) + (xy 106.581074 72.635273) (xy 106.415609 73.033757) (xy 106.415232 73.46523) (xy 103.71 73.46523) (xy 103.71 71.5) + (xy 113.365 71.5) (xy 113.451397 71.934345) (xy 113.697434 72.302566) (xy 113.865 72.470132) (xy 113.865 84.660982) + (xy 113.748559 84.73591) (xy 113.603569 84.94811) (xy 113.55256 85.2) (xy 113.55256 86.8) (xy 113.596838 87.035317) + (xy 113.73591 87.251441) (xy 113.94811 87.396431) (xy 114.2 87.44744) (xy 115.8 87.44744) (xy 116.035317 87.403162) + (xy 116.251441 87.26409) (xy 116.396431 87.05189) (xy 116.40537 87.007745) (xy 116.671861 87.007745) (xy 116.745995 87.253864) + (xy 117.283223 87.446965) (xy 117.853454 87.419778) (xy 118.254005 87.253864) (xy 118.328139 87.007745) (xy 124.671861 87.007745) + (xy 124.745995 87.253864) (xy 125.283223 87.446965) (xy 125.853454 87.419778) (xy 126.254005 87.253864) (xy 126.328139 87.007745) + (xy 125.5 86.179605) (xy 124.671861 87.007745) (xy 118.328139 87.007745) (xy 117.5 86.179605) (xy 116.671861 87.007745) + (xy 116.40537 87.007745) (xy 116.444646 86.813799) (xy 116.492255 86.828139) (xy 117.320395 86) (xy 117.679605 86) + (xy 118.507745 86.828139) (xy 118.753864 86.754005) (xy 118.946965 86.216777) (xy 118.926295 85.783223) (xy 124.053035 85.783223) + (xy 124.080222 86.353454) (xy 124.246136 86.754005) (xy 124.492255 86.828139) (xy 125.320395 86) (xy 125.679605 86) + (xy 126.507745 86.828139) (xy 126.555167 86.813855) (xy 126.596838 87.035317) (xy 126.73591 87.251441) (xy 126.94811 87.396431) + (xy 127.2 87.44744) (xy 128.8 87.44744) (xy 129.035317 87.403162) (xy 129.251441 87.26409) (xy 129.396431 87.05189) + (xy 129.44744 86.8) (xy 129.44744 85.2) (xy 129.403162 84.964683) (xy 129.26409 84.748559) (xy 129.05189 84.603569) + (xy 128.8 84.55256) (xy 127.2 84.55256) (xy 126.964683 84.596838) (xy 126.748559 84.73591) (xy 126.603569 84.94811) + (xy 126.555354 85.186201) (xy 126.507745 85.171861) (xy 125.679605 86) (xy 125.320395 86) (xy 124.492255 85.171861) + (xy 124.246136 85.245995) (xy 124.053035 85.783223) (xy 118.926295 85.783223) (xy 118.919778 85.646546) (xy 118.753864 85.245995) + (xy 118.507745 85.171861) (xy 117.679605 86) (xy 117.320395 86) (xy 116.492255 85.171861) (xy 116.444833 85.186145) + (xy 116.408351 84.992255) (xy 116.671861 84.992255) (xy 117.5 85.820395) (xy 118.328139 84.992255) (xy 124.671861 84.992255) + (xy 125.5 85.820395) (xy 126.328139 84.992255) (xy 126.254005 84.746136) (xy 125.716777 84.553035) (xy 125.146546 84.580222) + (xy 124.745995 84.746136) (xy 124.671861 84.992255) (xy 118.328139 84.992255) (xy 118.254005 84.746136) (xy 117.716777 84.553035) + (xy 117.146546 84.580222) (xy 116.745995 84.746136) (xy 116.671861 84.992255) (xy 116.408351 84.992255) (xy 116.403162 84.964683) + (xy 116.26409 84.748559) (xy 116.135 84.660356) (xy 116.135 72) (xy 116.048603 71.565654) (xy 115.802566 71.197434) + (xy 115.302566 70.697434) (xy 114.934345 70.451397) (xy 114.5 70.365) (xy 114.065655 70.451397) (xy 113.697434 70.697434) + (xy 113.451397 71.065655) (xy 113.365 71.5) (xy 103.71 71.5) (xy 103.71 66.627) (xy 164.302846 66.627) ) ) (filled_polygon @@ -7582,11 +7666,20 @@ (xy 141.135 116.78575) (xy 140.97625 116.627) (xy 139.627 116.627) (xy 139.373 116.627) (xy 139.353 116.627) (xy 139.353 116.373) (xy 139.373 116.373) (xy 139.373 116.353) (xy 139.627 116.353) (xy 139.627 116.373) (xy 140.97625 116.373) (xy 141.135 116.21425) (xy 141.135 115.57369) (xy 141.038327 115.340301) (xy 140.97607 115.278044) - (xy 141.096431 115.10189) (xy 141.14744 114.85) (xy 141.14744 114.76) (xy 142.727412 114.76) (xy 143.018251 114.702148) - (xy 143.264813 114.537401) (xy 151.74 106.062214) (xy 151.74 107.937537) (xy 151.707808 107.969673) (xy 151.565162 108.313201) - (xy 151.564838 108.685167) (xy 151.706883 109.028943) (xy 151.969673 109.292192) (xy 152.313201 109.434838) (xy 152.685167 109.435162) - (xy 153.028943 109.293117) (xy 153.292192 109.030327) (xy 153.434838 108.686799) (xy 153.435162 108.314833) (xy 153.293117 107.971057) - (xy 153.26 107.937882) (xy 153.26 105.178624) (xy 153.614999 104.823625) + (xy 141.096431 115.10189) (xy 141.14744 114.85) (xy 141.14744 114.76) (xy 145.842 114.76) (xy 146.132839 114.702148) + (xy 146.379401 114.537401) (xy 148.111401 112.805401) (xy 148.276148 112.558839) (xy 148.334 112.268) (xy 148.334 111.152653) + (xy 148.479691 111.213) (xy 149.32025 111.213) (xy 149.479 111.05425) (xy 149.479 109.855) (xy 149.733 109.855) + (xy 149.733 111.05425) (xy 149.89175 111.213) (xy 150.732309 111.213) (xy 150.965698 111.116327) (xy 151.144327 110.937699) + (xy 151.241 110.70431) (xy 151.241 110.01375) (xy 151.08225 109.855) (xy 149.733 109.855) (xy 149.479 109.855) + (xy 149.459 109.855) (xy 149.459 109.601) (xy 149.479 109.601) (xy 149.479 107.569) (xy 149.733 107.569) + (xy 149.733 109.601) (xy 151.08225 109.601) (xy 151.241 109.44225) (xy 151.241 108.75169) (xy 151.171955 108.585) + (xy 151.241 108.41831) (xy 151.241 107.72775) (xy 151.08225 107.569) (xy 149.733 107.569) (xy 149.479 107.569) + (xy 149.459 107.569) (xy 149.459 107.315) (xy 149.479 107.315) (xy 149.479 107.295) (xy 149.733 107.295) + (xy 149.733 107.315) (xy 151.08225 107.315) (xy 151.241 107.15625) (xy 151.241 106.561214) (xy 151.74 106.062214) + (xy 151.74 107.937537) (xy 151.707808 107.969673) (xy 151.565162 108.313201) (xy 151.564838 108.685167) (xy 151.706883 109.028943) + (xy 151.969673 109.292192) (xy 152.313201 109.434838) (xy 152.685167 109.435162) (xy 153.028943 109.293117) (xy 153.292192 109.030327) + (xy 153.434838 108.686799) (xy 153.435162 108.314833) (xy 153.293117 107.971057) (xy 153.26 107.937882) (xy 153.26 105.178624) + (xy 153.614999 104.823625) ) ) (filled_polygon @@ -7697,7 +7790,7 @@ (xy 168.403569 99.89811) (xy 168.35256 100.15) (xy 168.35256 101.85) (xy 168.396838 102.085317) (xy 168.503759 102.251477) (xy 168.403569 102.39811) (xy 168.35256 102.65) (xy 168.35256 104.35) (xy 168.396838 104.585317) (xy 168.503759 104.751477) (xy 168.403569 104.89811) (xy 168.35256 105.15) (xy 168.35256 106.85) (xy 168.396838 107.085317) (xy 168.53591 107.301441) - (xy 168.74811 107.446431) (xy 168.992547 107.495931) (xy 169.120081 107.686799) (xy 169.197434 107.802566) (xy 169.493206 108.098338) + (xy 168.74811 107.446431) (xy 168.992547 107.495931) (xy 169.169695 107.761052) (xy 169.197434 107.802566) (xy 169.493206 108.098338) (xy 169.340302 108.161673) (xy 169.161673 108.340301) (xy 169.065 108.57369) (xy 169.065 109.21425) (xy 169.22375 109.373) (xy 170.573 109.373) (xy 170.573 109.353) (xy 170.827 109.353) (xy 170.827 109.373) (xy 170.847 109.373) (xy 170.847 109.627) (xy 170.827 109.627) (xy 170.827 109.647) (xy 170.573 109.647) (xy 170.573 109.627) diff --git a/KiCad/LCDZapperPro.net b/KiCad/LCDZapperPro.net index 3a064b8..86c7430 100644 --- a/KiCad/LCDZapperPro.net +++ b/KiCad/LCDZapperPro.net @@ -1,7 +1,7 @@ (export (version D) (design (source /Users/charlie/github/LCDZapper/KiCad/LCDZapperPro.sch) - (date "Thursday, 28 June 2018 'pmt' 12:02:20") + (date "Sunday, 22 July 2018 'amt' 11:22:04") (tool "Eeschema 4.0.6") (sheet (number 1) (name /) (tstamps /) (title_block @@ -82,19 +82,19 @@ (sheetpath (names /) (tstamps /)) (tstamp 58E7C9CE)) (comp (ref C1) - (value 220uF) + (value 220u) (footprint Capacitors_THT:CP_Radial_D7.5mm_P2.50mm) (libsource (lib device) (part CP)) (sheetpath (names /) (tstamps /)) (tstamp 58E7CE75)) (comp (ref C2) - (value 220uF) + (value 220u) (footprint Capacitors_THT:CP_Radial_D7.5mm_P2.50mm) (libsource (lib device) (part CP)) (sheetpath (names /) (tstamps /)) (tstamp 58E7CF2D)) (comp (ref C3) - (value 1uF) + (value 1u) (footprint Capacitors_SMD:C_1206_HandSoldering) (libsource (lib device) (part C)) (sheetpath (names /) (tstamps /)) @@ -418,7 +418,7 @@ (sheetpath (names /) (tstamps /)) (tstamp 5999D8E0)) (comp (ref C18) - (value 1uF) + (value 1u) (footprint Capacitors_SMD:C_1206_HandSoldering) (libsource (lib device) (part C)) (sheetpath (names /) (tstamps /)) @@ -740,7 +740,19 @@ (footprint TO_SOT_Packages_SMD:SOT-23_Handsoldering) (libsource (lib device) (part D_TVS_x2_AAC)) (sheetpath (names /) (tstamps /)) - (tstamp 5A52929B))) + (tstamp 5A52929B)) + (comp (ref R42) + (value 10K) + (footprint Resistors_SMD:R_1206_HandSoldering) + (libsource (lib device) (part R)) + (sheetpath (names /) (tstamps /)) + (tstamp 5B547A74)) + (comp (ref R45) + (value 10K) + (footprint Resistors_SMD:R_1206_HandSoldering) + (libsource (lib device) (part R)) + (sheetpath (names /) (tstamps /)) + (tstamp 5B5498CC))) (libparts (libpart (lib 74xx) (part 74LS05) (aliases @@ -1098,227 +1110,230 @@ (pin (num 4) (name GND) (type power_out)) (pin (num 5) (name Shield) (type passive))))) (libraries - (library (logical regul) - (uri "/Library/Application Support/kicad/library/regul.lib")) (library (logical device) (uri "/Library/Application Support/kicad/library/device.lib")) + (library (logical switches) + (uri "/Library/Application Support/kicad/library/switches.lib")) + (library (logical regul) + (uri "/Library/Application Support/kicad/library/regul.lib")) + (library (logical ESP32-footprints-Shem-Lib) + (uri /Users/charlie/Documents/Kicad/Libraries/ESP32-Footprints/ESP32-footprints-Shem-Lib.lib)) + (library (logical rca_switch) + (uri /Users/charlie/Documents/Kicad/Libraries/rca_switch.lib)) (library (logical linear) (uri "/Library/Application Support/kicad/library/linear.lib")) (library (logical 74xx) (uri "/Library/Application Support/kicad/library/74xx.lib")) - (library (logical transistors) - (uri "/Library/Application Support/kicad/library/transistors.lib")) (library (logical conn) (uri "/Library/Application Support/kicad/library/conn.lib")) - (library (logical switches) - (uri "/Library/Application Support/kicad/library/switches.lib")) - (library (logical ESP32-footprints-Shem-Lib) - (uri /Users/charlie/Documents/Kicad/Libraries/ESP32-Footprints/ESP32-footprints-Shem-Lib.lib)) - (library (logical rca_switch) - (uri /Users/charlie/Documents/Kicad/Libraries/rca_switch.lib))) + (library (logical transistors) + (uri "/Library/Application Support/kicad/library/transistors.lib"))) (nets (net (code 1) (name GND) - (node (ref C11) (pin 1)) (node (ref U7) (pin 7)) - (node (ref U6) (pin 7)) - (node (ref J5) (pin 1)) - (node (ref U3) (pin 4)) - (node (ref J4) (pin 2)) - (node (ref J2) (pin 5)) - (node (ref R31) (pin 2)) - (node (ref J2) (pin 4)) + (node (ref R36) (pin 1)) + (node (ref R39) (pin 2)) + (node (ref U4) (pin 4)) (node (ref R12) (pin 1)) - (node (ref C5) (pin 1)) - (node (ref C10) (pin 2)) - (node (ref R40) (pin 2)) + (node (ref C11) (pin 1)) + (node (ref J10) (pin 2)) (node (ref D20) (pin 3)) - (node (ref D21) (pin 3)) - (node (ref R39) (pin 2)) + (node (ref J2) (pin 4)) + (node (ref J2) (pin 5)) (node (ref C13) (pin 2)) - (node (ref J7) (pin 8)) - (node (ref Q4) (pin 2)) - (node (ref J7) (pin 9)) - (node (ref Q3) (pin 2)) - (node (ref J7) (pin 11)) - (node (ref C18) (pin 1)) - (node (ref C7) (pin 2)) + (node (ref J5) (pin 1)) (node (ref Q2) (pin 2)) + (node (ref Q3) (pin 2)) + (node (ref Q4) (pin 2)) + (node (ref U6) (pin 7)) + (node (ref C12) (pin 2)) + (node (ref R33) (pin 1)) (node (ref C14) (pin 1)) - (node (ref U2) (pin 1)) - (node (ref U1) (pin 1)) + (node (ref R40) (pin 2)) + (node (ref C10) (pin 2)) + (node (ref U5) (pin 7)) + (node (ref C18) (pin 1)) + (node (ref J7) (pin 11)) + (node (ref J7) (pin 9)) + (node (ref J7) (pin 8)) + (node (ref R3) (pin 1)) (node (ref C6) (pin 2)) - (node (ref R33) (pin 1)) + (node (ref J1) (pin 1)) (node (ref Q1) (pin 2)) - (node (ref C1) (pin 2)) - (node (ref C2) (pin 2)) + (node (ref R8) (pin 2)) + (node (ref J9) (pin 2)) + (node (ref C7) (pin 2)) + (node (ref U2) (pin 15)) (node (ref J3) (pin 2)) - (node (ref R3) (pin 1)) (node (ref J6) (pin 8)) (node (ref J6) (pin 9)) (node (ref J6) (pin 11)) - (node (ref R8) (pin 2)) - (node (ref J9) (pin 2)) - (node (ref U2) (pin 15)) - (node (ref C3) (pin 2)) - (node (ref R10) (pin 1)) + (node (ref U2) (pin 1)) + (node (ref U2) (pin 38)) + (node (ref U2) (pin 39)) (node (ref J10) (pin 1)) - (node (ref J10) (pin 2)) + (node (ref R45) (pin 2)) + (node (ref U3) (pin 4)) + (node (ref R31) (pin 2)) + (node (ref R42) (pin 2)) + (node (ref D21) (pin 3)) + (node (ref J4) (pin 2)) + (node (ref C5) (pin 1)) + (node (ref U1) (pin 1)) + (node (ref SW2) (pin 2)) + (node (ref C1) (pin 2)) + (node (ref C2) (pin 2)) + (node (ref C3) (pin 2)) (node (ref R2) (pin 2)) - (node (ref U4) (pin 4)) - (node (ref C12) (pin 2)) - (node (ref R36) (pin 1)) (node (ref SW1) (pin 2)) - (node (ref U5) (pin 7)) - (node (ref U2) (pin 39)) - (node (ref U2) (pin 38)) - (node (ref J1) (pin 1)) - (node (ref SW2) (pin 2))) + (node (ref R10) (pin 1))) (net (code 2) (name "Net-(D14-Pad1)") - (node (ref D14) (pin 1)) - (node (ref J6) (pin 1))) + (node (ref J6) (pin 1)) + (node (ref D14) (pin 1))) (net (code 3) (name "Net-(J6-Pad10)") - (node (ref J6) (pin 10)) - (node (ref R18) (pin 2))) + (node (ref R18) (pin 2)) + (node (ref J6) (pin 10))) (net (code 4) (name "Net-(J6-Pad12)") - (node (ref R21) (pin 2)) - (node (ref J6) (pin 12))) - (net (code 5) (name "Net-(D4-Pad1)") + (node (ref J6) (pin 12)) + (node (ref R21) (pin 2))) + (net (code 5) (name +5V) + (node (ref U1) (pin 3)) + (node (ref C1) (pin 1)) + (node (ref J2) (pin 1)) + (node (ref R17) (pin 2)) + (node (ref J5) (pin 2)) + (node (ref R13) (pin 2)) + (node (ref TP1) (pin 1))) + (net (code 6) (name "Net-(D4-Pad1)") + (node (ref D4) (pin 1)) (node (ref D7) (pin 1)) - (node (ref U7) (pin 6)) - (node (ref D4) (pin 1))) - (net (code 6) (name "Net-(C6-Pad1)") - (node (ref U7) (pin 5)) + (node (ref U7) (pin 6))) + (net (code 7) (name "Net-(C6-Pad1)") + (node (ref C6) (pin 1)) (node (ref R28) (pin 1)) - (node (ref C6) (pin 1))) - (net (code 7) (name SIG2_1) - (node (ref U2) (pin 10)) - (node (ref U7) (pin 1))) - (net (code 8) (name SIG1_2) - (node (ref U7) (pin 11)) - (node (ref U2) (pin 13))) - (net (code 9) (name OC_OUTPUT1) - (node (ref D21) (pin 2)) - (node (ref J7) (pin 3)) + (node (ref U7) (pin 5))) + (net (code 8) (name OC_OUTPUT1) + (node (ref Q2) (pin 3)) (node (ref R38) (pin 2)) - (node (ref Q2) (pin 3))) - (net (code 10) (name S1_PULL) - (node (ref D18) (pin 2)) + (node (ref J7) (pin 3)) + (node (ref D21) (pin 2))) + (net (code 9) (name S1_PULL) (node (ref J7) (pin 4)) + (node (ref D18) (pin 2)) (node (ref D17) (pin 2))) - (net (code 11) (name "Net-(TP14-Pad1)") - (node (ref U5) (pin 8)) + (net (code 10) (name "Net-(TP14-Pad1)") (node (ref U6) (pin 4)) + (node (ref U5) (pin 8)) (node (ref TP14) (pin 1))) - (net (code 12) (name "Net-(R7-Pad1)") - (node (ref U6) (pin 6)) + (net (code 11) (name "Net-(R7-Pad1)") + (node (ref U5) (pin 13)) (node (ref R7) (pin 1)) - (node (ref U5) (pin 13))) - (net (code 13) (name "Net-(D6-Pad2)") + (node (ref U6) (pin 6))) + (net (code 12) (name "Net-(D6-Pad2)") (node (ref U6) (pin 5)) - (node (ref R7) (pin 2)) - (node (ref D6) (pin 2))) - (net (code 14) (name "Net-(D9-Pad2)") + (node (ref D6) (pin 2)) + (node (ref R7) (pin 2))) + (net (code 13) (name "Net-(D9-Pad2)") (node (ref R27) (pin 2)) (node (ref D9) (pin 2)) (node (ref U6) (pin 13))) - (net (code 15) (name "Net-(D6-Pad1)") - (node (ref U7) (pin 12)) + (net (code 14) (name "Net-(D6-Pad1)") (node (ref D9) (pin 1)) - (node (ref D6) (pin 1))) - (net (code 16) (name +5V) - (node (ref R13) (pin 2)) - (node (ref TP1) (pin 1)) - (node (ref R17) (pin 2)) - (node (ref J2) (pin 1)) - (node (ref U1) (pin 3)) - (node (ref C1) (pin 1)) - (node (ref J5) (pin 2))) - (net (code 17) (name FRONTLED2) - (node (ref R18) (pin 1)) - (node (ref U2) (pin 8))) - (net (code 18) (name SELECT2_DELAY) - (node (ref U2) (pin 29)) - (node (ref U5) (pin 4))) - (net (code 19) (name SIG_OUTPUT2_2) - (node (ref R44) (pin 2)) - (node (ref J6) (pin 7)) - (node (ref U7) (pin 4))) - (net (code 20) (name "Net-(D12-Pad1)") - (node (ref R46) (pin 1)) - (node (ref D12) (pin 1))) - (net (code 21) (name "Net-(D13-Pad1)") + (node (ref D6) (pin 1)) + (node (ref U7) (pin 12))) + (net (code 15) (name FRONTLED2) + (node (ref U2) (pin 8)) + (node (ref R18) (pin 1))) + (net (code 16) (name SELECT2_DELAY) + (node (ref U5) (pin 4)) + (node (ref U2) (pin 29))) + (net (code 17) (name SIG2_1) + (node (ref U7) (pin 1)) + (node (ref U2) (pin 10))) + (net (code 18) (name SIG1_2) + (node (ref U7) (pin 11)) + (node (ref U2) (pin 13))) + (net (code 19) (name "Net-(D13-Pad1)") (node (ref R47) (pin 1)) (node (ref D13) (pin 1))) - (net (code 22) (name "Net-(J1-Pad4)") + (net (code 20) (name "Net-(J1-Pad4)") (node (ref J1) (pin 4)) (node (ref R1) (pin 2))) - (net (code 23) (name "Net-(TP13-Pad1)") + (net (code 21) (name "Net-(TP13-Pad1)") (node (ref U5) (pin 3)) (node (ref U6) (pin 1)) (node (ref TP13) (pin 1))) - (net (code 24) (name DIM_INV) - (node (ref U2) (pin 36)) - (node (ref D1) (pin 1))) - (net (code 25) (name SELECT2) + (net (code 22) (name DIM_INV) + (node (ref D1) (pin 1)) + (node (ref U2) (pin 36))) + (net (code 23) (name SELECT2) (node (ref TP9) (pin 1)) (node (ref U2) (pin 30)) - (node (ref U5) (pin 2))) - (net (code 26) (name FRONTLED1) - (node (ref U2) (pin 26)) - (node (ref R22) (pin 1))) + (node (ref U5) (pin 2)) + (node (ref R42) (pin 1))) + (net (code 24) (name FRONTLED1) + (node (ref R22) (pin 1)) + (node (ref U2) (pin 26))) + (net (code 25) (name "Net-(R29-Pad2)") + (node (ref U4) (pin 1)) + (node (ref R29) (pin 2))) + (net (code 26) (name "Net-(C13-Pad1)") + (node (ref U4) (pin 2)) + (node (ref C13) (pin 1)) + (node (ref R41) (pin 1))) (net (code 27) (name "Net-(D10-Pad1)") - (node (ref D10) (pin 1)) - (node (ref R43) (pin 1))) + (node (ref R43) (pin 1)) + (node (ref D10) (pin 1))) (net (code 28) (name SIG_OUTPUT2_1) - (node (ref J6) (pin 6)) (node (ref R43) (pin 2)) - (node (ref U7) (pin 2))) + (node (ref U7) (pin 2)) + (node (ref J6) (pin 6))) (net (code 29) (name "Net-(D11-Pad1)") - (node (ref R44) (pin 1)) - (node (ref D11) (pin 1))) - (net (code 30) (name "Net-(R35-Pad1)") - (node (ref U4) (pin 5)) - (node (ref R36) (pin 2)) - (node (ref R35) (pin 1))) - (net (code 31) (name "Net-(R4-Pad1)") - (node (ref U6) (pin 3)) + (node (ref D11) (pin 1)) + (node (ref R44) (pin 1))) + (net (code 30) (name SIG_OUTPUT2_2) + (node (ref R44) (pin 2)) + (node (ref U7) (pin 4)) + (node (ref J6) (pin 7))) + (net (code 31) (name "Net-(D12-Pad1)") + (node (ref D12) (pin 1)) + (node (ref R46) (pin 1))) + (net (code 32) (name "Net-(R4-Pad1)") (node (ref U5) (pin 5)) - (node (ref R4) (pin 1))) - (net (code 32) (name "Net-(D4-Pad2)") + (node (ref R4) (pin 1)) + (node (ref U6) (pin 3))) + (net (code 33) (name "Net-(D4-Pad2)") (node (ref D4) (pin 2)) (node (ref R4) (pin 2)) (node (ref U6) (pin 2))) - (net (code 33) (name TRIGGER2) - (node (ref Q3) (pin 1)) + (net (code 34) (name TRIGGER2) (node (ref R21) (pin 1)) + (node (ref R26) (pin 1)) (node (ref R28) (pin 2)) - (node (ref U6) (pin 8)) - (node (ref R26) (pin 1))) - (net (code 34) (name "Net-(D7-Pad2)") + (node (ref Q3) (pin 1)) + (node (ref U6) (pin 8))) + (net (code 35) (name "Net-(D7-Pad2)") (node (ref U6) (pin 10)) (node (ref R26) (pin 2)) (node (ref D7) (pin 2))) - (net (code 35) (name "Net-(R29-Pad2)") - (node (ref R29) (pin 2)) - (node (ref U4) (pin 1))) (net (code 36) (name "Net-(D3-Pad1)") - (node (ref D3) (pin 1)) - (node (ref R23) (pin 1))) + (node (ref R23) (pin 1)) + (node (ref D3) (pin 1))) (net (code 37) (name "Net-(D1-Pad2)") - (node (ref R20) (pin 2)) + (node (ref D1) (pin 2)) (node (ref R19) (pin 1)) - (node (ref D1) (pin 2))) - (net (code 38) (name "Net-(C13-Pad1)") - (node (ref U4) (pin 2)) - (node (ref C13) (pin 1)) - (node (ref R41) (pin 1))) + (node (ref R20) (pin 2))) + (net (code 38) (name "Net-(R35-Pad1)") + (node (ref R35) (pin 1)) + (node (ref R36) (pin 2)) + (node (ref U4) (pin 5))) (net (code 39) (name WHITE_LEVEL) - (node (ref U2) (pin 16)) - (node (ref R41) (pin 2))) + (node (ref R41) (pin 2)) + (node (ref U2) (pin 16))) (net (code 40) (name VIDEOxROOT2) - (node (ref R9) (pin 1)) - (node (ref R19) (pin 2)) (node (ref U3) (pin 1)) + (node (ref R19) (pin 2)) + (node (ref R9) (pin 1)) (node (ref R24) (pin 2))) (net (code 41) (name "Net-(C14-Pad2)") (node (ref U4) (pin 3)) @@ -1328,66 +1343,66 @@ (node (ref R53) (pin 2)) (node (ref D16) (pin 1))) (net (code 43) (name "Net-(D19-Pad1)") - (node (ref R37) (pin 1)) - (node (ref D19) (pin 1))) + (node (ref D19) (pin 1)) + (node (ref R37) (pin 1))) (net (code 44) (name SIG_PULLUP2) (node (ref D11) (pin 2)) - (node (ref D10) (pin 2)) - (node (ref J6) (pin 5))) - (net (code 45) (name +3V3) - (node (ref C10) (pin 1)) - (node (ref D2) (pin 2)) - (node (ref U4) (pin 8)) - (node (ref U1) (pin 2)) - (node (ref U7) (pin 14)) - (node (ref C2) (pin 1)) + (node (ref J6) (pin 5)) + (node (ref D10) (pin 2))) + (net (code 45) (name S2_PULL) + (node (ref J6) (pin 4)) + (node (ref D16) (pin 2)) + (node (ref D19) (pin 2))) + (net (code 46) (name "Net-(D14-Pad2)") + (node (ref R13) (pin 1)) + (node (ref D14) (pin 2))) + (net (code 47) (name +3V3) (node (ref R32) (pin 2)) + (node (ref U6) (pin 14)) + (node (ref C18) (pin 2)) (node (ref C3) (pin 1)) + (node (ref R5) (pin 1)) + (node (ref R14) (pin 1)) + (node (ref D2) (pin 2)) + (node (ref C10) (pin 1)) (node (ref U2) (pin 2)) - (node (ref U5) (pin 14)) - (node (ref TP2) (pin 1)) - (node (ref C18) (pin 2)) (node (ref U3) (pin 8)) + (node (ref TP2) (pin 1)) + (node (ref J1) (pin 3)) + (node (ref U1) (pin 2)) + (node (ref U7) (pin 14)) + (node (ref U5) (pin 14)) + (node (ref C2) (pin 1)) + (node (ref U4) (pin 8)) (node (ref R6) (pin 2)) - (node (ref U6) (pin 14)) - (node (ref R35) (pin 2)) - (node (ref R5) (pin 1)) - (node (ref R14) (pin 1)) - (node (ref J1) (pin 3))) - (net (code 46) (name "Net-(C4-Pad1)") - (node (ref C4) (pin 1)) + (node (ref R35) (pin 2))) + (net (code 48) (name "Net-(C4-Pad1)") + (node (ref U3) (pin 3)) (node (ref TP3) (pin 1)) (node (ref R39) (pin 1)) (node (ref D5) (pin 1)) - (node (ref U3) (pin 3))) - (net (code 47) (name DIM1) + (node (ref C4) (pin 1))) + (net (code 49) (name DIM1) + (node (ref D22) (pin 2)) (node (ref U2) (pin 9)) - (node (ref TP4) (pin 1)) - (node (ref D22) (pin 2))) - (net (code 48) (name "Net-(D22-Pad1)") + (node (ref TP4) (pin 1))) + (net (code 50) (name "Net-(D22-Pad1)") (node (ref D22) (pin 1)) (node (ref R16) (pin 1))) - (net (code 49) (name OC_OUTPUT2_INV) - (node (ref R53) (pin 1)) + (net (code 51) (name OC_OUTPUT2_INV) (node (ref D20) (pin 1)) - (node (ref J6) (pin 2)) (node (ref Q3) (pin 3)) - (node (ref Q1) (pin 1))) - (net (code 50) (name OC_OUTPUT2) - (node (ref D20) (pin 2)) - (node (ref Q1) (pin 3)) + (node (ref R53) (pin 1)) + (node (ref Q1) (pin 1)) + (node (ref J6) (pin 2))) + (net (code 52) (name OC_OUTPUT2) + (node (ref J6) (pin 3)) (node (ref R37) (pin 2)) - (node (ref J6) (pin 3))) - (net (code 51) (name S2_PULL) - (node (ref J6) (pin 4)) - (node (ref D16) (pin 2)) - (node (ref D19) (pin 2))) - (net (code 52) (name "Net-(D14-Pad2)") - (node (ref R13) (pin 1)) - (node (ref D14) (pin 2))) + (node (ref D20) (pin 2)) + (node (ref Q1) (pin 3))) (net (code 53) (name "Net-(D17-Pad1)") - (node (ref D17) (pin 1)) - (node (ref R54) (pin 2))) + (node (ref R54) (pin 2)) + (node (ref D17) (pin 1))) (net (code 54) (name "Net-(D15-Pad2)") (node (ref D15) (pin 2)) (node (ref R17) (pin 1))) @@ -1396,178 +1411,179 @@ (node (ref R15) (pin 1)) (node (ref R16) (pin 2))) (net (code 56) (name OC_OUTPUT1_INV) - (node (ref J7) (pin 2)) (node (ref Q2) (pin 1)) + (node (ref Q4) (pin 3)) (node (ref D21) (pin 1)) (node (ref R54) (pin 1)) - (node (ref Q4) (pin 3))) + (node (ref J7) (pin 2))) (net (code 57) (name "Net-(D18-Pad1)") - (node (ref R38) (pin 1)) - (node (ref D18) (pin 1))) + (node (ref D18) (pin 1)) + (node (ref R38) (pin 1))) (net (code 58) (name "Net-(D15-Pad1)") (node (ref J7) (pin 1)) (node (ref D15) (pin 1))) (net (code 59) (name SIG_PULLUP1) - (node (ref J7) (pin 5)) + (node (ref D12) (pin 2)) (node (ref D13) (pin 2)) - (node (ref D12) (pin 2))) + (node (ref J7) (pin 5))) (net (code 60) (name SIG_OUTPUT1_1) (node (ref R46) (pin 2)) - (node (ref J7) (pin 6)) - (node (ref U7) (pin 8))) + (node (ref U7) (pin 8)) + (node (ref J7) (pin 6))) (net (code 61) (name SIG_OUTPUT1_2) (node (ref U7) (pin 10)) - (node (ref J7) (pin 7)) - (node (ref R47) (pin 2))) + (node (ref R47) (pin 2)) + (node (ref J7) (pin 7))) (net (code 62) (name "Net-(J7-Pad10)") (node (ref R22) (pin 2)) (node (ref J7) (pin 10))) - (net (code 63) (name "Net-(C7-Pad1)") - (node (ref C7) (pin 1)) - (node (ref R30) (pin 1)) - (node (ref U7) (pin 13))) - (net (code 64) (name "Net-(U5-Pad6)") - (node (ref U5) (pin 6)) - (node (ref U6) (pin 9))) - (net (code 65) (name "Net-(U5-Pad11)") - (node (ref U5) (pin 11)) - (node (ref U6) (pin 12))) - (net (code 66) (name "Net-(J7-Pad12)") + (net (code 63) (name "Net-(J7-Pad12)") (node (ref R25) (pin 2)) (node (ref J7) (pin 12))) - (net (code 67) (name TRIGGER1) - (node (ref R30) (pin 2)) + (net (code 64) (name SELECT1_DELAY) + (node (ref U2) (pin 27)) + (node (ref U5) (pin 12))) + (net (code 65) (name "Net-(C7-Pad1)") + (node (ref R30) (pin 1)) + (node (ref C7) (pin 1)) + (node (ref U7) (pin 13))) + (net (code 66) (name "Net-(U5-Pad6)") + (node (ref U6) (pin 9)) + (node (ref U5) (pin 6))) + (net (code 67) (name "Net-(U5-Pad11)") + (node (ref U6) (pin 12)) + (node (ref U5) (pin 11))) + (net (code 68) (name TXD) + (node (ref U2) (pin 35)) + (node (ref J1) (pin 5))) + (net (code 69) (name TRIGGER1) (node (ref R27) (pin 1)) + (node (ref R30) (pin 2)) (node (ref Q4) (pin 1)) (node (ref U6) (pin 11)) (node (ref R25) (pin 1))) - (net (code 68) (name "Net-(C8-Pad2)") + (net (code 70) (name "Net-(C8-Pad2)") + (node (ref U3) (pin 7)) (node (ref C8) (pin 2)) (node (ref R55) (pin 2)) - (node (ref U3) (pin 7)) - (node (ref TP7) (pin 1)) - (node (ref U3) (pin 6))) - (net (code 69) (name "Net-(U2-Pad4)") + (node (ref U3) (pin 6)) + (node (ref TP7) (pin 1))) + (net (code 71) (name "Net-(U2-Pad4)") (node (ref U2) (pin 4))) - (net (code 70) (name "Net-(U2-Pad5)") + (net (code 72) (name "Net-(U2-Pad5)") (node (ref U2) (pin 5))) - (net (code 71) (name "Net-(U2-Pad7)") + (net (code 73) (name "Net-(U2-Pad7)") (node (ref U2) (pin 7))) - (net (code 72) (name "Net-(U2-Pad6)") + (net (code 74) (name "Net-(U2-Pad6)") (node (ref U2) (pin 6))) - (net (code 73) (name "Net-(U2-Pad14)") + (net (code 75) (name "Net-(U2-Pad14)") (node (ref U2) (pin 14))) - (net (code 74) (name "Net-(J1-Pad2)") + (net (code 76) (name "Net-(J1-Pad2)") (node (ref J1) (pin 2))) - (net (code 75) (name "Net-(J1-Pad6)") + (net (code 77) (name "Net-(J1-Pad6)") (node (ref J1) (pin 6))) - (net (code 76) (name "Net-(U2-Pad22)") + (net (code 78) (name "Net-(U2-Pad22)") (node (ref U2) (pin 22))) - (net (code 77) (name "Net-(U2-Pad21)") + (net (code 79) (name "Net-(U2-Pad21)") (node (ref U2) (pin 21))) - (net (code 78) (name "Net-(U2-Pad20)") + (net (code 80) (name "Net-(U2-Pad20)") (node (ref U2) (pin 20))) - (net (code 79) (name "Net-(U2-Pad19)") + (net (code 81) (name "Net-(U2-Pad19)") (node (ref U2) (pin 19))) - (net (code 80) (name "Net-(U2-Pad18)") + (net (code 82) (name "Net-(U2-Pad18)") (node (ref U2) (pin 18))) - (net (code 81) (name "Net-(U2-Pad17)") + (net (code 83) (name "Net-(U2-Pad17)") (node (ref U2) (pin 17))) - (net (code 82) (name WHITE) + (net (code 84) (name WHITE) + (node (ref U5) (pin 1)) (node (ref U5) (pin 9)) + (node (ref R29) (pin 1)) (node (ref U2) (pin 31)) - (node (ref TP12) (pin 1)) - (node (ref U5) (pin 1)) - (node (ref R29) (pin 1))) - (net (code 83) (name SELECT1) + (node (ref TP12) (pin 1))) + (net (code 85) (name SELECT1) (node (ref U5) (pin 10)) (node (ref U2) (pin 28)) + (node (ref R45) (pin 1)) (node (ref TP10) (pin 1))) - (net (code 84) (name "Net-(C9-Pad2)") + (net (code 86) (name "Net-(C9-Pad2)") + (node (ref J4) (pin 1)) (node (ref R31) (pin 1)) - (node (ref C9) (pin 2)) - (node (ref J4) (pin 1))) - (net (code 85) (name "Net-(C12-Pad1)") - (node (ref R34) (pin 1)) + (node (ref C9) (pin 2))) + (net (code 87) (name "Net-(C12-Pad1)") + (node (ref U4) (pin 6)) (node (ref C12) (pin 1)) - (node (ref U4) (pin 6))) - (net (code 86) (name "Net-(U2-Pad32)") + (node (ref R34) (pin 1))) + (net (code 88) (name "Net-(U2-Pad32)") (node (ref U2) (pin 32))) - (net (code 87) (name "Net-(U2-Pad23)") + (net (code 89) (name "Net-(U2-Pad23)") (node (ref U2) (pin 23))) - (net (code 88) (name "Net-(R10-Pad2)") - (node (ref U2) (pin 24)) - (node (ref R10) (pin 2))) - (net (code 89) (name RXD) - (node (ref R1) (pin 1)) - (node (ref U2) (pin 34))) - (net (code 90) (name "Net-(R8-Pad1)") + (net (code 90) (name "Net-(R10-Pad2)") + (node (ref R10) (pin 2)) + (node (ref U2) (pin 24))) + (net (code 91) (name RXD) + (node (ref U2) (pin 34)) + (node (ref R1) (pin 1))) + (net (code 92) (name "Net-(R8-Pad1)") (node (ref U3) (pin 2)) - (node (ref R9) (pin 2)) - (node (ref R8) (pin 1))) - (net (code 91) (name "Net-(R15-Pad2)") - (node (ref R15) (pin 2)) + (node (ref R8) (pin 1)) + (node (ref R9) (pin 2))) + (net (code 93) (name "Net-(R15-Pad2)") (node (ref TP5) (pin 1)) + (node (ref R20) (pin 1)) (node (ref U3) (pin 5)) - (node (ref R20) (pin 1))) - (net (code 92) (name "Net-(J9-Pad1)") - (node (ref R11) (pin 1)) - (node (ref J9) (pin 1))) - (net (code 93) (name "Net-(C8-Pad1)") + (node (ref R15) (pin 2))) + (net (code 94) (name "Net-(J9-Pad1)") + (node (ref J9) (pin 1)) + (node (ref R11) (pin 1))) + (net (code 95) (name "Net-(C8-Pad1)") (node (ref C8) (pin 1)) (node (ref R11) (pin 2)) (node (ref R55) (pin 1))) - (net (code 94) (name CSYNC) + (net (code 96) (name CSYNC) (node (ref TP17) (pin 1)) (node (ref U2) (pin 33)) (node (ref U4) (pin 7))) - (net (code 95) (name "Net-(J2-Pad3)") - (node (ref J2) (pin 3))) - (net (code 96) (name "Net-(J2-Pad2)") + (net (code 97) (name "Net-(J2-Pad2)") (node (ref J2) (pin 2))) - (net (code 97) (name "Net-(D2-Pad1)") - (node (ref D2) (pin 1)) - (node (ref R2) (pin 1))) - (net (code 98) (name EN) - (node (ref SW1) (pin 1)) + (net (code 98) (name "Net-(D2-Pad1)") + (node (ref R2) (pin 1)) + (node (ref D2) (pin 1))) + (net (code 99) (name EN) + (node (ref R5) (pin 2)) (node (ref U2) (pin 3)) - (node (ref R5) (pin 2))) - (net (code 99) (name TXD) - (node (ref J1) (pin 5)) - (node (ref U2) (pin 35))) - (net (code 100) (name SELECT1_DELAY) - (node (ref U2) (pin 27)) - (node (ref U5) (pin 12))) + (node (ref SW1) (pin 1))) + (net (code 100) (name "Net-(J2-Pad3)") + (node (ref J2) (pin 3))) (net (code 101) (name DIM) - (node (ref U2) (pin 37)) (node (ref TP6) (pin 1)) - (node (ref D3) (pin 2))) + (node (ref D3) (pin 2)) + (node (ref U2) (pin 37))) (net (code 102) (name SIG2_2) (node (ref U2) (pin 11)) (node (ref U7) (pin 3))) (net (code 103) (name SIG1_1) - (node (ref U7) (pin 9)) - (node (ref U2) (pin 12))) + (node (ref U2) (pin 12)) + (node (ref U7) (pin 9))) (net (code 104) (name "Net-(C9-Pad1)") (node (ref R40) (pin 1)) + (node (ref R34) (pin 2)) (node (ref C9) (pin 1)) (node (ref D8) (pin 1)) - (node (ref R34) (pin 2)) (node (ref TP15) (pin 1))) (net (code 105) (name "Net-(C11-Pad2)") - (node (ref R32) (pin 1)) (node (ref C11) (pin 2)) (node (ref D8) (pin 2)) - (node (ref R33) (pin 2))) + (node (ref R33) (pin 2)) + (node (ref R32) (pin 1))) (net (code 106) (name "Net-(C5-Pad2)") (node (ref R6) (pin 1)) - (node (ref R12) (pin 2)) (node (ref D5) (pin 2)) - (node (ref C5) (pin 2))) + (node (ref C5) (pin 2)) + (node (ref R12) (pin 2))) (net (code 107) (name IO0) + (node (ref U2) (pin 25)) (node (ref R14) (pin 2)) - (node (ref SW2) (pin 1)) - (node (ref U2) (pin 25))) + (node (ref SW2) (pin 1))) (net (code 108) (name VIDEO_IN) (node (ref C4) (pin 2)) (node (ref R3) (pin 2)) diff --git a/KiCad/LCDZapperPro.sch b/KiCad/LCDZapperPro.sch index 9b657b3..aa88807 100644 --- a/KiCad/LCDZapperPro.sch +++ b/KiCad/LCDZapperPro.sch @@ -331,7 +331,7 @@ L CP C1 U 1 1 58E7CE75 P 1350 1150 F 0 "C1" H 1375 1250 50 0000 L CNN -F 1 "220uF" H 1375 1050 50 0000 L CNN +F 1 "220u" H 1375 1050 50 0000 L CNN F 2 "Capacitors_THT:CP_Radial_D7.5mm_P2.50mm" H 1388 1000 50 0001 C CNN F 3 "" H 1350 1150 50 0001 C CNN 1 1350 1150 @@ -342,7 +342,7 @@ L CP C2 U 1 1 58E7CF2D P 2400 1150 F 0 "C2" H 2425 1250 50 0000 L CNN -F 1 "220uF" H 2425 1050 50 0000 L CNN +F 1 "220u" H 2425 1050 50 0000 L CNN F 2 "Capacitors_THT:CP_Radial_D7.5mm_P2.50mm" H 2438 1000 50 0001 C CNN F 3 "" H 2400 1150 50 0001 C CNN 1 2400 1150 @@ -353,7 +353,7 @@ L C C3 U 1 1 58E7DC41 P 2700 1150 F 0 "C3" H 2725 1250 50 0000 L CNN -F 1 "1uF" H 2725 1050 50 0000 L CNN +F 1 "1u" H 2725 1050 50 0000 L CNN F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2738 1000 50 0001 C CNN F 3 "" H 2700 1150 50 0001 C CNN 1 2700 1150 @@ -1377,24 +1377,24 @@ $EndComp $Comp L TEST TP9 U 1 1 5993946D -P 12250 3100 -F 0 "TP9" H 12250 3400 50 0000 C BNN -F 1 "TEST_SEL1" H 12250 3350 50 0000 C CNN -F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 12250 3100 50 0001 C CNN -F 3 "" H 12250 3100 50 0001 C CNN - 1 12250 3100 - -1 0 0 1 +P 12250 3350 +F 0 "TP9" H 12250 3650 50 0000 C BNN +F 1 "TEST_SEL1" H 12250 3600 50 0000 C CNN +F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 12250 3350 50 0001 C CNN +F 3 "" H 12250 3350 50 0001 C CNN + 1 12250 3350 + 0 -1 -1 0 $EndComp $Comp L TEST TP10 U 1 1 59939A2E -P 12250 6550 -F 0 "TP10" H 12250 6850 50 0000 C BNN -F 1 "TEST_SEL2" H 12250 6800 50 0000 C CNN -F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 12250 6550 50 0001 C CNN -F 3 "" H 12250 6550 50 0001 C CNN - 1 12250 6550 - -1 0 0 1 +P 12250 6750 +F 0 "TP10" H 12250 7050 50 0000 C BNN +F 1 "TEST_SEL2" H 12250 7000 50 0000 C CNN +F 2 "Measurement_Points:Measurement_Point_Round-SMD-Pad_Small" H 12250 6750 50 0001 C CNN +F 3 "" H 12250 6750 50 0001 C CNN + 1 12250 6750 + 0 -1 -1 0 $EndComp $Comp L TEST TP13 @@ -1720,10 +1720,10 @@ Wire Wire Line 10450 3900 10450 4000 Connection ~ 10450 4000 Wire Wire Line - 12250 3100 12250 3050 + 12250 3050 12250 3350 Connection ~ 12250 3050 Wire Wire Line - 12250 6550 12250 6500 + 12250 6500 12250 6750 Connection ~ 12250 6500 Wire Wire Line 13650 2850 13650 2950 @@ -1768,7 +1768,7 @@ L C C18 U 1 1 5999ED9B P 2550 6000 F 0 "C18" H 2575 6100 50 0000 L CNN -F 1 "1uF" H 2575 5900 50 0000 L CNN +F 1 "1u" H 2575 5900 50 0000 L CNN F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2588 5850 50 0001 C CNN F 3 "" H 2550 6000 50 0001 C CNN 1 2550 6000 @@ -3059,4 +3059,48 @@ F 3 "" H 1800 4350 50 0001 C CNN 1 1800 4350 1 0 0 -1 $EndComp +$Comp +L R R42 +U 1 1 5B547A74 +P 12400 3350 +F 0 "R42" V 12480 3350 50 0000 C CNN +F 1 "10K" V 12400 3350 50 0000 C CNN +F 2 "Resistors_SMD:R_1206_HandSoldering" V 12330 3350 50 0001 C CNN +F 3 "" H 12400 3350 50 0001 C CNN + 1 12400 3350 + 0 -1 -1 0 +$EndComp +$Comp +L GND #PWR064 +U 1 1 5B5488A1 +P 12550 3350 +F 0 "#PWR064" H 12550 3100 50 0001 C CNN +F 1 "GND" H 12550 3200 50 0000 C CNN +F 2 "" H 12550 3350 50 0001 C CNN +F 3 "" H 12550 3350 50 0001 C CNN + 1 12550 3350 + 0 -1 -1 0 +$EndComp +$Comp +L R R45 +U 1 1 5B5498CC +P 12400 6750 +F 0 "R45" V 12480 6750 50 0000 C CNN +F 1 "10K" V 12400 6750 50 0000 C CNN +F 2 "Resistors_SMD:R_1206_HandSoldering" V 12330 6750 50 0001 C CNN +F 3 "" H 12400 6750 50 0001 C CNN + 1 12400 6750 + 0 -1 -1 0 +$EndComp +$Comp +L GND #PWR065 +U 1 1 5B5498D2 +P 12550 6750 +F 0 "#PWR065" H 12550 6500 50 0001 C CNN +F 1 "GND" H 12550 6600 50 0000 C CNN +F 2 "" H 12550 6750 50 0001 C CNN +F 3 "" H 12550 6750 50 0001 C CNN + 1 12550 6750 + 0 -1 -1 0 +$EndComp $EndSCHEMATC