wifi settings prep

updated schematic & PCB for i2c uart
added production files
2021-08-25 12:35:09 +02:00 · 2021-08-23 17:13:23 +02:00 · 2021-08-23 17:12:30 +02:00
25 changed files with 810 additions and 879 deletions
--- a/P1_gateway_FW/.vscode/settings.json
+++ b/P1_gateway_FW/.vscode/settings.json
@@ -9,6 +9,8 @@
    "string": "cpp",
    "unordered_map": "cpp",
    "vector": "cpp",
-    "initializer_list": "cpp"
+    "initializer_list": "cpp",
+    "string_view": "cpp",
+    "ranges": "cpp"
  }
 }
--- a/P1_gateway_FW/platformio.ini
+++ b/P1_gateway_FW/platformio.ini
@@ -15,6 +15,8 @@ framework = arduino
 monitor_speed = 115200
 lib_deps = 
  glmnet/Dsmr@^0.3
+  juerd/ESP-WiFiSettings @ ^3.8.0
 lib_ldf_mode = deep+
-compile_flags = 
-	-std=c++11
+;compile_flags = 
+;	-std=c++11
+board_build.filesystem = littlefs
--- a/P1_gateway_FW/src/connection.cpp
+++ b/P1_gateway_FW/src/connection.cpp
@@ -1,13 +1,44 @@
 #include "connection.h"

+String wifiState;
+FS *filesystem = &SPIFFS;
+
+void initWifiConnection(void)
+{
+  // Set custom callback functions
+  WiFiSettings.onSuccess = []()
+  {
+    wifiState = "Success";
+  };
+  WiFiSettings.onFailure = []()
+  {
+    wifiState = "Failed";
+  };
+  WiFiSettings.onWaitLoop = []()
+  {
+    wifiState = "Waiting";
+    return 500; // Delay next function call by 500ms
+  };
+
+  // Callback functions do not have to be lambda's, e.g.
+  // WiFiSettings.onPortalWaitLoop = blink;
+
+  // Define custom settings saved by WifiSettings
+  // These will return the default if nothing was set before
+  String host = WiFiSettings.string("server_host", "default.example.org");
+  int port = WiFiSettings.integer("server_port", 443);
+
+  // Connect to WiFi with a timeout of 30 seconds
+  // Launches the portal if the connection failed
+  WiFiSettings.connect(true, 30);
+}
+
 void initConnection(void)
 {
+  filesystem->begin();
+  initWifiConnection();
 }
+
 void handleConnection(void)
 {
 }
-
-wifiStrength getWifiStrength(void)
-{
-  return signal_3;
-}
--- a/P1_gateway_FW/src/connection.h
+++ b/P1_gateway_FW/src/connection.h
@@ -1,5 +1,9 @@
 #pragma once

+#include <littleFS.h>
+#include <WiFiSettings.h>
+
+
 void initConnection( void );
 void handleConnection(void);

--- a/P1_gateway_FW/src/data/test.txt
+++ b/P1_gateway_FW/src/data/test.txt
@@ -0,0 +1 @@
+hello world!
--- a/P1_gateway_FW/src/display.cpp
+++ b/P1_gateway_FW/src/display.cpp
@@ -1,142 +1,108 @@
 #include "display.h"

 SSD1306Wire display(0x3c, SDA, SCL);
-bool initOK = false;

-OLEDDisplayUi ui(&display);
+e_displayStates displayState = DISPLAY_INIT;
+uint32_t lastDisplayCycle = 0;
+uint32_t lastDisplayUpdate = 0;

-
-
-int screenW = 128;
-int screenH = 64;
-int clockCenterX = screenW / 2;
-int clockCenterY = ((screenH - 16) / 2) + 16; // top yellow part is 16 px height
-int clockRadius = 23;
-
-// utility function for digital clock display: prints leading 0
-String twoDigits(int digits)
+void drawDSMRstats(void)
 {
-  if (digits < 10)
-  {
-    String i = '0' + String(digits);
-    return i;
-  }
-  else
-  {
-    return String(digits);
-  }
+  display.setTextAlignment(TEXT_ALIGN_LEFT);
+  display.setFont(ArialMT_Plain_10);
+  display.drawString(0, 0, "DSMR stats:");
+  display.drawString(0, 11, getMsgCount());
 }

-void msOverlay(OLEDDisplay *display, OLEDDisplayUiState *state)
+void drawElecFrame(void)
 {
+  display.setTextAlignment(TEXT_ALIGN_LEFT);
+  display.setFont(ArialMT_Plain_10);
+  display.drawString(0, 0, "Electricity:");

-  
+  display.drawString(0, 11, getElecDelivered());
+  display.drawString(0, 22, getElecReturned());
 }

-void initFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+void drawGasFrame(void)
 {
-  // draw an xbm image.
-  // Please note that everything that should be transitioned
-  // needs to be drawn relative to x and y
-
-  //display->drawXbm(x + 34, y + 14, WiFi_Logo_width, WiFi_Logo_height, WiFi_Logo_bits);
-  display->setTextAlignment(TEXT_ALIGN_CENTER);
-  display->setFont(ArialMT_Plain_16);
-  display->drawString(64 + x, 8 + y, "DU-DSMR-W");
-  //display->
+  display.setTextAlignment(TEXT_ALIGN_LEFT);
+  display.setFont(ArialMT_Plain_10);
+  display.drawString(0, 0, getGasDelivered());
 }

-void DSMRStatsFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+void drawInitFrame(void)
 {
-  // Demonstrates the 3 included default sizes. The fonts come from SSD1306Fonts.h file
-  // Besides the default fonts there will be a program to convert TrueType fonts into this format
-  
-  display->setTextAlignment(TEXT_ALIGN_LEFT);
-  display->setFont(ArialMT_Plain_10);
-  display->drawString(0 + x, 0 + y, "DSMR stats:");
-  display->drawString(0 + x, 11 + y, getMsgCount());
+  display.setTextAlignment(TEXT_ALIGN_CENTER);
+  display.setFont(ArialMT_Plain_16);
+  display.drawString(64, 12, "DU-DSMR-W");
+  display.drawXbm(0, 0, wifiicon10x10_width, wifiicon10x10_height, wifi10x10_png_bits);
+  display.drawXbm(16,0, download_cloud_solid_png_width, download_cloud_solid_png_height, download_cloud_solid_png_bits);
 }

-void ElecFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-  display->setTextAlignment(TEXT_ALIGN_LEFT);
-  display->setFont(ArialMT_Plain_10);
-  display->drawString(0 + x, 0 + y, "Electricity:");
-
-  display->drawString(0 + x, 11 + y, getElecDelivered());
-  display->drawString(0 + x, 22 + y, getElecReturned());
-}
-
-void GasFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-  display->setTextAlignment(TEXT_ALIGN_LEFT);
-  display->setFont(ArialMT_Plain_10);
-  display->drawString(0 + x, 0 + y, getGasDelivered());
-}
-
-void drawFrame5(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-
-}
-
-// This array keeps function pointers to all frames
-// frames are the single views that slide in
-FrameCallback frames[] = {initFrame, DSMRStatsFrame, ElecFrame, GasFrame};//, drawFrame5};
-
-// how many frames are there?
-int frameCount = 4;
-
-// Overlays are statically drawn on top of a frame eg. a clock
-//OverlayCallback overlays[] = {msOverlay};
-//int overlaysCount = 1;
-
 void initDisplay(void)
 {
-  // The ESP is capable of rendering 60fps in 80Mhz mode
-  // but that won't give you much time for anything else
-  // run it in 160Mhz mode or just set it to 30 fps
-  ui.setTargetFPS(30);
  display.init();
-  // Customize the active and inactive symbol
-  //ui.setActiveSymbol(activeSymbol);
-  //ui.setInactiveSymbol(inactiveSymbol);
+  drawInitFrame();
+  display.display();

-  // You can change this to
-  // TOP, LEFT, BOTTOM, RIGHT
-  ui.setIndicatorPosition(RIGHT);
+  Serial.printf("initdisplay: h=%u, w=%u\n", display.height(), display.width());
+}

-  // Defines where the first frame is located in the bar.
-  ui.setIndicatorDirection(LEFT_RIGHT);
-
-  // You can change the transition that is used
-  // SLIDE_LEFT, SLIDE_RIGHT, SLIDE_UP, SLIDE_DOWN
-  ui.setFrameAnimation(SLIDE_UP);
-
-  // Add frames
-  ui.setFrames(frames, frameCount);
-
-  // Add overlays
-  //ui.setOverlays(overlays, overlaysCount);
-  //ui.disableAllIndicators();
-
-  // Initialising the UI will init the display too.
-  ui.init();
-
-  Serial.printf("initdisplay: h=%u, w=%u", display.height(), display.width());
-
-  //display.flipScreenVertically();
+e_displayStates nextFrame(void)
+{
+  displayState = static_cast<e_displayStates>(static_cast<int>(displayState) + 1);
+  if (displayState == DISPLAU_LAST)
+  {
+    displayState = DISPLAY_DSMR1;
+  }
+  return displayState;
 }

 void handleDisplay(void)
 {
-  int remainingTimeBudget = ui.update();
+  uint32_t timeNow = millis();

-  if (remainingTimeBudget > 0)
+  if (timeNow - lastDisplayUpdate > DISPLAY_CYCLE_TIME)
  {
-    // You can do some work here
-    // Don't do stuff if you are below your
-    // time budget.
-    Serial.println(remainingTimeBudget);
-    //delay(remainingTimeBudget);
+    //lastDisplayUpdate
+    display.clear();
+
+    switch (displayState)
+    {
+    case DISPLAY_INIT:
+    {
+      drawInitFrame();
+    }
+    break;
+    case DISPLAY_DSMR1:
+    {
+      drawElecFrame();
+    }
+    break;
+    case DISPLAY_DSMR2:
+    {
+      drawGasFrame();
+    }
+    break;
+    case DISPLAY_DSMR3:
+    {
+      drawDSMRstats();
+    }
+    break;
+    default:
+    {
+      displayState = nextFrame();
+    }
+    break;
+    }
+    display.display();
+    lastDisplayUpdate = timeNow;
+  }
+
+  if (timeNow - lastDisplayCycle > DISPLAY_CYCLE_TIME)
+  {
+    displayState = nextFrame();
+    lastDisplayCycle = timeNow;
  }
 }
--- a/P1_gateway_FW/src/display.h
+++ b/P1_gateway_FW/src/display.h
@@ -1,12 +1,23 @@
 #pragma once

 #include "Arduino.h"
-#include "OLEDDisplayUi.h"
-#include "SSD1306Wire.h" // legacy include: `#include "SSD1306.h"`
+#include "SSD1306Wire.h"
 #include "board.h"
 #include "images.h"
 #include "dsmrhandler.h"
 #include "connection.h"

+#define DISPLAY_UPDATE_TIME 200
+#define DISPLAY_CYCLE_TIME 3000
+
+typedef enum{
+  DISPLAY_INIT,
+  DISPLAY_DSMR1,
+  DISPLAY_DSMR2,
+  DISPLAY_DSMR3,
+  DISPLAU_LAST
+}e_displayStates;
+
+
 void initDisplay(void);
 void handleDisplay(void);
--- a/P1_gateway_FW/src/images.h
+++ b/P1_gateway_FW/src/images.h
@@ -1,34 +1,21 @@
 #pragma once

 #include "Arduino.h"
-#define WiFi_Logo_width 60
-#define WiFi_Logo_height 36
-const uint8_t WiFi_Logo_bits[] {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
-  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF,
-  0xFF, 0x03, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
-  0x00, 0xFF, 0xFF, 0xFF, 0x07, 0xC0, 0x83, 0x01, 0x80, 0xFF, 0xFF, 0xFF,
-  0x01, 0x00, 0x07, 0x00, 0xC0, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x0C, 0x00,
-  0xC0, 0xFF, 0xFF, 0x7C, 0x00, 0x60, 0x0C, 0x00, 0xC0, 0x31, 0x46, 0x7C,
-  0xFC, 0x77, 0x08, 0x00, 0xE0, 0x23, 0xC6, 0x3C, 0xFC, 0x67, 0x18, 0x00,
-  0xE0, 0x23, 0xE4, 0x3F, 0x1C, 0x00, 0x18, 0x00, 0xE0, 0x23, 0x60, 0x3C,
-  0x1C, 0x70, 0x18, 0x00, 0xE0, 0x03, 0x60, 0x3C, 0x1C, 0x70, 0x18, 0x00,
-  0xE0, 0x07, 0x60, 0x3C, 0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C,
-  0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00,
-  0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00, 0xE0, 0x8F, 0x71, 0x3C,
-  0x1C, 0x70, 0x18, 0x00, 0xC0, 0xFF, 0xFF, 0x3F, 0x00, 0x00, 0x08, 0x00,
-  0xC0, 0xFF, 0xFF, 0x1F, 0x00, 0x00, 0x0C, 0x00, 0x80, 0xFF, 0xFF, 0x1F,
-  0x00, 0x00, 0x06, 0x00, 0x80, 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0x07, 0x00,
-  0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0xF8, 0xFF, 0xFF,
-  0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00,
-  0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
-  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  };
+
+
+#define wifiicon10x10_width 13
+#define wifiicon10x10_height 10
+const PROGMEM uint8_t wifi10x10_png_bits[] = {
+    0xf0, 0x01, 0x0c, 0x06, 0x02, 0x08, 0xf0, 0x01, 0x08, 0x02, 0x00, 0x00,
+    0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+#define download_cloud_solid_png_width 18
+#define download_cloud_solid_png_height 9
+const PROGMEM uint8_t download_cloud_solid_png_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0xb9, 0x03, 0x5b, 0x12, 0x01,
+   0x55, 0x12, 0x01, 0x51, 0x13, 0x01, 0x91, 0x13, 0x01, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00 };

 const uint8_t activeSymbol[] = {
    B00000000,
--- a/P1_gateway_FW/src/main.cpp
+++ b/P1_gateway_FW/src/main.cpp
@@ -4,7 +4,6 @@
 #include "connection.h"


-
 void setup() {
  // put your setup code here, to run once:
  Serial.begin(115200);
@@ -18,7 +17,6 @@ void setup() {

 void loop() {
  // put your main code here, to run repeatedly:
-  Serial.print(".|.ß");
  handleDisplay();
  handleConnection();
 }
--- a/P1_wifi/OUTPUTS/P1-wifi-v13.zip
+++ b/P1_wifi/OUTPUTS/P1-wifi-v13.zip
--- a/P1_wifi/OUTPUTS/P1_wifi-B_Cu.gbl
+++ b/P1_wifi/OUTPUTS/P1_wifi-B_Cu.gbl
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.1.9-0-10_14)*
-G04 #@! TF.CreationDate,2021-05-18T17:10:00+02:00*
+G04 #@! TF.CreationDate,2021-06-30T17:32:41+02:00*
 G04 #@! TF.ProjectId,P1_wifi,50315f77-6966-4692-9e6b-696361645f70,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Copper,L2,Bot*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-05-18 17:10:00*
+G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-06-30 17:32:41*
 %MOMM*%
 %LPD*%
 G01*
--- a/P1_wifi/OUTPUTS/P1_wifi-B_Mask.gbs
+++ b/P1_wifi/OUTPUTS/P1_wifi-B_Mask.gbs
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.1.9-0-10_14)*
-G04 #@! TF.CreationDate,2021-05-18T17:10:00+02:00*
+G04 #@! TF.CreationDate,2021-06-30T17:32:41+02:00*
 G04 #@! TF.ProjectId,P1_wifi,50315f77-6966-4692-9e6b-696361645f70,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Soldermask,Bot*
 G04 #@! TF.FilePolarity,Negative*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-05-18 17:10:00*
+G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-06-30 17:32:41*
 %MOMM*%
 %LPD*%
 G01*
--- a/P1_wifi/OUTPUTS/P1_wifi-B_SilkS.gbo
+++ b/P1_wifi/OUTPUTS/P1_wifi-B_SilkS.gbo
@@ -1,19 +1,19 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.1.9-0-10_14)*
-G04 #@! TF.CreationDate,2021-05-18T17:10:00+02:00*
+G04 #@! TF.CreationDate,2021-06-30T17:32:41+02:00*
 G04 #@! TF.ProjectId,P1_wifi,50315f77-6966-4692-9e6b-696361645f70,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Legend,Bot*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-05-18 17:10:00*
+G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-06-30 17:32:41*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
 %ADD10C,0.150000*%
-%ADD11C,0.120000*%
-%ADD12C,0.100000*%
+%ADD11C,0.100000*%
+%ADD12C,0.120000*%
 %ADD13C,1.700000*%
 %ADD14R,1.700000X1.700000*%
 %ADD15R,1.000000X1.000000*%
@@ -285,31 +285,31 @@ X4436095Y6764261D01*
 X5150380Y6954738D01*
 X4150380Y7192833D01*
 D11*
-X60379500Y6250000D02*
-X60379500Y13750000D01*
-D12*
-X54129500Y6100000D02*
-X54429500Y6100000D01*
-X54129500Y6100000D02*
-X54129500Y6400000D01*
-X54129500Y13900000D02*
-X54429500Y13900000D01*
-X54129500Y13900000D02*
-X54129500Y13600000D01*
-X59629500Y13900000D02*
-X59629500Y13600000D01*
-X59629500Y13900000D02*
-X59329500Y13900000D01*
-X59629500Y6100000D02*
-X59629500Y6400000D01*
-X59629500Y6100000D02*
-X59329500Y6100000D01*
-X54129500Y10000000D02*
-X54129500Y10300000D01*
-X54129500Y10000000D02*
-X54129500Y9700000D01*
 X54629500Y11600000D02*
 X56229500Y11600000D01*
+X54129500Y10000000D02*
+X54129500Y9700000D01*
+X54129500Y10000000D02*
+X54129500Y10300000D01*
+X59629500Y6100000D02*
+X59329500Y6100000D01*
+X59629500Y6100000D02*
+X59629500Y6400000D01*
+X59629500Y13900000D02*
+X59329500Y13900000D01*
+X59629500Y13900000D02*
+X59629500Y13600000D01*
+X54129500Y13900000D02*
+X54129500Y13600000D01*
+X54129500Y13900000D02*
+X54429500Y13900000D01*
+X54129500Y6100000D02*
+X54129500Y6400000D01*
+X54129500Y6100000D02*
+X54429500Y6100000D01*
+D12*
+X60379500Y6250000D02*
+X60379500Y13750000D01*
 D10*
 X52972293Y10395219D02*
 X52972293Y9680933D01*
--- a/P1_wifi/OUTPUTS/P1_wifi-Edge_Cuts.gm1
+++ b/P1_wifi/OUTPUTS/P1_wifi-Edge_Cuts.gm1
@@ -1,11 +1,11 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.1.9-0-10_14)*
-G04 #@! TF.CreationDate,2021-05-18T17:10:00+02:00*
+G04 #@! TF.CreationDate,2021-06-30T17:32:41+02:00*
 G04 #@! TF.ProjectId,P1_wifi,50315f77-6966-4692-9e6b-696361645f70,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Profile,NP*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-05-18 17:10:00*
+G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-06-30 17:32:41*
 %MOMM*%
 %LPD*%
 G01*
--- a/P1_wifi/OUTPUTS/P1_wifi-F_Cu.gtl
+++ b/P1_wifi/OUTPUTS/P1_wifi-F_Cu.gtl
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.1.9-0-10_14)*
-G04 #@! TF.CreationDate,2021-05-18T17:10:00+02:00*
+G04 #@! TF.CreationDate,2021-06-30T17:32:41+02:00*
 G04 #@! TF.ProjectId,P1_wifi,50315f77-6966-4692-9e6b-696361645f70,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Copper,L1,Top*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-05-18 17:10:00*
+G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-06-30 17:32:41*
 %MOMM*%
 %LPD*%
 G01*
--- a/P1_wifi/OUTPUTS/P1_wifi-F_Mask.gts
+++ b/P1_wifi/OUTPUTS/P1_wifi-F_Mask.gts
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.1.9-0-10_14)*
-G04 #@! TF.CreationDate,2021-05-18T17:10:00+02:00*
+G04 #@! TF.CreationDate,2021-06-30T17:32:41+02:00*
 G04 #@! TF.ProjectId,P1_wifi,50315f77-6966-4692-9e6b-696361645f70,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Soldermask,Top*
 G04 #@! TF.FilePolarity,Negative*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-05-18 17:10:00*
+G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-06-30 17:32:41*
 %MOMM*%
 %LPD*%
 G01*
--- a/P1_wifi/OUTPUTS/P1_wifi-F_SilkS.gto
+++ b/P1_wifi/OUTPUTS/P1_wifi-F_SilkS.gto
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.1.9-0-10_14)*
-G04 #@! TF.CreationDate,2021-05-18T17:10:00+02:00*
+G04 #@! TF.CreationDate,2021-06-30T17:32:41+02:00*
 G04 #@! TF.ProjectId,P1_wifi,50315f77-6966-4692-9e6b-696361645f70,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Legend,Top*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-05-18 17:10:00*
+G04 Created by KiCad (PCBNEW (5.1.9-0-10_14)) date 2021-06-30 17:32:41*
 %MOMM*%
 %LPD*%
 G01*
@@ -30,124 +30,124 @@ G04 APERTURE LIST*
 %ADD26C,1.520000*%
 G04 APERTURE END LIST*
 D10*
-X34397000Y2724000D02*
-X35122000Y2724000D01*
-X29902000Y7944000D02*
-X29902000Y7219000D01*
-X30627000Y7944000D02*
-X29902000Y7944000D01*
-X35122000Y7944000D02*
-X35122000Y7219000D01*
-X34397000Y7944000D02*
-X35122000Y7944000D01*
-X29902000Y2724000D02*
-X29902000Y3449000D01*
 X30627000Y2724000D02*
 X29902000Y2724000D01*
+X29902000Y2724000D02*
+X29902000Y3449000D01*
+X34397000Y7944000D02*
+X35122000Y7944000D01*
+X35122000Y7944000D02*
+X35122000Y7219000D01*
+X30627000Y7944000D02*
+X29902000Y7944000D01*
+X29902000Y7944000D02*
+X29902000Y7219000D01*
+X34397000Y2724000D02*
+X35122000Y2724000D01*
 D11*
-X23622000Y1778000D02*
-X24384000Y1778000D01*
-X24384000Y1778000D02*
-X24383000Y2524000D01*
-X24384000Y17780000D02*
-X23622000Y17780000D01*
 X24385000Y17034000D02*
 X24384000Y17780000D01*
+X24384000Y17780000D02*
+X23622000Y17780000D01*
+X24384000Y1778000D02*
+X24383000Y2524000D01*
+X23622000Y1778000D02*
+X24384000Y1778000D01*
 D10*
-X33442000Y15124000D02*
-X33442000Y13324000D01*
 X36662000Y13324000D02*
 X36662000Y15774000D01*
-X35313252Y10441000D02*
-X34790748Y10441000D01*
+X33442000Y15124000D02*
+X33442000Y13324000D01*
 X35313252Y11911000D02*
 X34790748Y11911000D01*
-X35313252Y16537000D02*
-X34790748Y16537000D01*
+X35313252Y10441000D02*
+X34790748Y10441000D01*
 X35313252Y18007000D02*
 X34790748Y18007000D01*
-X30522142Y9945900D02*
-X30996658Y9945900D01*
+X35313252Y16537000D02*
+X34790748Y16537000D01*
 X30522142Y8900900D02*
 X30996658Y8900900D01*
-X26432742Y16016500D02*
-X26907258Y16016500D01*
+X30522142Y9945900D02*
+X30996658Y9945900D01*
 X26432742Y14971500D02*
 X26907258Y14971500D01*
-X26432742Y9920500D02*
-X26907258Y9920500D01*
+X26432742Y16016500D02*
+X26907258Y16016500D01*
 X26432742Y8875500D02*
 X26907258Y8875500D01*
-X35035258Y8748500D02*
-X34560742Y8748500D01*
+X26432742Y9920500D02*
+X26907258Y9920500D01*
 X35035258Y9793500D02*
 X34560742Y9793500D01*
-X26432742Y14492500D02*
-X26907258Y14492500D01*
+X35035258Y8748500D02*
+X34560742Y8748500D01*
 X26432742Y13447500D02*
 X26907258Y13447500D01*
-X30996658Y10424900D02*
-X30522142Y10424900D01*
+X26432742Y14492500D02*
+X26907258Y14492500D01*
 X30996658Y11469900D02*
 X30522142Y11469900D01*
-X26432242Y2554500D02*
-X26906758Y2554500D01*
+X30996658Y10424900D02*
+X30522142Y10424900D01*
 X26432242Y1509500D02*
 X26906758Y1509500D01*
-X26432742Y11444500D02*
-X26907258Y11444500D01*
+X26432242Y2554500D02*
+X26906758Y2554500D01*
 X26432742Y10399500D02*
 X26907258Y10399500D01*
-X30717258Y16749500D02*
-X30242742Y16749500D01*
+X26432742Y11444500D02*
+X26907258Y11444500D01*
 X30717258Y17794500D02*
 X30242742Y17794500D01*
-X26097000Y4682000D02*
-X27997000Y4682000D01*
+X30717258Y16749500D02*
+X30242742Y16749500D01*
 X27497000Y7002000D02*
 X26097000Y7002000D01*
-X29204800Y13438600D02*
-X30134800Y13438600D01*
-X32364800Y13438600D02*
-X31434800Y13438600D01*
-X32364800Y13438600D02*
-X32364800Y15598600D01*
+X26097000Y4682000D02*
+X27997000Y4682000D01*
 X29204800Y13438600D02*
 X29204800Y14898600D01*
-X26529420Y12956000D02*
-X26810580Y12956000D01*
+X32364800Y13438600D02*
+X32364800Y15598600D01*
+X32364800Y13438600D02*
+X31434800Y13438600D01*
+X29204800Y13438600D02*
+X30134800Y13438600D01*
 X26529420Y11936000D02*
 X26810580Y11936000D01*
-X26529420Y4066000D02*
-X26810580Y4066000D01*
+X26529420Y12956000D02*
+X26810580Y12956000D01*
 X26529420Y3046000D02*
 X26810580Y3046000D01*
-X44013500Y2767500D02*
-X42483500Y2767500D01*
-X51033500Y3237500D02*
-X42013500Y3237500D01*
+X26529420Y4066000D02*
+X26810580Y4066000D01*
+X42013500Y3237500D02*
+X42013500Y16437500D01*
+X42013500Y16437500D02*
+X51033500Y16437500D01*
 D12*
-X50963500Y3237500D02*
-X51033500Y3237500D01*
-D10*
-X60013500Y3237500D02*
-X53233500Y3237500D01*
-X60013500Y16437500D02*
-X60013500Y3237500D01*
-D12*
-X60003500Y16437500D02*
+X59893500Y16437500D02*
 X60013500Y16437500D01*
 D10*
 X60013500Y16437500D02*
 X53233500Y16437500D01*
 D12*
-X59893500Y16437500D02*
+X60003500Y16437500D02*
 X60013500Y16437500D01*
 D10*
-X42013500Y16437500D02*
-X51033500Y16437500D01*
-X42013500Y3237500D02*
-X42013500Y16437500D01*
+X60013500Y16437500D02*
+X60013500Y3237500D01*
+X60013500Y3237500D02*
+X53233500Y3237500D01*
+D12*
+X50963500Y3237500D02*
+X51033500Y3237500D01*
+D10*
+X51033500Y3237500D02*
+X42013500Y3237500D01*
+X44013500Y2767500D02*
+X42483500Y2767500D01*
 D12*
 X34671057Y2081171D02*
 X34671057Y1595457D01*
--- a/P1_wifi/OUTPUTS/P1_wifi-NPTH-drl_map.ps
+++ b/P1_wifi/OUTPUTS/P1_wifi-NPTH-drl_map.ps
@@ -1,6 +1,6 @@
 %!PS-Adobe-3.0
 %%Creator: PCBNEW
-%%CreationDate: Tue May 18 17:10:06 2021
+%%CreationDate: Wed Jun 30 17:32:47 2021
 %%Title: /Users/willem/Documents/PROJECTS/P1-wifi-esp12e/P1_wifi/OUTPUTS/P1_wifi-NPTH-drl_map.ps
 %%Pages: 1
 %%PageOrder: Ascend
--- a/P1_wifi/OUTPUTS/P1_wifi-NPTH.drl
+++ b/P1_wifi/OUTPUTS/P1_wifi-NPTH.drl
@@ -1,7 +1,7 @@
 M48
-; DRILL file {KiCad (5.1.9-0-10_14)} date Tuesday, May 18, 2021 at 05:10:05 PM
+; DRILL file {KiCad (5.1.9-0-10_14)} date Wednesday, June 30, 2021 at 05:32:46 PM
 ; FORMAT={-:-/ absolute / inch / decimal}
-; #@! TF.CreationDate,2021-05-18T17:10:05+02:00
+; #@! TF.CreationDate,2021-06-30T17:32:46+02:00
 ; #@! TF.GenerationSoftware,Kicad,Pcbnew,(5.1.9-0-10_14)
 ; #@! TF.FileFunction,NonPlated,1,2,NPTH
 FMAT,2
--- a/P1_wifi/OUTPUTS/P1_wifi-PTH-drl_map.ps
+++ b/P1_wifi/OUTPUTS/P1_wifi-PTH-drl_map.ps
@@ -1,6 +1,6 @@
 %!PS-Adobe-3.0
 %%Creator: PCBNEW
-%%CreationDate: Tue May 18 17:10:06 2021
+%%CreationDate: Wed Jun 30 17:32:47 2021
 %%Title: /Users/willem/Documents/PROJECTS/P1-wifi-esp12e/P1_wifi/OUTPUTS/P1_wifi-PTH-drl_map.ps
 %%Pages: 1
 %%PageOrder: Ascend
--- a/P1_wifi/OUTPUTS/P1_wifi-PTH.drl
+++ b/P1_wifi/OUTPUTS/P1_wifi-PTH.drl
@@ -1,7 +1,7 @@
 M48
-; DRILL file {KiCad (5.1.9-0-10_14)} date Tuesday, May 18, 2021 at 05:10:05 PM
+; DRILL file {KiCad (5.1.9-0-10_14)} date Wednesday, June 30, 2021 at 05:32:46 PM
 ; FORMAT={-:-/ absolute / inch / decimal}
-; #@! TF.CreationDate,2021-05-18T17:10:05+02:00
+; #@! TF.CreationDate,2021-06-30T17:32:46+02:00
 ; #@! TF.GenerationSoftware,Kicad,Pcbnew,(5.1.9-0-10_14)
 ; #@! TF.FileFunction,Plated,1,2,PTH
 FMAT,2
--- a/P1_wifi/P1_wifi.kicad_pcb
+++ b/P1_wifi/P1_wifi.kicad_pcb
@@ -17,7 +17,7 @@
    (33 F.Adhes user hide)
    (34 B.Paste user hide)
    (35 F.Paste user hide)
-    (36 B.SilkS user hide)
+    (36 B.SilkS user)
    (37 F.SilkS user)
    (38 B.Mask user hide)
    (39 F.Mask user hide)
@@ -63,7 +63,7 @@
    (pad_drill 0.762)
    (pad_to_mask_clearance 0)
    (aux_axis_origin 0 0)
-    (visible_elements FFFFFF7F)
+    (visible_elements FFFFF77F)
    (pcbplotparams
      (layerselection 0x010f0_ffffffff)
      (usegerberextensions true)
@@ -213,22 +213,22 @@
    (fp_text value CP2102-Axx-xQFN28 (at 0 3.8) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start 3.1 -3.1) (end -3.1 -3.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.1 3.1) (end 3.1 -3.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.1 3.1) (end 3.1 3.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.1 -3.1) (end -3.1 3.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.5 -1.5) (end -1.5 -2.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 2.5) (end -2.5 -1.5) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 2.5) (end -2.5 2.5) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -2.5) (end 2.5 2.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.5 -2.5) (end 2.5 -2.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.885 -2.61) (end -2.61 -2.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.61 2.61) (end 2.61 1.885) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.885 2.61) (end 2.61 2.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.61 2.61) (end -2.61 1.885) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.885 2.61) (end -2.61 2.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.61 -2.61) (end 2.61 -1.885) (layer F.SilkS) (width 0.12))
    (fp_line (start 1.885 -2.61) (end 2.61 -2.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.61 -2.61) (end 2.61 -1.885) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.885 2.61) (end -2.61 2.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.61 2.61) (end -2.61 1.885) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.885 2.61) (end 2.61 2.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.61 2.61) (end 2.61 1.885) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.885 -2.61) (end -2.61 -2.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.5 -2.5) (end 2.5 -2.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -2.5) (end 2.5 2.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 2.5) (end -2.5 2.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 2.5) (end -2.5 -1.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -1.5) (end -1.5 -2.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.1 -3.1) (end -3.1 3.1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.1 3.1) (end 3.1 3.1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.1 3.1) (end 3.1 -3.1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.1 -3.1) (end -3.1 -3.1) (layer F.CrtYd) (width 0.05))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
@@ -315,19 +315,19 @@
    (fp_text value Conn_01x04_Male (at 10.71 -12.21) (layer F.Fab) hide
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start 29.384 2.16) (end 29.384 7.744) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 7.1 7.744) (end 29.384 7.744) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 7.1 2.16) (end 29.384 2.16) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 5 0) (end 5 12) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 7.1 2.16) (end 7.1 7.744) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 38 0) (end 38 12) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 0 12) (end 38 12) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 0 0) (end 0 12) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 0 0) (end 38 0) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 0.36 0.9) (end 0.36 11.08) (layer F.CrtYd) (width 0.12))
-    (fp_line (start 0.36 11.08) (end 2.61 11.08) (layer F.CrtYd) (width 0.12))
-    (fp_line (start 2.61 11.08) (end 2.61 0.9) (layer F.CrtYd) (width 0.12))
    (fp_line (start 2.61 0.9) (end 0.36 0.9) (layer F.CrtYd) (width 0.12))
+    (fp_line (start 2.61 11.08) (end 2.61 0.9) (layer F.CrtYd) (width 0.12))
+    (fp_line (start 0.36 11.08) (end 2.61 11.08) (layer F.CrtYd) (width 0.12))
+    (fp_line (start 0.36 0.9) (end 0.36 11.08) (layer F.CrtYd) (width 0.12))
+    (fp_line (start 0 0) (end 38 0) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 0 0) (end 0 12) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 0 12) (end 38 12) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 38 0) (end 38 12) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 7.1 2.16) (end 7.1 7.744) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 5 0) (end 5 12) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 7.1 2.16) (end 29.384 2.16) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 7.1 7.744) (end 29.384 7.744) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 29.384 2.16) (end 29.384 7.744) (layer Dwgs.User) (width 0.12))
    (fp_text user D (at 3.1115 2.19) (layer F.SilkS) hide
      (effects (font (size 1 1) (thickness 0.15)))
    )
@@ -361,26 +361,26 @@
    (fp_text value ESP-12 (at 6.992 1 90) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -2.25 -0.5) (end -2.25 -8.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.25 -8.75) (end 15.25 -8.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 15.25 -8.75) (end 16.25 -8.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 16.25 -8.75) (end 16.25 16) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 16.25 16) (end -2.25 16) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.25 16) (end -2.25 -0.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.02 -8.39) (end 14.99 -8.39) (layer F.Fab) (width 0.1524))
-    (fp_line (start 14.99 -8.39) (end 14.992 -2.6) (layer F.Fab) (width 0.1524))
-    (fp_line (start -1.02 -8.39) (end -1.008 -2.6) (layer F.Fab) (width 0.1524))
-    (fp_line (start -1.016 14.859) (end -1.016 15.621) (layer F.SilkS) (width 0.1524))
-    (fp_line (start -1.016 15.621) (end -0.27 15.62) (layer F.SilkS) (width 0.1524))
-    (fp_line (start 14.986 15.621) (end 14.986 14.859) (layer F.SilkS) (width 0.1524))
-    (fp_line (start 14.99 -8.39) (end -1.008 -2.6) (layer F.Fab) (width 0.1524))
-    (fp_line (start -1.02 -8.39) (end 14.992 -2.6) (layer F.Fab) (width 0.1524))
-    (fp_line (start -1.008 -2.6) (end 14.992 -2.6) (layer F.Fab) (width 0.1524))
-    (fp_line (start 15 -8.4) (end 15 15.6) (layer F.Fab) (width 0.05))
-    (fp_line (start 14.992 15.6) (end -1.008 15.6) (layer F.Fab) (width 0.05))
-    (fp_line (start -1.008 15.6) (end -1.008 -8.4) (layer F.Fab) (width 0.05))
-    (fp_line (start -1.008 -8.4) (end 14.992 -8.4) (layer F.Fab) (width 0.05))
    (fp_line (start 14.24 15.622) (end 14.986 15.621) (layer F.SilkS) (width 0.1524))
+    (fp_line (start -1.008 -8.4) (end 14.992 -8.4) (layer F.Fab) (width 0.05))
+    (fp_line (start -1.008 15.6) (end -1.008 -8.4) (layer F.Fab) (width 0.05))
+    (fp_line (start 14.992 15.6) (end -1.008 15.6) (layer F.Fab) (width 0.05))
+    (fp_line (start 15 -8.4) (end 15 15.6) (layer F.Fab) (width 0.05))
+    (fp_line (start -1.008 -2.6) (end 14.992 -2.6) (layer F.Fab) (width 0.1524))
+    (fp_line (start -1.02 -8.39) (end 14.992 -2.6) (layer F.Fab) (width 0.1524))
+    (fp_line (start 14.99 -8.39) (end -1.008 -2.6) (layer F.Fab) (width 0.1524))
+    (fp_line (start 14.986 15.621) (end 14.986 14.859) (layer F.SilkS) (width 0.1524))
+    (fp_line (start -1.016 15.621) (end -0.27 15.62) (layer F.SilkS) (width 0.1524))
+    (fp_line (start -1.016 14.859) (end -1.016 15.621) (layer F.SilkS) (width 0.1524))
+    (fp_line (start -1.02 -8.39) (end -1.008 -2.6) (layer F.Fab) (width 0.1524))
+    (fp_line (start 14.99 -8.39) (end 14.992 -2.6) (layer F.Fab) (width 0.1524))
+    (fp_line (start -1.02 -8.39) (end 14.99 -8.39) (layer F.Fab) (width 0.1524))
+    (fp_line (start -2.25 16) (end -2.25 -0.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 16.25 16) (end -2.25 16) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 16.25 -8.75) (end 16.25 16) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 15.25 -8.75) (end 16.25 -8.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.25 -8.75) (end 15.25 -8.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.25 -0.5) (end -2.25 -8.75) (layer F.CrtYd) (width 0.05))
    (fp_text user "No Copper" (at 6.892 -5.4 90) (layer F.CrtYd)
      (effects (font (size 1 1) (thickness 0.15)))
    )
@@ -435,17 +435,17 @@
    (fp_text value XC6210B332MR (at 0 2.9 90) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.9 1.61) (end 0.9 1.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.9 -1.61) (end -1.55 -1.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.9 -1.8) (end 1.9 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.9 -1.8) (end 1.9 1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.9 1.8) (end -1.9 1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.9 1.8) (end -1.9 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.9 -0.9) (end -0.25 -1.55) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 -1.55) (end -0.25 -1.55) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 -0.9) (end -0.9 1.55) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 1.55) (end -0.9 1.55) (layer F.Fab) (width 0.1))
    (fp_line (start 0.9 -1.55) (end 0.9 1.55) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 1.55) (end -0.9 1.55) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.9) (end -0.9 1.55) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -1.55) (end -0.25 -1.55) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.9) (end -0.25 -1.55) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 1.8) (end -1.9 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.9 1.8) (end -1.9 1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.9 -1.8) (end 1.9 1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 -1.8) (end 1.9 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.9 -1.61) (end -1.55 -1.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.9 1.61) (end 0.9 1.61) (layer F.SilkS) (width 0.12))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.5 0.5) (thickness 0.075)))
    )
@@ -478,16 +478,16 @@
    (fp_text value 4,7uF (at 0 1.68) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.7 0.98) (end -1.7 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.7 -0.98) (end 1.7 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 -0.98) (end 1.7 0.98) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.7 0.98) (end -1.7 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 -0.98) (end 1.7 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.7 -0.98) (end 1.7 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.7 0.98) (end -1.7 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.5 0.5) (thickness 0.08)))
    )
@@ -514,16 +514,16 @@
    (fp_text value 4,7uF (at 0 1.68) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.7 0.98) (end -1.7 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.7 -0.98) (end 1.7 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 -0.98) (end 1.7 0.98) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.7 0.98) (end -1.7 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 -0.98) (end 1.7 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.7 -0.98) (end 1.7 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.7 0.98) (end -1.7 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.5 0.5) (thickness 0.08)))
    )
@@ -550,16 +550,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -586,16 +586,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -622,16 +622,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -658,16 +658,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -694,16 +694,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -730,16 +730,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -766,16 +766,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -802,16 +802,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -838,16 +838,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -874,17 +874,17 @@
    (fp_text value UMH3N (at 0 2 180) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start 0.7 -1.16) (end -1.2 -1.16) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.7 1.16) (end 0.7 1.16) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 1.4) (end 1.6 -1.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.6 -1.4) (end -1.6 1.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.6 -1.4) (end 1.6 -1.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.675 -1.1) (end -0.175 -1.1) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.675 -0.6) (end -0.675 1.1) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 1.4) (end 1.6 1.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.675 -1.1) (end 0.675 1.1) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.675 1.1) (end -0.675 1.1) (layer F.Fab) (width 0.1))
    (fp_line (start -0.175 -1.1) (end -0.675 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.675 1.1) (end -0.675 1.1) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.675 -1.1) (end 0.675 1.1) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 1.4) (end 1.6 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.675 -0.6) (end -0.675 1.1) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.675 -1.1) (end -0.175 -1.1) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -1.4) (end 1.6 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.6 -1.4) (end -1.6 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.6 1.4) (end 1.6 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.7 1.16) (end 0.7 1.16) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.7 -1.16) (end -1.2 -1.16) (layer F.SilkS) (width 0.12))
    (fp_text user %R (at 0 0 90) (layer F.Fab)
      (effects (font (size 0.5 0.5) (thickness 0.075)))
    )
@@ -919,19 +919,19 @@
    (fp_text value BS170F (at 0 2.5 270) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.76 -1.58) (end 0.76 -0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
    (fp_line (start 0.76 1.58) (end -0.7 1.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.76 -1.58) (end 0.76 -0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0 180) (layer F.Fab)
      (effects (font (size 0.5 0.5) (thickness 0.075)))
    )
@@ -959,29 +959,29 @@
    (fp_text value USB_B_Micro (at -0.22098 -3.5941 270) (layer B.Fab)
      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
    )
-    (fp_line (start 3.75 -2.15) (end -3.75 -2.15) (layer B.SilkS) (width 0.12))
-    (fp_line (start -3.75 3.97) (end -3.75 -1.29) (layer B.Fab) (width 0.1))
-    (fp_line (start -3.75 3.97) (end 3.75 3.97) (layer B.Fab) (width 0.1))
-    (fp_line (start 3.75 3.97) (end 3.75 -1.29) (layer B.Fab) (width 0.1))
-    (fp_line (start -3.75 -1.29) (end 3.75 -1.29) (layer B.Fab) (width 0.1))
-    (fp_line (start 3.9 4.1) (end 3.9 3.8) (layer B.SilkS) (width 0.1))
-    (fp_line (start 3.9 4.1) (end 3.6 4.1) (layer B.SilkS) (width 0.1))
-    (fp_line (start -3.9 4.1) (end -3.9 3.8) (layer B.SilkS) (width 0.1))
-    (fp_line (start -3.9 4.1) (end -3.6 4.1) (layer B.SilkS) (width 0.1))
-    (fp_line (start -3.9 -1.4) (end -3.6 -1.4) (layer B.SilkS) (width 0.1))
-    (fp_line (start -3.9 -1.4) (end -3.9 -1.1) (layer B.SilkS) (width 0.1))
-    (fp_line (start 3.9 -1.4) (end 3.6 -1.4) (layer B.SilkS) (width 0.1))
-    (fp_line (start 3.9 -1.4) (end 3.9 -1.1) (layer B.SilkS) (width 0.1))
-    (fp_line (start 0 4.1) (end -0.3 4.1) (layer B.SilkS) (width 0.1))
-    (fp_line (start 0 4.1) (end 0.3 4.1) (layer B.SilkS) (width 0.1))
-    (fp_line (start -1.6 3.6) (end -1.6 2) (layer B.SilkS) (width 0.1))
-    (fp_line (start -4.68 -1.75) (end -4.68 4.22) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -4.68 -1.75) (end 4.68 -1.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -4.68 4.22) (end 4.68 4.22) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 4.68 -1.75) (end 4.68 4.22) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -4.5 -1.3) (end -4.5 -2.5) (layer Dwgs.User) (width 0.12))
-    (fp_line (start -4.5 -2.5) (end 4.5 -2.5) (layer Dwgs.User) (width 0.12))
    (fp_line (start 4.5 -2.5) (end 4.5 -1.3) (layer Dwgs.User) (width 0.12))
+    (fp_line (start -4.5 -2.5) (end 4.5 -2.5) (layer Dwgs.User) (width 0.12))
+    (fp_line (start -4.5 -1.3) (end -4.5 -2.5) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 4.68 -1.75) (end 4.68 4.22) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -4.68 4.22) (end 4.68 4.22) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -4.68 -1.75) (end 4.68 -1.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -4.68 -1.75) (end -4.68 4.22) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.6 3.6) (end -1.6 2) (layer B.SilkS) (width 0.1))
+    (fp_line (start 0 4.1) (end 0.3 4.1) (layer B.SilkS) (width 0.1))
+    (fp_line (start 0 4.1) (end -0.3 4.1) (layer B.SilkS) (width 0.1))
+    (fp_line (start 3.9 -1.4) (end 3.9 -1.1) (layer B.SilkS) (width 0.1))
+    (fp_line (start 3.9 -1.4) (end 3.6 -1.4) (layer B.SilkS) (width 0.1))
+    (fp_line (start -3.9 -1.4) (end -3.9 -1.1) (layer B.SilkS) (width 0.1))
+    (fp_line (start -3.9 -1.4) (end -3.6 -1.4) (layer B.SilkS) (width 0.1))
+    (fp_line (start -3.9 4.1) (end -3.6 4.1) (layer B.SilkS) (width 0.1))
+    (fp_line (start -3.9 4.1) (end -3.9 3.8) (layer B.SilkS) (width 0.1))
+    (fp_line (start 3.9 4.1) (end 3.6 4.1) (layer B.SilkS) (width 0.1))
+    (fp_line (start 3.9 4.1) (end 3.9 3.8) (layer B.SilkS) (width 0.1))
+    (fp_line (start -3.75 -1.29) (end 3.75 -1.29) (layer B.Fab) (width 0.1))
+    (fp_line (start 3.75 3.97) (end 3.75 -1.29) (layer B.Fab) (width 0.1))
+    (fp_line (start -3.75 3.97) (end 3.75 3.97) (layer B.Fab) (width 0.1))
+    (fp_line (start -3.75 3.97) (end -3.75 -1.29) (layer B.Fab) (width 0.1))
+    (fp_line (start 3.75 -2.15) (end -3.75 -2.15) (layer B.SilkS) (width 0.12))
    (pad SH smd rect (at -1.5 -1.15 270) (size 1 1) (layers B.Cu B.Paste B.Mask)
      (net 1 GND))
    (pad 1 smd rect (at -1.3 3.16 270) (size 0.4 2.15) (layers B.Cu B.Paste B.Mask)
@@ -1025,16 +1025,16 @@
    (fp_text value 100nF (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -1061,16 +1061,16 @@
    (fp_text value 100nF (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -1096,27 +1096,27 @@
    (fp_text value RJ12 (at 3.54 18.3 90) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -3.43 -0.48) (end -3.43 -1.23) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.93 0.02) (end -3.43 -0.48) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.43 0.52) (end -2.93 0.02) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.9 0.77) (end -3.9 -0.76) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.43 7.79) (end -3.43 -1.23) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.43 7.72) (end -3.43 7.79) (layer F.SilkS) (width 0.1))
-    (fp_line (start -3.43 16.77) (end -3.43 9.99) (layer F.SilkS) (width 0.12))
-    (fp_line (start 9.77 16.77) (end -3.43 16.77) (layer F.SilkS) (width 0.12))
-    (fp_line (start 9.77 16.76) (end 9.77 16.77) (layer F.SilkS) (width 0.1))
-    (fp_line (start 9.77 16.77) (end 9.77 9.99) (layer F.SilkS) (width 0.12))
-    (fp_line (start 9.77 16.65) (end 9.77 16.77) (layer F.SilkS) (width 0.1))
-    (fp_line (start 9.77 -1.23) (end 9.77 7.79) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.43 -1.23) (end 9.77 -1.23) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.04 17.27) (end -4.04 -1.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 10.38 17.27) (end -4.04 17.27) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 10.38 -1.73) (end 10.38 17.27) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -4.04 -1.73) (end 10.38 -1.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 9.77 16.77) (end -3.43 16.77) (layer F.Fab) (width 0.1))
-    (fp_line (start 9.77 -1.23) (end 9.77 16.77) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.43 -1.23) (end 9.77 -1.23) (layer F.Fab) (width 0.1))
    (fp_line (start -3.43 16.77) (end -3.43 0.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.43 -1.23) (end 9.77 -1.23) (layer F.Fab) (width 0.1))
+    (fp_line (start 9.77 -1.23) (end 9.77 16.77) (layer F.Fab) (width 0.1))
+    (fp_line (start 9.77 16.77) (end -3.43 16.77) (layer F.Fab) (width 0.1))
+    (fp_line (start -4.04 -1.73) (end 10.38 -1.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 10.38 -1.73) (end 10.38 17.27) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 10.38 17.27) (end -4.04 17.27) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -4.04 17.27) (end -4.04 -1.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.43 -1.23) (end 9.77 -1.23) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.77 -1.23) (end 9.77 7.79) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.77 16.65) (end 9.77 16.77) (layer F.SilkS) (width 0.1))
+    (fp_line (start 9.77 16.77) (end 9.77 9.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.77 16.76) (end 9.77 16.77) (layer F.SilkS) (width 0.1))
+    (fp_line (start 9.77 16.77) (end -3.43 16.77) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.43 16.77) (end -3.43 9.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.43 7.72) (end -3.43 7.79) (layer F.SilkS) (width 0.1))
+    (fp_line (start -3.43 7.79) (end -3.43 -1.23) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.9 0.77) (end -3.9 -0.76) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.43 0.52) (end -2.93 0.02) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.93 0.02) (end -3.43 -0.48) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.43 -0.48) (end -3.43 -1.23) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 3.16 7.76 90) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
@@ -1504,7 +1504,7 @@
  (segment (start 32.131 -9.398) (end 31.305 -9.398) (width 0.254) (layer F.Cu) (net 32))
  (segment (start 32.512 -9.017) (end 32.131 -9.398) (width 0.254) (layer F.Cu) (net 32))

-  (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 60A4080D) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 60DC9564) (hatch edge 0.508)
    (connect_pads (clearance 0.2032))
    (min_thickness 0.254)
    (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -1803,7 +1803,7 @@
      )
    )
  )
-  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 60A4080A) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 60DC9561) (hatch edge 0.508)
    (connect_pads (clearance 0.2032))
    (min_thickness 0.254)
    (fill yes (arc_segments 32) (thermal_gap 0.254) (thermal_bridge_width 0.508))
--- a/P1_wifi/P1_wifi.kicad_pcb-bak
+++ b/P1_wifi/P1_wifi.kicad_pcb-bak
@@ -213,22 +213,22 @@
    (fp_text value CP2102-Axx-xQFN28 (at 0 3.8) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start 3.1 -3.1) (end -3.1 -3.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.1 3.1) (end 3.1 -3.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.1 3.1) (end 3.1 3.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.1 -3.1) (end -3.1 3.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.5 -1.5) (end -1.5 -2.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 2.5) (end -2.5 -1.5) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 2.5) (end -2.5 2.5) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.5 -2.5) (end 2.5 2.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.5 -2.5) (end 2.5 -2.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.885 -2.61) (end -2.61 -2.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.61 2.61) (end 2.61 1.885) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.885 2.61) (end 2.61 2.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.61 2.61) (end -2.61 1.885) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.885 2.61) (end -2.61 2.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.61 -2.61) (end 2.61 -1.885) (layer F.SilkS) (width 0.12))
    (fp_line (start 1.885 -2.61) (end 2.61 -2.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.61 -2.61) (end 2.61 -1.885) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.885 2.61) (end -2.61 2.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.61 2.61) (end -2.61 1.885) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.885 2.61) (end 2.61 2.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.61 2.61) (end 2.61 1.885) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.885 -2.61) (end -2.61 -2.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.5 -2.5) (end 2.5 -2.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 -2.5) (end 2.5 2.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.5 2.5) (end -2.5 2.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 2.5) (end -2.5 -1.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -1.5) (end -1.5 -2.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.1 -3.1) (end -3.1 3.1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.1 3.1) (end 3.1 3.1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.1 3.1) (end 3.1 -3.1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.1 -3.1) (end -3.1 -3.1) (layer F.CrtYd) (width 0.05))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
@@ -315,19 +315,19 @@
    (fp_text value Conn_01x04_Male (at 10.71 -12.21) (layer F.Fab) hide
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start 29.384 2.16) (end 29.384 7.744) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 7.1 7.744) (end 29.384 7.744) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 7.1 2.16) (end 29.384 2.16) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 5 0) (end 5 12) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 7.1 2.16) (end 7.1 7.744) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 38 0) (end 38 12) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 0 12) (end 38 12) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 0 0) (end 0 12) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 0 0) (end 38 0) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 0.36 0.9) (end 0.36 11.08) (layer F.CrtYd) (width 0.12))
-    (fp_line (start 0.36 11.08) (end 2.61 11.08) (layer F.CrtYd) (width 0.12))
-    (fp_line (start 2.61 11.08) (end 2.61 0.9) (layer F.CrtYd) (width 0.12))
    (fp_line (start 2.61 0.9) (end 0.36 0.9) (layer F.CrtYd) (width 0.12))
+    (fp_line (start 2.61 11.08) (end 2.61 0.9) (layer F.CrtYd) (width 0.12))
+    (fp_line (start 0.36 11.08) (end 2.61 11.08) (layer F.CrtYd) (width 0.12))
+    (fp_line (start 0.36 0.9) (end 0.36 11.08) (layer F.CrtYd) (width 0.12))
+    (fp_line (start 0 0) (end 38 0) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 0 0) (end 0 12) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 0 12) (end 38 12) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 38 0) (end 38 12) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 7.1 2.16) (end 7.1 7.744) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 5 0) (end 5 12) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 7.1 2.16) (end 29.384 2.16) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 7.1 7.744) (end 29.384 7.744) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 29.384 2.16) (end 29.384 7.744) (layer Dwgs.User) (width 0.12))
    (fp_text user D (at 3.1115 2.19) (layer F.SilkS) hide
      (effects (font (size 1 1) (thickness 0.15)))
    )
@@ -361,26 +361,26 @@
    (fp_text value ESP-12 (at 6.992 1 90) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -2.25 -0.5) (end -2.25 -8.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.25 -8.75) (end 15.25 -8.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 15.25 -8.75) (end 16.25 -8.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 16.25 -8.75) (end 16.25 16) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 16.25 16) (end -2.25 16) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.25 16) (end -2.25 -0.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.02 -8.39) (end 14.99 -8.39) (layer F.Fab) (width 0.1524))
-    (fp_line (start 14.99 -8.39) (end 14.992 -2.6) (layer F.Fab) (width 0.1524))
-    (fp_line (start -1.02 -8.39) (end -1.008 -2.6) (layer F.Fab) (width 0.1524))
-    (fp_line (start -1.016 14.859) (end -1.016 15.621) (layer F.SilkS) (width 0.1524))
-    (fp_line (start -1.016 15.621) (end -0.27 15.62) (layer F.SilkS) (width 0.1524))
-    (fp_line (start 14.986 15.621) (end 14.986 14.859) (layer F.SilkS) (width 0.1524))
-    (fp_line (start 14.99 -8.39) (end -1.008 -2.6) (layer F.Fab) (width 0.1524))
-    (fp_line (start -1.02 -8.39) (end 14.992 -2.6) (layer F.Fab) (width 0.1524))
-    (fp_line (start -1.008 -2.6) (end 14.992 -2.6) (layer F.Fab) (width 0.1524))
-    (fp_line (start 15 -8.4) (end 15 15.6) (layer F.Fab) (width 0.05))
-    (fp_line (start 14.992 15.6) (end -1.008 15.6) (layer F.Fab) (width 0.05))
-    (fp_line (start -1.008 15.6) (end -1.008 -8.4) (layer F.Fab) (width 0.05))
-    (fp_line (start -1.008 -8.4) (end 14.992 -8.4) (layer F.Fab) (width 0.05))
    (fp_line (start 14.24 15.622) (end 14.986 15.621) (layer F.SilkS) (width 0.1524))
+    (fp_line (start -1.008 -8.4) (end 14.992 -8.4) (layer F.Fab) (width 0.05))
+    (fp_line (start -1.008 15.6) (end -1.008 -8.4) (layer F.Fab) (width 0.05))
+    (fp_line (start 14.992 15.6) (end -1.008 15.6) (layer F.Fab) (width 0.05))
+    (fp_line (start 15 -8.4) (end 15 15.6) (layer F.Fab) (width 0.05))
+    (fp_line (start -1.008 -2.6) (end 14.992 -2.6) (layer F.Fab) (width 0.1524))
+    (fp_line (start -1.02 -8.39) (end 14.992 -2.6) (layer F.Fab) (width 0.1524))
+    (fp_line (start 14.99 -8.39) (end -1.008 -2.6) (layer F.Fab) (width 0.1524))
+    (fp_line (start 14.986 15.621) (end 14.986 14.859) (layer F.SilkS) (width 0.1524))
+    (fp_line (start -1.016 15.621) (end -0.27 15.62) (layer F.SilkS) (width 0.1524))
+    (fp_line (start -1.016 14.859) (end -1.016 15.621) (layer F.SilkS) (width 0.1524))
+    (fp_line (start -1.02 -8.39) (end -1.008 -2.6) (layer F.Fab) (width 0.1524))
+    (fp_line (start 14.99 -8.39) (end 14.992 -2.6) (layer F.Fab) (width 0.1524))
+    (fp_line (start -1.02 -8.39) (end 14.99 -8.39) (layer F.Fab) (width 0.1524))
+    (fp_line (start -2.25 16) (end -2.25 -0.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 16.25 16) (end -2.25 16) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 16.25 -8.75) (end 16.25 16) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 15.25 -8.75) (end 16.25 -8.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.25 -8.75) (end 15.25 -8.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.25 -0.5) (end -2.25 -8.75) (layer F.CrtYd) (width 0.05))
    (fp_text user "No Copper" (at 6.892 -5.4 90) (layer F.CrtYd)
      (effects (font (size 1 1) (thickness 0.15)))
    )
@@ -435,17 +435,17 @@
    (fp_text value XC6210B332MR (at 0 2.9 90) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.9 1.61) (end 0.9 1.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.9 -1.61) (end -1.55 -1.61) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.9 -1.8) (end 1.9 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.9 -1.8) (end 1.9 1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.9 1.8) (end -1.9 1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.9 1.8) (end -1.9 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.9 -0.9) (end -0.25 -1.55) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 -1.55) (end -0.25 -1.55) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 -0.9) (end -0.9 1.55) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 1.55) (end -0.9 1.55) (layer F.Fab) (width 0.1))
    (fp_line (start 0.9 -1.55) (end 0.9 1.55) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 1.55) (end -0.9 1.55) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.9) (end -0.9 1.55) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -1.55) (end -0.25 -1.55) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.9) (end -0.25 -1.55) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 1.8) (end -1.9 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.9 1.8) (end -1.9 1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.9 -1.8) (end 1.9 1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 -1.8) (end 1.9 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.9 -1.61) (end -1.55 -1.61) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.9 1.61) (end 0.9 1.61) (layer F.SilkS) (width 0.12))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.5 0.5) (thickness 0.075)))
    )
@@ -478,16 +478,16 @@
    (fp_text value 4,7uF (at 0 1.68) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.7 0.98) (end -1.7 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.7 -0.98) (end 1.7 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 -0.98) (end 1.7 0.98) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.7 0.98) (end -1.7 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 -0.98) (end 1.7 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.7 -0.98) (end 1.7 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.7 0.98) (end -1.7 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.5 0.5) (thickness 0.08)))
    )
@@ -514,16 +514,16 @@
    (fp_text value 4,7uF (at 0 1.68) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.7 0.98) (end -1.7 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.7 -0.98) (end 1.7 -0.98) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 -0.98) (end 1.7 0.98) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.7 0.98) (end -1.7 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 -0.98) (end 1.7 0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.7 -0.98) (end 1.7 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.7 0.98) (end -1.7 -0.98) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.5 0.5) (thickness 0.08)))
    )
@@ -550,16 +550,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -586,16 +586,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -622,16 +622,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -658,16 +658,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -694,16 +694,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -730,16 +730,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -766,16 +766,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -802,16 +802,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -838,16 +838,16 @@
    (fp_text value 10K (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -874,17 +874,17 @@
    (fp_text value UMH3N (at 0 2 180) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start 0.7 -1.16) (end -1.2 -1.16) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.7 1.16) (end 0.7 1.16) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.6 1.4) (end 1.6 -1.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.6 -1.4) (end -1.6 1.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.6 -1.4) (end 1.6 -1.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.675 -1.1) (end -0.175 -1.1) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.675 -0.6) (end -0.675 1.1) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.6 1.4) (end 1.6 1.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.675 -1.1) (end 0.675 1.1) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.675 1.1) (end -0.675 1.1) (layer F.Fab) (width 0.1))
    (fp_line (start -0.175 -1.1) (end -0.675 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.675 1.1) (end -0.675 1.1) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.675 -1.1) (end 0.675 1.1) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 1.4) (end 1.6 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.675 -0.6) (end -0.675 1.1) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.675 -1.1) (end -0.175 -1.1) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.6 -1.4) (end 1.6 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.6 -1.4) (end -1.6 1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.6 1.4) (end 1.6 -1.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.7 1.16) (end 0.7 1.16) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.7 -1.16) (end -1.2 -1.16) (layer F.SilkS) (width 0.12))
    (fp_text user %R (at 0 0 90) (layer F.Fab)
      (effects (font (size 0.5 0.5) (thickness 0.075)))
    )
@@ -919,19 +919,19 @@
    (fp_text value BS170F (at 0 2.5 270) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.76 -1.58) (end 0.76 -0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
    (fp_line (start 0.76 1.58) (end -0.7 1.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.76 -1.58) (end 0.76 -0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0 180) (layer F.Fab)
      (effects (font (size 0.5 0.5) (thickness 0.075)))
    )
@@ -959,29 +959,29 @@
    (fp_text value USB_B_Micro (at -0.22098 -3.5941 270) (layer B.Fab)
      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
    )
-    (fp_line (start 3.75 -2.15) (end -3.75 -2.15) (layer B.SilkS) (width 0.12))
-    (fp_line (start -3.75 3.97) (end -3.75 -1.29) (layer B.Fab) (width 0.1))
-    (fp_line (start -3.75 3.97) (end 3.75 3.97) (layer B.Fab) (width 0.1))
-    (fp_line (start 3.75 3.97) (end 3.75 -1.29) (layer B.Fab) (width 0.1))
-    (fp_line (start -3.75 -1.29) (end 3.75 -1.29) (layer B.Fab) (width 0.1))
-    (fp_line (start 3.9 4.1) (end 3.9 3.8) (layer B.SilkS) (width 0.1))
-    (fp_line (start 3.9 4.1) (end 3.6 4.1) (layer B.SilkS) (width 0.1))
-    (fp_line (start -3.9 4.1) (end -3.9 3.8) (layer B.SilkS) (width 0.1))
-    (fp_line (start -3.9 4.1) (end -3.6 4.1) (layer B.SilkS) (width 0.1))
-    (fp_line (start -3.9 -1.4) (end -3.6 -1.4) (layer B.SilkS) (width 0.1))
-    (fp_line (start -3.9 -1.4) (end -3.9 -1.1) (layer B.SilkS) (width 0.1))
-    (fp_line (start 3.9 -1.4) (end 3.6 -1.4) (layer B.SilkS) (width 0.1))
-    (fp_line (start 3.9 -1.4) (end 3.9 -1.1) (layer B.SilkS) (width 0.1))
-    (fp_line (start 0 4.1) (end -0.3 4.1) (layer B.SilkS) (width 0.1))
-    (fp_line (start 0 4.1) (end 0.3 4.1) (layer B.SilkS) (width 0.1))
-    (fp_line (start -1.6 3.6) (end -1.6 2) (layer B.SilkS) (width 0.1))
-    (fp_line (start -4.68 -1.75) (end -4.68 4.22) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -4.68 -1.75) (end 4.68 -1.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -4.68 4.22) (end 4.68 4.22) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 4.68 -1.75) (end 4.68 4.22) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -4.5 -1.3) (end -4.5 -2.5) (layer Dwgs.User) (width 0.12))
-    (fp_line (start -4.5 -2.5) (end 4.5 -2.5) (layer Dwgs.User) (width 0.12))
    (fp_line (start 4.5 -2.5) (end 4.5 -1.3) (layer Dwgs.User) (width 0.12))
+    (fp_line (start -4.5 -2.5) (end 4.5 -2.5) (layer Dwgs.User) (width 0.12))
+    (fp_line (start -4.5 -1.3) (end -4.5 -2.5) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 4.68 -1.75) (end 4.68 4.22) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -4.68 4.22) (end 4.68 4.22) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -4.68 -1.75) (end 4.68 -1.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -4.68 -1.75) (end -4.68 4.22) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.6 3.6) (end -1.6 2) (layer B.SilkS) (width 0.1))
+    (fp_line (start 0 4.1) (end 0.3 4.1) (layer B.SilkS) (width 0.1))
+    (fp_line (start 0 4.1) (end -0.3 4.1) (layer B.SilkS) (width 0.1))
+    (fp_line (start 3.9 -1.4) (end 3.9 -1.1) (layer B.SilkS) (width 0.1))
+    (fp_line (start 3.9 -1.4) (end 3.6 -1.4) (layer B.SilkS) (width 0.1))
+    (fp_line (start -3.9 -1.4) (end -3.9 -1.1) (layer B.SilkS) (width 0.1))
+    (fp_line (start -3.9 -1.4) (end -3.6 -1.4) (layer B.SilkS) (width 0.1))
+    (fp_line (start -3.9 4.1) (end -3.6 4.1) (layer B.SilkS) (width 0.1))
+    (fp_line (start -3.9 4.1) (end -3.9 3.8) (layer B.SilkS) (width 0.1))
+    (fp_line (start 3.9 4.1) (end 3.6 4.1) (layer B.SilkS) (width 0.1))
+    (fp_line (start 3.9 4.1) (end 3.9 3.8) (layer B.SilkS) (width 0.1))
+    (fp_line (start -3.75 -1.29) (end 3.75 -1.29) (layer B.Fab) (width 0.1))
+    (fp_line (start 3.75 3.97) (end 3.75 -1.29) (layer B.Fab) (width 0.1))
+    (fp_line (start -3.75 3.97) (end 3.75 3.97) (layer B.Fab) (width 0.1))
+    (fp_line (start -3.75 3.97) (end -3.75 -1.29) (layer B.Fab) (width 0.1))
+    (fp_line (start 3.75 -2.15) (end -3.75 -2.15) (layer B.SilkS) (width 0.12))
    (pad SH smd rect (at -1.5 -1.15 270) (size 1 1) (layers B.Cu B.Paste B.Mask)
      (net 1 GND))
    (pad 1 smd rect (at -1.3 3.16 270) (size 0.4 2.15) (layers B.Cu B.Paste B.Mask)
@@ -1025,16 +1025,16 @@
    (fp_text value 100nF (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -1061,16 +1061,16 @@
    (fp_text value 100nF (at 0 1.43) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 0 0) (layer F.Fab)
      (effects (font (size 0.4 0.4) (thickness 0.06)))
    )
@@ -1096,27 +1096,27 @@
    (fp_text value RJ12 (at 3.54 18.3 90) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
-    (fp_line (start -3.43 -0.48) (end -3.43 -1.23) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.93 0.02) (end -3.43 -0.48) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.43 0.52) (end -2.93 0.02) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.9 0.77) (end -3.9 -0.76) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.43 7.79) (end -3.43 -1.23) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.43 7.72) (end -3.43 7.79) (layer F.SilkS) (width 0.1))
-    (fp_line (start -3.43 16.77) (end -3.43 9.99) (layer F.SilkS) (width 0.12))
-    (fp_line (start 9.77 16.77) (end -3.43 16.77) (layer F.SilkS) (width 0.12))
-    (fp_line (start 9.77 16.76) (end 9.77 16.77) (layer F.SilkS) (width 0.1))
-    (fp_line (start 9.77 16.77) (end 9.77 9.99) (layer F.SilkS) (width 0.12))
-    (fp_line (start 9.77 16.65) (end 9.77 16.77) (layer F.SilkS) (width 0.1))
-    (fp_line (start 9.77 -1.23) (end 9.77 7.79) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.43 -1.23) (end 9.77 -1.23) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.04 17.27) (end -4.04 -1.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 10.38 17.27) (end -4.04 17.27) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 10.38 -1.73) (end 10.38 17.27) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -4.04 -1.73) (end 10.38 -1.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 9.77 16.77) (end -3.43 16.77) (layer F.Fab) (width 0.1))
-    (fp_line (start 9.77 -1.23) (end 9.77 16.77) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.43 -1.23) (end 9.77 -1.23) (layer F.Fab) (width 0.1))
    (fp_line (start -3.43 16.77) (end -3.43 0.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.43 -1.23) (end 9.77 -1.23) (layer F.Fab) (width 0.1))
+    (fp_line (start 9.77 -1.23) (end 9.77 16.77) (layer F.Fab) (width 0.1))
+    (fp_line (start 9.77 16.77) (end -3.43 16.77) (layer F.Fab) (width 0.1))
+    (fp_line (start -4.04 -1.73) (end 10.38 -1.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 10.38 -1.73) (end 10.38 17.27) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 10.38 17.27) (end -4.04 17.27) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -4.04 17.27) (end -4.04 -1.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.43 -1.23) (end 9.77 -1.23) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.77 -1.23) (end 9.77 7.79) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.77 16.65) (end 9.77 16.77) (layer F.SilkS) (width 0.1))
+    (fp_line (start 9.77 16.77) (end 9.77 9.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.77 16.76) (end 9.77 16.77) (layer F.SilkS) (width 0.1))
+    (fp_line (start 9.77 16.77) (end -3.43 16.77) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.43 16.77) (end -3.43 9.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.43 7.72) (end -3.43 7.79) (layer F.SilkS) (width 0.1))
+    (fp_line (start -3.43 7.79) (end -3.43 -1.23) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.9 0.77) (end -3.9 -0.76) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.43 0.52) (end -2.93 0.02) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.93 0.02) (end -3.43 -0.48) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.43 -0.48) (end -3.43 -1.23) (layer F.Fab) (width 0.1))
    (fp_text user %R (at 3.16 7.76 90) (layer F.Fab)
      (effects (font (size 1 1) (thickness 0.15)))
    )
--- a/P1_wifi/P1_wifi.sch
+++ b/P1_wifi/P1_wifi.sch
@@ -410,7 +410,7 @@ F 0 "R5" V 4250 3200 50  0000 C CNN
 F 1 "10K" V 4250 3350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4280 3250 50  0001 C CNN
 F 3 "~" H 4350 3250 50  0001 C CNN
-F 4 "DNP" V 4350 3250 50  0000 C CNN "DNP"
+F 4 "" V 4350 3250 50  0001 C CNN "DNP"
 	1    4350 3250
 	0    1    1    0   
 $EndComp
@@ -852,7 +852,7 @@ Wire Wire Line
 Text Label 9800 2950 0    50   ~ 0
 USB_SUSP
 Text Notes -3250 1550 0    118  ~ 0
-TODO for v 1.3\n- Move version Silk to bottom\n- swap display SDA/SCL\n- change Q1 to common device\n- smaller refdes\n- remove suppression diode\n- swap ESP_RX/TX on U4
+TODO for v 1.3\n- change Q1 to common device\n- smaller refdes\n
 Wire Wire Line
 	9650 2950 10200 2950
 $EndSCHEMATC
--- a/P1_wifi/P1_wifi.sch-bak
+++ b/P1_wifi/P1_wifi.sch-bak
@@ -277,51 +277,51 @@ Connection ~ 5250 6600
 $Comp
 L Connector:USB_B_Micro J2
 U 1 1 603DE563
-P 5600 5400
-F 0 "J2" H 5370 5389 50  0000 R CNN
-F 1 "USB_B_Micro" H 5370 5298 50  0000 R CNN
-F 2 "MySymbols:USB_Micro_B_Female" H 5750 5350 50  0001 C CNN
-F 3 "~" H 5750 5350 50  0001 C CNN
-	1    5600 5400
+P 7100 2550
+F 0 "J2" H 6870 2539 50  0000 R CNN
+F 1 "USB_B_Micro" H 6870 2448 50  0000 R CNN
+F 2 "MySymbols:USB_Micro_B_Female" H 7250 2500 50  0001 C CNN
+F 3 "~" H 7250 2500 50  0001 C CNN
+	1    7100 2550
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+5V #PWR012
 U 1 1 603E164F
-P 5950 5050
-F 0 "#PWR012" H 5950 4900 50  0001 C CNN
-F 1 "+5V" H 5965 5223 50  0000 C CNN
-F 2 "" H 5950 5050 50  0001 C CNN
-F 3 "" H 5950 5050 50  0001 C CNN
-	1    5950 5050
+P 7450 2200
+F 0 "#PWR012" H 7450 2050 50  0001 C CNN
+F 1 "+5V" H 7465 2373 50  0000 C CNN
+F 2 "" H 7450 2200 50  0001 C CNN
+F 3 "" H 7450 2200 50  0001 C CNN
+	1    7450 2200
 	-1   0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR013
 U 1 1 603E1F73
-P 5900 5900
-F 0 "#PWR013" H 5900 5650 50  0001 C CNN
-F 1 "GND" H 5905 5727 50  0000 C CNN
-F 2 "" H 5900 5900 50  0001 C CNN
-F 3 "" H 5900 5900 50  0001 C CNN
-	1    5900 5900
+P 7400 3050
+F 0 "#PWR013" H 7400 2800 50  0001 C CNN
+F 1 "GND" H 7405 2877 50  0000 C CNN
+F 2 "" H 7400 3050 50  0001 C CNN
+F 3 "" H 7400 3050 50  0001 C CNN
+	1    7400 3050
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	5500 5800 5500 5850
+	7000 2950 7000 3000
 Wire Wire Line
-	5500 5850 5600 5850
+	7000 3000 7100 3000
 Wire Wire Line
-	5600 5850 5600 5800
+	7100 3000 7100 2950
 Wire Wire Line
-	5600 5850 5900 5850
+	7100 3000 7400 3000
 Wire Wire Line
-	5900 5850 5900 5900
-Connection ~ 5600 5850
+	7400 3000 7400 3050
+Connection ~ 7100 3000
 Wire Wire Line
-	5900 5200 5950 5200
+	7400 2350 7450 2350
 Wire Wire Line
-	5950 5200 5950 5050
+	7450 2350 7450 2200
 Text GLabel 3700 1000 0    50   Input ~ 0
 DTR
 Text GLabel 3700 1700 0    50   Input ~ 0
@@ -354,8 +354,8 @@ F 3 "~" H 4350 3450 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	5900 5600 5900 5850
-Connection ~ 5900 5850
+	7400 2750 7400 3000
+Connection ~ 7400 3000
 Text GLabel 2250 6700 2    50   Output ~ 0
 DSMR_DATA
 Wire Wire Line
@@ -410,6 +410,7 @@ F 0 "R5" V 4250 3200 50  0000 C CNN
 F 1 "10K" V 4250 3350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4280 3250 50  0001 C CNN
 F 3 "~" H 4350 3250 50  0001 C CNN
+F 4 "DNP" V 4350 3250 50  0000 C CNN "DNP"
 	1    4350 3250
 	0    1    1    0   
 $EndComp
@@ -640,9 +641,9 @@ F 3 "" H 8300 1550 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	8300 1550 8300 1600
-Text Label 10000 2050 2    50   ~ 0
-ESP_RX
 Text Label 10000 1950 2    50   ~ 0
+ESP_RX
+Text Label 10000 2050 2    50   ~ 0
 ESP_TX
 Wire Wire Line
 	9650 1950 10000 1950
@@ -659,94 +660,28 @@ Wire Wire Line
 $Comp
 L Device:R R9
 U 1 1 60C0A451
-P 9900 3200
-F 0 "R9" V 9800 3150 50  0000 C CNN
-F 1 "10K" V 9800 3300 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9830 3200 50  0001 C CNN
-F 3 "~" H 9900 3200 50  0001 C CNN
-	1    9900 3200
+P 10200 3200
+F 0 "R9" V 10100 3150 50  0000 C CNN
+F 1 "10K" V 10100 3300 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 10130 3200 50  0001 C CNN
+F 3 "~" H 10200 3200 50  0001 C CNN
+	1    10200 3200
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	9900 3050 9900 2950
-Wire Wire Line
-	9900 2950 9650 2950
-$Comp
-L Power_Protection:USBLC6-2P6 U3
-U 1 1 60C0FEF9
-P 7800 4400
-F 0 "U3" H 7600 4050 50  0000 C CNN
-F 1 "USBLC6-2P6" H 7500 4750 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-666" H 7800 3900 50  0001 C CNN
-F 3 "https://www.st.com/resource/en/datasheet/usblc6-2.pdf" H 8000 4750 50  0001 C CNN
-	1    7800 4400
-	1    0    0    -1  
-$EndComp
-Text Label 6100 5400 2    50   ~ 0
+	10200 3050 10200 2950
+Text Label 7600 2550 2    50   ~ 0
 D+
-Text Label 6100 5500 2    50   ~ 0
+Text Label 7600 2650 2    50   ~ 0
 D-
 Wire Wire Line
-	6100 5500 5900 5500
+	7600 2650 7400 2650
 Wire Wire Line
-	6100 5400 5900 5400
-Text Label 7250 4500 0    50   ~ 0
-D+
-Text Label 8400 4500 2    50   ~ 0
-D-
-Wire Wire Line
-	7250 4500 7400 4500
-Wire Wire Line
-	8400 4500 8200 4500
-Text Label 7250 4300 0    50   ~ 0
-D1+
-Text Label 8400 4300 2    50   ~ 0
-D1-
-Wire Wire Line
-	8400 4300 8200 4300
-Wire Wire Line
-	7250 4300 7400 4300
-$Comp
-L power:+5V #PWR0108
-U 1 1 60C4DD3C
-P 7800 3950
-F 0 "#PWR0108" H 7800 3800 50  0001 C CNN
-F 1 "+5V" H 7815 4123 50  0000 C CNN
-F 2 "" H 7800 3950 50  0001 C CNN
-F 3 "" H 7800 3950 50  0001 C CNN
-	1    7800 3950
-	-1   0    0    -1  
-$EndComp
-$Comp
-L power:GND #PWR0109
-U 1 1 60C52342
-P 7800 4850
-F 0 "#PWR0109" H 7800 4600 50  0001 C CNN
-F 1 "GND" H 7805 4677 50  0000 C CNN
-F 2 "" H 7800 4850 50  0001 C CNN
-F 3 "" H 7800 4850 50  0001 C CNN
-	1    7800 4850
-	-1   0    0    -1  
-$EndComp
-$Comp
-L Device:C C5
-U 1 1 60C563AC
-P 6900 4350
-F 0 "C5" H 7015 4396 50  0000 L CNN
-F 1 "100nF" H 7015 4305 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 6938 4200 50  0001 C CNN
-F 3 "~" H 6900 4350 50  0001 C CNN
-	1    6900 4350
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	6900 4000 6900 4200
-Wire Wire Line
-	6900 4800 6900 4500
+	7600 2550 7400 2550
 Text Label 8450 2650 0    50   ~ 0
-D1+
+D+
 Text Label 8450 2550 0    50   ~ 0
-D1-
+D-
 Wire Wire Line
 	8650 2650 8450 2650
 Wire Wire Line
@@ -769,16 +704,16 @@ Wire Wire Line
 $Comp
 L power:GND #PWR0111
 U 1 1 60C737B3
-P 9900 3450
-F 0 "#PWR0111" H 9900 3200 50  0001 C CNN
-F 1 "GND" H 9905 3277 50  0000 C CNN
-F 2 "" H 9900 3450 50  0001 C CNN
-F 3 "" H 9900 3450 50  0001 C CNN
-	1    9900 3450
+P 10200 3450
+F 0 "#PWR0111" H 10200 3200 50  0001 C CNN
+F 1 "GND" H 10205 3277 50  0000 C CNN
+F 2 "" H 10200 3450 50  0001 C CNN
+F 3 "" H 10200 3450 50  0001 C CNN
+	1    10200 3450
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	9900 3450 9900 3350
+	10200 3450 10200 3350
 $Comp
 L Connector:Conn_01x04_Male J3
 U 1 1 60CAF614
@@ -800,9 +735,9 @@ Wire Wire Line
 	3400 3250 3050 3250
 Wire Wire Line
 	3400 3350 3050 3350
-Text Label 2650 1200 2    50   ~ 0
-ESP_SCL
 Text Label 2650 1300 2    50   ~ 0
+ESP_SCL
+Text Label 2650 1200 2    50   ~ 0
 EPS_SDA
 $Comp
 L power:+3.3V #PWR01
@@ -843,11 +778,11 @@ L Regulator_Linear:MIC5219-3.3YM5 U2
 U 1 1 60DC1061
 P 5650 6600
 F 0 "U2" H 5650 6942 50  0000 C CNN
-F 1 "MIC5219-3.3YM5" H 5650 6851 50  0000 C CNN
+F 1 "XC6210B332MR" H 5650 6851 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-23-5" H 5650 6925 50  0001 C CNN
-F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/MIC5219-500mA-Peak-Output-LDO-Regulator-DS20006021A.pdf" H 5650 6600 50  0001 C CNN
+F 3 "http://www.farnell.com/datasheets/2012972.pdf" H 5650 6600 50  0001 C CNN
 F 4 "Farnell" H 5650 6600 50  0001 C CNN "suppier"
-F 5 "2510252" H 5650 6600 50  0001 C CNN "ordercode"
+F 5 "1057803" H 5650 6600 50  0001 C CNN "ordercode"
 	1    5650 6600
 	1    0    0    -1  
 $EndComp
@@ -891,16 +826,6 @@ F 5 "2611880" H 6050 6900 50  0001 C CNN "ordercode"
 	1    0    0    -1  
 $EndComp
 NoConn ~ 1250 3450
-Wire Wire Line
-	7800 3950 7800 4000
-Wire Wire Line
-	7800 4800 7800 4850
-Wire Wire Line
-	6900 4000 7800 4000
-Connection ~ 7800 4000
-Wire Wire Line
-	6900 4800 7800 4800
-Connection ~ 7800 4800
 NoConn ~ 9650 2250
 NoConn ~ 9650 2350
 NoConn ~ 9650 2550
@@ -926,4 +851,8 @@ Wire Wire Line
 	8950 3350 8950 3250
 Text Label 9800 2950 0    50   ~ 0
 USB_SUSP
+Text Notes -3250 1550 0    118  ~ 0
+TODO for v 1.3\n- change Q1 to common device\n- smaller refdes\n
+Wire Wire Line
+	9650 2950 10200 2950
 $EndSCHEMATC
Author	SHA1	Message	Date
Willem Oldemans	1cfd6f9bef	wifi settings prep	2021-08-25 12:35:09 +02:00
willem	73518dda4f	updated schematic & PCB for i2c uart	2021-08-23 17:13:23 +02:00
willem	c0d686143e	added production files	2021-08-23 17:12:30 +02:00