embedded oled

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"
   }
 }

P1_gateway_FW/platformio.ini

@@ -15,6 +15,9 @@ framework = arduino
 monitor_speed = 115200
 lib_deps = 
   glmnet/Dsmr@^0.3
-lib_ldf_mode = deep+
+  juerd/ESP-WiFiSettings @ ^3.8.0
-compile_flags = 
+;  littleFS
-	-std=c++11
+;lib_ldf_mode = deep+
+;compile_flags = 
+;	-std=c++11
+board_build.filesystem = littlefs

P1_gateway_FW/src/connection.cpp

@@ -1,13 +1,46 @@
 #include "connection.h"
 
+String wifiState;
+
+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)
 {
+  if (!LittleFS.begin())
+  {
+    Serial.println("An Error has occurred while mounting LittleFS");
   }
+  initWifiConnection();
+}
+
 void handleConnection(void)
 {
 }
-
-wifiStrength getWifiStrength(void)
-{
-  return signal_3;
-}

P1_gateway_FW/src/connection.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#include <littleFS.h>
+#include <WiFiSettings.h>
+
+
 void initConnection( void );
 void handleConnection(void);
 

P1_gateway_FW/src/data/test.txt

@@ -0,0 +1 @@
+hello world!

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;
 
-
+void drawDSMRstats(void)
-
-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)
 {
-  if (digits < 10)
+  display.setTextAlignment(TEXT_ALIGN_LEFT);
-  {
+  display.setFont(ArialMT_Plain_10);
-    String i = '0' + String(digits);
+  display.drawString(0, 0, "DSMR stats:");
-    return i;
+  display.drawString(0, 11, getMsgCount());
-  }
-  else
-  {
-    return String(digits);
-  }
 }
 
-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.
+  display.setTextAlignment(TEXT_ALIGN_LEFT);
-  // Please note that everything that should be transitioned
+  display.setFont(ArialMT_Plain_10);
-  // needs to be drawn relative to x and y
+  display.drawString(0, 0, getGasDelivered());
-
-  //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->
 }
 
-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
+  display.setTextAlignment(TEXT_ALIGN_CENTER);
-  // Besides the default fonts there will be a program to convert TrueType fonts into this format
+  display.setFont(ArialMT_Plain_16);
-  
+  display.drawString(64, 12, "DU-DSMR-W");
-  display->setTextAlignment(TEXT_ALIGN_LEFT);
+  display.drawXbm(0, 0, wifiicon10x10_width, wifiicon10x10_height, wifi10x10_png_bits);
-  display->setFont(ArialMT_Plain_10);
+  display.drawXbm(16,0, download_cloud_solid_png_width, download_cloud_solid_png_height, download_cloud_solid_png_bits);
-  display->drawString(0 + x, 0 + y, "DSMR stats:");
-  display->drawString(0 + x, 11 + y, getMsgCount());
 }
 
-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
+  drawInitFrame();
-  //ui.setActiveSymbol(activeSymbol);
+  display.display();
-  //ui.setInactiveSymbol(inactiveSymbol);
 
-  // You can change this to
+  Serial.printf("initdisplay: h=%u, w=%u\n", display.height(), display.width());
-  // TOP, LEFT, BOTTOM, RIGHT
+}
-  ui.setIndicatorPosition(RIGHT);
 
-  // Defines where the first frame is located in the bar.
+e_displayStates nextFrame(void)
-  ui.setIndicatorDirection(LEFT_RIGHT);
+{
-
+  displayState = static_cast<e_displayStates>(static_cast<int>(displayState) + 1);
-  // You can change the transition that is used
+  if (displayState == DISPLAU_LAST)
-  // SLIDE_LEFT, SLIDE_RIGHT, SLIDE_UP, SLIDE_DOWN
+  {
-  ui.setFrameAnimation(SLIDE_UP);
+    displayState = DISPLAY_DSMR1;
-
+  }
-  // Add frames
+  return displayState;
-  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();
 }
 
 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
+    //lastDisplayUpdate
-    // Don't do stuff if you are below your
+    display.clear();
-    // time budget.
+
-    Serial.println(remainingTimeBudget);
+    switch (displayState)
-    //delay(remainingTimeBudget);
+    {
+    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;
   }
 }

P1_gateway_FW/src/display.h

@@ -1,12 +1,23 @@
 #pragma once
 
 #include "Arduino.h"
-#include "OLEDDisplayUi.h"
+#include "SSD1306Wire.h"
-#include "SSD1306Wire.h" // legacy include: `#include "SSD1306.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);

P1_gateway_FW/src/images.h

@@ -1,35 +1,22 @@
 #pragma once
 
 #include "Arduino.h"
-#define WiFi_Logo_width 60
+
-#define WiFi_Logo_height 36
+
-const uint8_t WiFi_Logo_bits[] {
+#define wifiicon10x10_width 13
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8,
+#define wifiicon10x10_height 10
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00,
+const PROGMEM uint8_t wifi10x10_png_bits[] = {
-  0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
+    0xf0, 0x01, 0x0c, 0x06, 0x02, 0x08, 0xf0, 0x01, 0x08, 0x02, 0x00, 0x00,
-  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x40, 0x00, 0x00, 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 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,
     B00000000,

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();
 }

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*

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*

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*%
+%ADD11C,0.100000*%
-%ADD12C,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*

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*

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*

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*

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*
+X33442000Y15124000D02*
-X34790748Y10441000D01*
+X33442000Y13324000D01*
 X35313252Y11911000D02*
 X34790748Y11911000D01*
-X35313252Y16537000D02*
+X35313252Y10441000D02*
-X34790748Y16537000D01*
+X34790748Y10441000D01*
 X35313252Y18007000D02*
 X34790748Y18007000D01*
-X30522142Y9945900D02*
+X35313252Y16537000D02*
-X30996658Y9945900D01*
+X34790748Y16537000D01*
 X30522142Y8900900D02*
 X30996658Y8900900D01*
-X26432742Y16016500D02*
+X30522142Y9945900D02*
-X26907258Y16016500D01*
+X30996658Y9945900D01*
 X26432742Y14971500D02*
 X26907258Y14971500D01*
-X26432742Y9920500D02*
+X26432742Y16016500D02*
-X26907258Y9920500D01*
+X26907258Y16016500D01*
 X26432742Y8875500D02*
 X26907258Y8875500D01*
-X35035258Y8748500D02*
+X26432742Y9920500D02*
-X34560742Y8748500D01*
+X26907258Y9920500D01*
 X35035258Y9793500D02*
 X34560742Y9793500D01*
-X26432742Y14492500D02*
+X35035258Y8748500D02*
-X26907258Y14492500D01*
+X34560742Y8748500D01*
 X26432742Y13447500D02*
 X26907258Y13447500D01*
-X30996658Y10424900D02*
+X26432742Y14492500D02*
-X30522142Y10424900D01*
+X26907258Y14492500D01*
 X30996658Y11469900D02*
 X30522142Y11469900D01*
-X26432242Y2554500D02*
+X30996658Y10424900D02*
-X26906758Y2554500D01*
+X30522142Y10424900D01*
 X26432242Y1509500D02*
 X26906758Y1509500D01*
-X26432742Y11444500D02*
+X26432242Y2554500D02*
-X26907258Y11444500D01*
+X26906758Y2554500D01*
 X26432742Y10399500D02*
 X26907258Y10399500D01*
-X30717258Y16749500D02*
+X26432742Y11444500D02*
-X30242742Y16749500D01*
+X26907258Y11444500D01*
 X30717258Y17794500D02*
 X30242742Y17794500D01*
-X26097000Y4682000D02*
+X30717258Y16749500D02*
-X27997000Y4682000D01*
+X30242742Y16749500D01*
 X27497000Y7002000D02*
 X26097000Y7002000D01*
-X29204800Y13438600D02*
+X26097000Y4682000D02*
-X30134800Y13438600D01*
+X27997000Y4682000D01*
-X32364800Y13438600D02*
-X31434800Y13438600D01*
-X32364800Y13438600D02*
-X32364800Y15598600D01*
 X29204800Y13438600D02*
 X29204800Y14898600D01*
-X26529420Y12956000D02*
+X32364800Y13438600D02*
-X26810580Y12956000D01*
+X32364800Y15598600D01*
+X32364800Y13438600D02*
+X31434800Y13438600D01*
+X29204800Y13438600D02*
+X30134800Y13438600D01*
 X26529420Y11936000D02*
 X26810580Y11936000D01*
-X26529420Y4066000D02*
+X26529420Y12956000D02*
-X26810580Y4066000D01*
+X26810580Y12956000D01*
 X26529420Y3046000D02*
 X26810580Y3046000D01*
-X44013500Y2767500D02*
+X26529420Y4066000D02*
-X42483500Y2767500D01*
+X26810580Y4066000D01*
-X51033500Y3237500D02*
+X42013500Y3237500D02*
-X42013500Y3237500D01*
+X42013500Y16437500D01*
+X42013500Y16437500D02*
+X51033500Y16437500D01*
 D12*
-X50963500Y3237500D02*
+X59893500Y16437500D02*
-X51033500Y3237500D01*
-D10*
-X60013500Y3237500D02*
-X53233500Y3237500D01*
-X60013500Y16437500D02*
-X60013500Y3237500D01*
-D12*
-X60003500Y16437500D02*
 X60013500Y16437500D01*
 D10*
 X60013500Y16437500D02*
 X53233500Y16437500D01*
 D12*
-X59893500Y16437500D02*
+X60003500Y16437500D02*
 X60013500Y16437500D01*
 D10*
-X42013500Y16437500D02*
+X60013500Y16437500D02*
-X51033500Y16437500D01*
+X60013500Y3237500D01*
-X42013500Y3237500D02*
+X60013500Y3237500D02*
-X42013500Y16437500D01*
+X53233500Y3237500D01*
+D12*
+X50963500Y3237500D02*
+X51033500Y3237500D01*
+D10*
+X51033500Y3237500D02*
+X42013500Y3237500D01*
+X44013500Y2767500D02*
+X42483500Y2767500D01*
 D12*
 X34671057Y2081171D02*
 X34671057Y1595457D01*

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

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

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

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

P1_wifi/P1_wifi-cache.lib

@@ -1,32 +1,6 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# Connector_Conn_01x04_Male
-#
-DEF Connector_Conn_01x04_Male J 0 40 Y N 1 F N
-F0 "J" 0 200 50 H V C CNN
-F1 "Connector_Conn_01x04_Male" 0 -300 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Connector*:*_1x??_*
-$ENDFPLIST
-DRAW
-S 34 -195 0 -205 1 1 6 F
-S 34 -95 0 -105 1 1 6 F
-S 34 5 0 -5 1 1 6 F
-S 34 105 0 95 1 1 6 F
-P 2 1 1 6 50 -200 34 -200 N
-P 2 1 1 6 50 -100 34 -100 N
-P 2 1 1 6 50 0 34 0 N
-P 2 1 1 6 50 100 34 100 N
-X Pin_1 1 200 100 150 L 50 50 1 1 P
-X Pin_2 2 200 0 150 L 50 50 1 1 P
-X Pin_3 3 200 -100 150 L 50 50 1 1 P
-X Pin_4 4 200 -200 150 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # Connector_RJ12
 #
 DEF Connector_RJ12 J 0 40 Y Y 1 F N
@@ -207,6 +181,36 @@ X ~RST 9 -500 1100 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# P1_wifi-eagle-import_DISP_OLED_UG-2832HSWEG02
+#
+DEF P1_wifi-eagle-import_DISP_OLED_UG-2832HSWEG02 LCD 0 40 Y Y 1 L N
+F0 "LCD" -300 900 42 H V L BNN
+F1 "P1_wifi-eagle-import_DISP_OLED_UG-2832HSWEG02" -300 -800 42 H V L BNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+T 900 200 -400 42 0 1 0 "128x32 OLED Display" Normal 0 L B
+P 2 1 0 0 -300 -700 300 -700 N
+P 2 1 0 0 -300 800 -300 -700 N
+P 2 1 0 0 300 -700 300 800 N
+P 2 1 0 0 300 800 -300 800 N
+X C2+ 1 -400 700 100 R 50 50 1 0 B
+X SCL 10 -400 -200 100 R 50 50 1 0 B
+X SDA 11 -400 -300 100 R 50 50 1 0 B
+X IREF 12 -400 -400 100 R 50 50 1 0 B
+X VCOMH 13 -400 -500 100 R 50 50 1 0 W
+X VCC 14 -400 -600 100 R 50 50 1 0 W
+X C2- 2 -400 600 100 R 50 50 1 0 B
+X C1+ 3 -400 500 100 R 50 50 1 0 B
+X C1- 4 -400 400 100 R 50 50 1 0 B
+X VBAT 5 -400 300 100 R 50 50 1 0 W
+X VBREF 6 -400 200 100 R 50 50 1 0 W
+X VSS 7 -400 100 100 R 50 50 1 0 W
+X VDD 8 -400 0 100 R 50 50 1 0 W
+X RES# 9 -400 -100 100 R 50 50 1 0 B
+ENDDRAW
+ENDDEF
+#
 # Regulator_Linear_MIC5219-3.3YM5
 #
 DEF Regulator_Linear_MIC5219-3.3YM5 U 0 10 Y Y 1 F N

P1_wifi/P1_wifi-eagle-import.dcm

@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0
+#
+#End Doc Library

P1_wifi/P1_wifi.kicad_prl

@@ -0,0 +1,74 @@
+{
+  "board": {
+    "active_layer": 0,
+    "active_layer_preset": "",
+    "auto_track_width": true,
+    "hidden_nets": [],
+    "high_contrast_mode": 1,
+    "net_color_mode": 1,
+    "opacity": {
+      "pads": 1.0,
+      "tracks": 1.0,
+      "vias": 1.0,
+      "zones": 0.6
+    },
+    "ratsnest_display_mode": 0,
+    "selection_filter": {
+      "dimensions": true,
+      "footprints": true,
+      "graphics": true,
+      "keepouts": true,
+      "lockedItems": true,
+      "otherItems": true,
+      "pads": true,
+      "text": true,
+      "tracks": true,
+      "vias": true,
+      "zones": true
+    },
+    "visible_items": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      8,
+      9,
+      10,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      20,
+      21,
+      22,
+      23,
+      24,
+      25,
+      26,
+      27,
+      28,
+      29,
+      30,
+      32,
+      33,
+      34,
+      35,
+      36
+    ],
+    "visible_layers": "0009830_80000001",
+    "zone_display_mode": 0
+  },
+  "meta": {
+    "filename": "P1_wifi.kicad_prl",
+    "version": 3
+  },
+  "project": {
+    "files": []
+  }
+}

P1_wifi/P1_wifi.kicad_pro

@@ -0,0 +1,460 @@
+{
+  "board": {
+    "design_settings": {
+      "defaults": {
+        "board_outline_line_width": 0.049999999999999996,
+        "copper_line_width": 0.19999999999999998,
+        "copper_text_italic": false,
+        "copper_text_size_h": 1.5,
+        "copper_text_size_v": 1.5,
+        "copper_text_thickness": 0.3,
+        "copper_text_upright": false,
+        "courtyard_line_width": 0.049999999999999996,
+        "dimension_precision": 4,
+        "dimension_units": 3,
+        "dimensions": {
+          "arrow_length": 1270000,
+          "extension_offset": 500000,
+          "keep_text_aligned": true,
+          "suppress_zeroes": false,
+          "text_position": 0,
+          "units_format": 1
+        },
+        "fab_line_width": 0.09999999999999999,
+        "fab_text_italic": false,
+        "fab_text_size_h": 1.0,
+        "fab_text_size_v": 1.0,
+        "fab_text_thickness": 0.15,
+        "fab_text_upright": false,
+        "other_line_width": 0.09999999999999999,
+        "other_text_italic": false,
+        "other_text_size_h": 1.0,
+        "other_text_size_v": 1.0,
+        "other_text_thickness": 0.15,
+        "other_text_upright": false,
+        "pads": {
+          "drill": 0.762,
+          "height": 1.524,
+          "width": 1.524
+        },
+        "silk_line_width": 0.12,
+        "silk_text_italic": false,
+        "silk_text_size_h": 1.0,
+        "silk_text_size_v": 1.0,
+        "silk_text_thickness": 0.15,
+        "silk_text_upright": false,
+        "zones": {
+          "45_degree_only": false,
+          "min_clearance": 0.2032
+        }
+      },
+      "diff_pair_dimensions": [],
+      "drc_exclusions": [],
+      "meta": {
+        "filename": "board_design_settings.json",
+        "version": 2
+      },
+      "rule_severities": {
+        "annular_width": "error",
+        "clearance": "error",
+        "copper_edge_clearance": "error",
+        "courtyards_overlap": "error",
+        "diff_pair_gap_out_of_range": "error",
+        "diff_pair_uncoupled_length_too_long": "error",
+        "drill_out_of_range": "error",
+        "duplicate_footprints": "warning",
+        "extra_footprint": "warning",
+        "footprint_type_mismatch": "error",
+        "hole_clearance": "error",
+        "hole_near_hole": "error",
+        "invalid_outline": "error",
+        "item_on_disabled_layer": "error",
+        "items_not_allowed": "error",
+        "length_out_of_range": "error",
+        "malformed_courtyard": "error",
+        "microvia_drill_out_of_range": "error",
+        "missing_courtyard": "ignore",
+        "missing_footprint": "warning",
+        "net_conflict": "warning",
+        "npth_inside_courtyard": "ignore",
+        "padstack": "error",
+        "pth_inside_courtyard": "ignore",
+        "shorting_items": "error",
+        "silk_over_copper": "warning",
+        "silk_overlap": "warning",
+        "skew_out_of_range": "error",
+        "through_hole_pad_without_hole": "error",
+        "too_many_vias": "error",
+        "track_dangling": "warning",
+        "track_width": "error",
+        "tracks_crossing": "error",
+        "unconnected_items": "error",
+        "unresolved_variable": "error",
+        "via_dangling": "warning",
+        "zone_has_empty_net": "error",
+        "zones_intersect": "error"
+      },
+      "rule_severitieslegacy_courtyards_overlap": true,
+      "rule_severitieslegacy_no_courtyard_defined": false,
+      "rules": {
+        "allow_blind_buried_vias": false,
+        "allow_microvias": false,
+        "max_error": 0.005,
+        "min_clearance": 0.0,
+        "min_copper_edge_clearance": 0.024999999999999998,
+        "min_hole_clearance": 0.25,
+        "min_hole_to_hole": 0.25,
+        "min_microvia_diameter": 0.19999999999999998,
+        "min_microvia_drill": 0.09999999999999999,
+        "min_silk_clearance": 0.0,
+        "min_through_hole_diameter": 0.3,
+        "min_track_width": 0.2032,
+        "min_via_annular_width": 0.049999999999999996,
+        "min_via_diameter": 0.39999999999999997,
+        "use_height_for_length_calcs": true
+      },
+      "track_widths": [
+        0.0,
+        0.254,
+        0.4064
+      ],
+      "via_dimensions": [
+        {
+          "diameter": 0.0,
+          "drill": 0.0
+        },
+        {
+          "diameter": 0.6,
+          "drill": 0.3
+        },
+        {
+          "diameter": 0.8,
+          "drill": 0.4
+        }
+      ],
+      "zones_allow_external_fillets": false,
+      "zones_use_no_outline": true
+    },
+    "layer_presets": []
+  },
+  "boards": [],
+  "cvpcb": {
+    "equivalence_files": []
+  },
+  "erc": {
+    "erc_exclusions": [],
+    "meta": {
+      "version": 0
+    },
+    "pin_map": [
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        2,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        2,
+        2,
+        2,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        1,
+        0,
+        1,
+        2
+      ],
+      [
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        2,
+        1,
+        1,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        1,
+        1,
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1,
+        1,
+        1,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        2,
+        1,
+        2,
+        0,
+        0,
+        1,
+        0,
+        2,
+        2,
+        2,
+        2
+      ],
+      [
+        0,
+        2,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        2,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        2,
+        1,
+        1,
+        0,
+        0,
+        1,
+        0,
+        2,
+        0,
+        0,
+        2
+      ],
+      [
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2
+      ]
+    ],
+    "rule_severities": {
+      "bus_definition_conflict": "error",
+      "bus_entry_needed": "error",
+      "bus_label_syntax": "error",
+      "bus_to_bus_conflict": "error",
+      "bus_to_net_conflict": "error",
+      "different_unit_footprint": "error",
+      "different_unit_net": "error",
+      "duplicate_reference": "error",
+      "duplicate_sheet_names": "error",
+      "extra_units": "error",
+      "global_label_dangling": "warning",
+      "hier_label_mismatch": "error",
+      "label_dangling": "error",
+      "lib_symbol_issues": "warning",
+      "multiple_net_names": "warning",
+      "net_not_bus_member": "warning",
+      "no_connect_connected": "warning",
+      "no_connect_dangling": "warning",
+      "pin_not_connected": "error",
+      "pin_not_driven": "error",
+      "pin_to_pin": "warning",
+      "power_pin_not_driven": "error",
+      "similar_labels": "warning",
+      "unannotated": "error",
+      "unit_value_mismatch": "error",
+      "unresolved_variable": "error",
+      "wire_dangling": "error"
+    }
+  },
+  "libraries": {
+    "pinned_footprint_libs": [],
+    "pinned_symbol_libs": []
+  },
+  "meta": {
+    "filename": "P1_wifi.kicad_pro",
+    "version": 1
+  },
+  "net_settings": {
+    "classes": [
+      {
+        "bus_width": 12.0,
+        "clearance": 0.2032,
+        "diff_pair_gap": 0.2032,
+        "diff_pair_via_gap": 0.25,
+        "diff_pair_width": 0.2032,
+        "line_style": 0,
+        "microvia_diameter": 0.3048,
+        "microvia_drill": 0.1016,
+        "name": "Default",
+        "pcb_color": "rgba(0, 0, 0, 0.000)",
+        "schematic_color": "rgba(0, 0, 0, 0.000)",
+        "track_width": 0.254,
+        "via_diameter": 0.6,
+        "via_drill": 0.3,
+        "wire_width": 6.0
+      },
+      {
+        "bus_width": 12.0,
+        "clearance": 0.2032,
+        "diff_pair_gap": 0.2032,
+        "diff_pair_via_gap": 0.25,
+        "diff_pair_width": 0.2032,
+        "line_style": 0,
+        "microvia_diameter": 0.3048,
+        "microvia_drill": 0.1016,
+        "name": "POWER",
+        "nets": [
+          "+3V3",
+          "+5V",
+          "GND"
+        ],
+        "pcb_color": "rgba(0, 0, 0, 0.000)",
+        "schematic_color": "rgba(0, 0, 0, 0.000)",
+        "track_width": 0.254,
+        "via_diameter": 0.8,
+        "via_drill": 0.4,
+        "wire_width": 6.0
+      }
+    ],
+    "meta": {
+      "version": 2
+    },
+    "net_colors": null
+  },
+  "pcbnew": {
+    "last_paths": {
+      "gencad": "",
+      "idf": "",
+      "netlist": "",
+      "specctra_dsn": "",
+      "step": "",
+      "vrml": ""
+    },
+    "page_layout_descr_file": ""
+  },
+  "schematic": {
+    "annotate_start_num": 0,
+    "drawing": {
+      "default_line_thickness": 6.0,
+      "default_text_size": 50.0,
+      "field_names": [],
+      "intersheets_ref_own_page": false,
+      "intersheets_ref_prefix": "",
+      "intersheets_ref_short": false,
+      "intersheets_ref_show": false,
+      "intersheets_ref_suffix": "",
+      "junction_size_choice": 3,
+      "label_size_ratio": 0.25,
+      "pin_symbol_size": 0.0,
+      "text_offset_ratio": 0.08
+    },
+    "legacy_lib_dir": "",
+    "legacy_lib_list": [],
+    "meta": {
+      "version": 1
+    },
+    "net_format_name": "",
+    "ngspice": {
+      "fix_include_paths": true,
+      "fix_passive_vals": false,
+      "meta": {
+        "version": 0
+      },
+      "model_mode": 0,
+      "workbook_filename": ""
+    },
+    "page_layout_descr_file": "empty.kicad_wks",
+    "plot_directory": "",
+    "spice_adjust_passive_values": false,
+    "spice_external_command": "spice \"%I\"",
+    "subpart_first_id": 65,
+    "subpart_id_separator": 0
+  },
+  "sheets": [
+    [
+      "89b56c87-e3c8-4fd6-a3d6-245c2a24deb0",
+      ""
+    ]
+  ],
+  "text_variables": {}
+}

P1_wifi/P1_wifi.pro

@@ -1,4 +1,4 @@
-update=2021 April 30, Friday 14:03:15
+update=2021 September 28, Tuesday 10:20:38
 version=1
 last_client=kicad
 [general]
@@ -12,16 +12,6 @@ NetIExt=net
 version=1
 LibDir=
 [eeschema/libraries]
-[schematic_editor]
-version=1
-PageLayoutDescrFile=
-PlotDirectoryName=
-SubpartIdSeparator=0
-SubpartFirstId=65
-NetFmtName=
-SpiceAjustPassiveValues=0
-LabSize=50
-ERC_TestSimilarLabels=1
 [pcbnew]
 version=1
 PageLayoutDescrFile=
@@ -263,3 +253,13 @@ uViaDrill=0.1016
 dPairWidth=0.2032
 dPairGap=0.2032
 dPairViaGap=0.25
+[schematic_editor]
+version=1
+PageLayoutDescrFile=empty.kicad_wks
+PlotDirectoryName=
+SubpartIdSeparator=0
+SubpartFirstId=65
+NetFmtName=
+SpiceAjustPassiveValues=0
+LabSize=50
+ERC_TestSimilarLabels=1

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
@@ -569,7 +569,6 @@ Wire Wire Line
 	2150 4300 2150 4250
 NoConn ~ 1250 3150
 NoConn ~ 1250 3350
-NoConn ~ 1250 3650
 $Comp
 L power:GND #PWR0104
 U 1 1 60BCD1DA
@@ -714,17 +713,6 @@ F 3 "" H 10200 3450 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	10200 3450 10200 3350
-$Comp
-L Connector:Conn_01x04_Male J3
-U 1 1 60CAF614
-P 2050 1400
-F 0 "J3" H 2022 1282 50  0000 R CNN
-F 1 "Conn_01x04_Male" H 2022 1373 50  0000 R CNN
-F 2 "MySymbols:OLED_I2C_128x32" H 2050 1400 50  0001 C CNN
-F 3 "~" H 2050 1400 50  0001 C CNN
-	1    2050 1400
-	1    0    0    1   
-$EndComp
 Wire Wire Line
 	950  3550 1250 3550
 Text Label 3400 3350 2    50   ~ 0
@@ -735,44 +723,32 @@ Wire Wire Line
 	3400 3250 3050 3250
 Wire Wire Line
 	3400 3350 3050 3350
-Text Label 2650 1300 2    50   ~ 0
+Text Label 9250 6400 0    50   ~ 0
 ESP_SCL
-Text Label 2650 1200 2    50   ~ 0
+Text Label 9250 6500 0    50   ~ 0
 EPS_SDA
 $Comp
 L power:+3.3V #PWR01
 U 1 1 60CC9A0A
-P 2800 1150
+P 8750 5850
-F 0 "#PWR01" H 2800 1000 50  0001 C CNN
+F 0 "#PWR01" H 8750 5700 50  0001 C CNN
-F 1 "+3.3V" V 2815 1278 50  0000 L CNN
+F 1 "+3.3V" V 8765 5978 50  0000 L CNN
-F 2 "" H 2800 1150 50  0001 C CNN
+F 2 "" H 8750 5850 50  0001 C CNN
-F 3 "" H 2800 1150 50  0001 C CNN
+F 3 "" H 8750 5850 50  0001 C CNN
-	1    2800 1150
+	1    8750 5850
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	2650 1200 2250 1200
-Wire Wire Line
-	2650 1300 2250 1300
-Wire Wire Line
-	2800 1150 2800 1400
-Wire Wire Line
-	2800 1400 2250 1400
 $Comp
 L power:GND #PWR010
 U 1 1 60CF9541
-P 2800 1550
+P 7900 7450
-F 0 "#PWR010" H 2800 1300 50  0001 C CNN
+F 0 "#PWR010" H 7900 7200 50  0001 C CNN
-F 1 "GND" H 2805 1377 50  0000 C CNN
+F 1 "GND" H 7905 7277 50  0000 C CNN
-F 2 "" H 2800 1550 50  0001 C CNN
+F 2 "" H 7900 7450 50  0001 C CNN
-F 3 "" H 2800 1550 50  0001 C CNN
+F 3 "" H 7900 7450 50  0001 C CNN
-	1    2800 1550
+	1    7900 7450
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	2800 1550 2800 1500
-Wire Wire Line
-	2800 1500 2250 1500
 $Comp
 L Regulator_Linear:MIC5219-3.3YM5 U2
 U 1 1 60DC1061
@@ -852,7 +828,197 @@ 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
+$Comp
+L P1_wifi-eagle-import:DISP_OLED_UG-2832HSWEG02 LCD1
+U 1 1 6153C2F2
+P 10100 6200
+F 0 "LCD1" H 10428 6290 42  0000 L CNN
+F 1 "DISP_OLED_UG-2832HSWEG02" H 10428 6211 42  0000 L CNN
+F 2 "Display:SSD1306_OLED-0.91-128x32_bend" H 10200 5450 50  0001 C CNN
+F 3 "" H 10100 6200 50  0001 C CNN
+	1    10100 6200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9250 6500 9700 6500
+Wire Wire Line
+	9700 5900 8750 5900
+Wire Wire Line
+	8750 5900 8750 5850
+Wire Wire Line
+	9750 6200 9700 6200
+Wire Wire Line
+	8750 6200 8750 5900
+Connection ~ 9700 6200
+Wire Wire Line
+	9700 6200 8750 6200
+Connection ~ 8750 5900
+$Comp
+L Device:C C5
+U 1 1 615551C0
+P 8450 5900
+F 0 "C5" V 8198 5900 50  0000 C CNN
+F 1 "1uF" V 8289 5900 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 8488 5750 50  0001 C CNN
+F 3 "~" H 8450 5900 50  0001 C CNN
+	1    8450 5900
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:C C6
+U 1 1 61555C46
+P 8250 6200
+F 0 "C6" V 8500 6200 50  0000 C CNN
+F 1 "1uF" V 8400 6200 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 8288 6050 50  0001 C CNN
+F 3 "~" H 8250 6200 50  0001 C CNN
+	1    8250 6200
+	0    1    -1   0   
+$EndComp
+Wire Wire Line
+	8750 5900 8600 5900
+Wire Wire Line
+	8750 6200 8400 6200
+Connection ~ 8750 6200
+Wire Wire Line
+	8100 6200 7900 6200
+Wire Wire Line
+	7900 6200 7900 6600
+Wire Wire Line
+	8300 5900 7900 5900
+Wire Wire Line
+	7900 5900 7900 6100
+Connection ~ 7900 6200
+$Comp
+L Device:C C9
+U 1 1 6156C45C
+P 8650 6700
+F 0 "C9" V 8900 6700 50  0000 C CNN
+F 1 "10uF" V 8800 6700 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 8688 6550 50  0001 C CNN
+F 3 "~" H 8650 6700 50  0001 C CNN
+	1    8650 6700
+	0    1    -1   0   
+$EndComp
+$Comp
+L Device:C C7
+U 1 1 6156D10F
+P 8250 6800
+F 0 "C7" V 8500 6800 50  0000 C CNN
+F 1 "10uF" V 8400 6800 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 8288 6650 50  0001 C CNN
+F 3 "~" H 8250 6800 50  0001 C CNN
+	1    8250 6800
+	0    1    -1   0   
+$EndComp
+Wire Wire Line
+	9700 6800 8500 6800
+Wire Wire Line
+	8800 6700 9700 6700
+Wire Wire Line
+	8500 6700 7900 6700
+Connection ~ 7900 6700
+Wire Wire Line
+	7900 6700 7900 6800
+Wire Wire Line
+	8100 6800 7900 6800
+Connection ~ 7900 6800
+Wire Wire Line
+	7900 6800 7900 7250
+Wire Wire Line
+	9700 6400 9250 6400
+$Comp
+L Device:R R10
+U 1 1 6158C8A1
+P 9000 6600
+F 0 "R10" V 9100 6650 50  0000 C CNN
+F 1 "560K" V 9100 6500 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 8930 6600 50  0001 C CNN
+F 3 "~" H 9000 6600 50  0001 C CNN
+	1    9000 6600
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	9150 6600 9700 6600
+Wire Wire Line
+	8850 6600 7900 6600
+Connection ~ 7900 6600
+Wire Wire Line
+	7900 6600 7900 6700
+Wire Wire Line
+	9700 6100 7900 6100
+Connection ~ 7900 6100
+Wire Wire Line
+	7900 6100 7900 6200
+$Comp
+L Device:C C11
+U 1 1 61599E55
+P 9400 5500
+F 0 "C11" V 9148 5500 50  0000 C CNN
+F 1 "1uF" V 9239 5500 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 9438 5350 50  0001 C CNN
+F 3 "~" H 9400 5500 50  0001 C CNN
+	1    9400 5500
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:C C10
+U 1 1 6159A39E
+P 9150 5700
+F 0 "C10" V 8898 5700 50  0000 C CNN
+F 1 "1uF" V 8989 5700 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 9188 5550 50  0001 C CNN
+F 3 "~" H 9150 5700 50  0001 C CNN
+	1    9150 5700
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	9000 5700 8950 5700
+Wire Wire Line
+	8950 5700 8950 5800
+Wire Wire Line
+	8950 5800 9700 5800
+Wire Wire Line
+	9700 5700 9300 5700
+Wire Wire Line
+	9250 5600 9700 5600
+Wire Wire Line
+	9250 5500 9250 5600
+Wire Wire Line
+	9700 5500 9550 5500
+$Comp
+L Device:C C8
+U 1 1 615B16C7
+P 8250 7250
+F 0 "C8" V 8500 7250 50  0000 C CNN
+F 1 "100nF" V 8400 7250 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 8288 7100 50  0001 C CNN
+F 3 "~" H 8250 7250 50  0001 C CNN
+	1    8250 7250
+	0    1    -1   0   
+$EndComp
+Wire Wire Line
+	8100 7250 7900 7250
+Connection ~ 7900 7250
+Wire Wire Line
+	7900 7250 7900 7450
+Wire Wire Line
+	8400 7250 8500 7250
+Wire Wire Line
+	8500 7250 8500 6800
+Connection ~ 8500 6800
+Wire Wire Line
+	8500 6800 8400 6800
+Text Label 9250 6300 0    50   ~ 0
+OLED_RST
+Wire Wire Line
+	9250 6300 9700 6300
+NoConn ~ 9700 6000
+Text Label 950  3650 0    50   ~ 0
+OLED_RST
+Wire Wire Line
+	1250 3650 950  3650
 $EndSCHEMATC

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
+P 7100 2550
-F 0 "J2" H 5370 5389 50  0000 R CNN
+F 0 "J2" H 6870 2539 50  0000 R CNN
-F 1 "USB_B_Micro" H 5370 5298 50  0000 R CNN
+F 1 "USB_B_Micro" H 6870 2448 50  0000 R CNN
-F 2 "MySymbols:USB_Micro_B_Female" H 5750 5350 50  0001 C CNN
+F 2 "MySymbols:USB_Micro_B_Female" H 7250 2500 50  0001 C CNN
-F 3 "~" H 5750 5350 50  0001 C CNN
+F 3 "~" H 7250 2500 50  0001 C CNN
-	1    5600 5400
+	1    7100 2550
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+5V #PWR012
 U 1 1 603E164F
-P 5950 5050
+P 7450 2200
-F 0 "#PWR012" H 5950 4900 50  0001 C CNN
+F 0 "#PWR012" H 7450 2050 50  0001 C CNN
-F 1 "+5V" H 5965 5223 50  0000 C CNN
+F 1 "+5V" H 7465 2373 50  0000 C CNN
-F 2 "" H 5950 5050 50  0001 C CNN
+F 2 "" H 7450 2200 50  0001 C CNN
-F 3 "" H 5950 5050 50  0001 C CNN
+F 3 "" H 7450 2200 50  0001 C CNN
-	1    5950 5050
+	1    7450 2200
 	-1   0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR013
 U 1 1 603E1F73
-P 5900 5900
+P 7400 3050
-F 0 "#PWR013" H 5900 5650 50  0001 C CNN
+F 0 "#PWR013" H 7400 2800 50  0001 C CNN
-F 1 "GND" H 5905 5727 50  0000 C CNN
+F 1 "GND" H 7405 2877 50  0000 C CNN
-F 2 "" H 5900 5900 50  0001 C CNN
+F 2 "" H 7400 3050 50  0001 C CNN
-F 3 "" H 5900 5900 50  0001 C CNN
+F 3 "" H 7400 3050 50  0001 C CNN
-	1    5900 5900
+	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
+	7400 3000 7400 3050
-Connection ~ 5600 5850
+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
+	7400 2750 7400 3000
-Connection ~ 5900 5850
+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 "" V 4350 3250 50  0001 C CNN "DNP"
 	1    4350 3250
 	0    1    1    0   
 $EndComp
@@ -568,7 +569,6 @@ Wire Wire Line
 	2150 4300 2150 4250
 NoConn ~ 1250 3150
 NoConn ~ 1250 3350
-NoConn ~ 1250 3650
 $Comp
 L power:GND #PWR0104
 U 1 1 60BCD1DA
@@ -640,9 +640,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 +659,28 @@ Wire Wire Line
 $Comp
 L Device:R R9
 U 1 1 60C0A451
-P 9900 3200
+P 10200 3200
-F 0 "R9" V 9800 3150 50  0000 C CNN
+F 0 "R9" V 10100 3150 50  0000 C CNN
-F 1 "10K" V 9800 3300 50  0000 C CNN
+F 1 "10K" V 10100 3300 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9830 3200 50  0001 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 10130 3200 50  0001 C CNN
-F 3 "~" H 9900 3200 50  0001 C CNN
+F 3 "~" H 10200 3200 50  0001 C CNN
-	1    9900 3200
+	1    10200 3200
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	9900 3050 9900 2950
+	10200 3050 10200 2950
-Wire Wire Line
+Text Label 7600 2550 2    50   ~ 0
-	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
 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
+	7600 2550 7400 2550
-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
 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,27 +703,16 @@ Wire Wire Line
 $Comp
 L power:GND #PWR0111
 U 1 1 60C737B3
-P 9900 3450
+P 10200 3450
-F 0 "#PWR0111" H 9900 3200 50  0001 C CNN
+F 0 "#PWR0111" H 10200 3200 50  0001 C CNN
-F 1 "GND" H 9905 3277 50  0000 C CNN
+F 1 "GND" H 10205 3277 50  0000 C CNN
-F 2 "" H 9900 3450 50  0001 C CNN
+F 2 "" H 10200 3450 50  0001 C CNN
-F 3 "" H 9900 3450 50  0001 C CNN
+F 3 "" H 10200 3450 50  0001 C CNN
-	1    9900 3450
+	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
-P 2050 1400
-F 0 "J3" H 2022 1282 50  0000 R CNN
-F 1 "Conn_01x04_Male" H 2022 1373 50  0000 R CNN
-F 2 "MySymbols:OLED_I2C_128x32" H 2050 1400 50  0001 C CNN
-F 3 "~" H 2050 1400 50  0001 C CNN
-	1    2050 1400
-	1    0    0    1   
-$EndComp
 Wire Wire Line
 	950  3550 1250 3550
 Text Label 3400 3350 2    50   ~ 0
@@ -800,54 +723,42 @@ Wire Wire Line
 	3400 3250 3050 3250
 Wire Wire Line
 	3400 3350 3050 3350
-Text Label 2650 1200 2    50   ~ 0
+Text Label 9250 6400 0    50   ~ 0
 ESP_SCL
-Text Label 2650 1300 2    50   ~ 0
+Text Label 9250 6500 0    50   ~ 0
 EPS_SDA
 $Comp
 L power:+3.3V #PWR01
 U 1 1 60CC9A0A
-P 2800 1150
+P 8750 5850
-F 0 "#PWR01" H 2800 1000 50  0001 C CNN
+F 0 "#PWR01" H 8750 5700 50  0001 C CNN
-F 1 "+3.3V" V 2815 1278 50  0000 L CNN
+F 1 "+3.3V" V 8765 5978 50  0000 L CNN
-F 2 "" H 2800 1150 50  0001 C CNN
+F 2 "" H 8750 5850 50  0001 C CNN
-F 3 "" H 2800 1150 50  0001 C CNN
+F 3 "" H 8750 5850 50  0001 C CNN
-	1    2800 1150
+	1    8750 5850
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	2650 1200 2250 1200
-Wire Wire Line
-	2650 1300 2250 1300
-Wire Wire Line
-	2800 1150 2800 1400
-Wire Wire Line
-	2800 1400 2250 1400
 $Comp
 L power:GND #PWR010
 U 1 1 60CF9541
-P 2800 1550
+P 7900 7450
-F 0 "#PWR010" H 2800 1300 50  0001 C CNN
+F 0 "#PWR010" H 7900 7200 50  0001 C CNN
-F 1 "GND" H 2805 1377 50  0000 C CNN
+F 1 "GND" H 7905 7277 50  0000 C CNN
-F 2 "" H 2800 1550 50  0001 C CNN
+F 2 "" H 7900 7450 50  0001 C CNN
-F 3 "" H 2800 1550 50  0001 C CNN
+F 3 "" H 7900 7450 50  0001 C CNN
-	1    2800 1550
+	1    7900 7450
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	2800 1550 2800 1500
-Wire Wire Line
-	2800 1500 2250 1500
 $Comp
 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 +802,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 +827,198 @@ 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
+$Comp
+L P1_wifi-eagle-import:DISP_OLED_UG-2832HSWEG02 LCD1
+U 1 1 6153C2F2
+P 10100 6200
+F 0 "LCD1" H 10428 6290 42  0000 L CNN
+F 1 "DISP_OLED_UG-2832HSWEG02" H 10428 6211 42  0000 L CNN
+F 2 "Display:SSD1306_OLED-0.91-128x32_bend" H 10200 5450 50  0001 C CNN
+F 3 "" H 10100 6200 50  0001 C CNN
+	1    10100 6200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9250 6500 9700 6500
+Wire Wire Line
+	9700 5900 8750 5900
+Wire Wire Line
+	8750 5900 8750 5850
+Wire Wire Line
+	9750 6200 9700 6200
+Wire Wire Line
+	8750 6200 8750 5900
+Connection ~ 9700 6200
+Wire Wire Line
+	9700 6200 8750 6200
+Connection ~ 8750 5900
+$Comp
+L Device:C C5
+U 1 1 615551C0
+P 8450 5900
+F 0 "C5" V 8198 5900 50  0000 C CNN
+F 1 "1uF" V 8289 5900 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 8488 5750 50  0001 C CNN
+F 3 "~" H 8450 5900 50  0001 C CNN
+	1    8450 5900
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:C C6
+U 1 1 61555C46
+P 8250 6200
+F 0 "C6" V 8500 6200 50  0000 C CNN
+F 1 "1uF" V 8400 6200 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 8288 6050 50  0001 C CNN
+F 3 "~" H 8250 6200 50  0001 C CNN
+	1    8250 6200
+	0    1    -1   0   
+$EndComp
+Wire Wire Line
+	8750 5900 8600 5900
+Wire Wire Line
+	8750 6200 8400 6200
+Connection ~ 8750 6200
+Wire Wire Line
+	8100 6200 7900 6200
+Wire Wire Line
+	7900 6200 7900 6600
+Wire Wire Line
+	8300 5900 7900 5900
+Wire Wire Line
+	7900 5900 7900 6100
+Connection ~ 7900 6200
+$Comp
+L Device:C C9
+U 1 1 6156C45C
+P 8650 6700
+F 0 "C9" V 8900 6700 50  0000 C CNN
+F 1 "10uF" V 8800 6700 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 8688 6550 50  0001 C CNN
+F 3 "~" H 8650 6700 50  0001 C CNN
+	1    8650 6700
+	0    1    -1   0   
+$EndComp
+$Comp
+L Device:C C7
+U 1 1 6156D10F
+P 8250 6800
+F 0 "C7" V 8500 6800 50  0000 C CNN
+F 1 "10uF" V 8400 6800 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 8288 6650 50  0001 C CNN
+F 3 "~" H 8250 6800 50  0001 C CNN
+	1    8250 6800
+	0    1    -1   0   
+$EndComp
+Wire Wire Line
+	9700 6800 8500 6800
+Wire Wire Line
+	8800 6700 9700 6700
+Wire Wire Line
+	8500 6700 7900 6700
+Connection ~ 7900 6700
+Wire Wire Line
+	7900 6700 7900 6800
+Wire Wire Line
+	8100 6800 7900 6800
+Connection ~ 7900 6800
+Wire Wire Line
+	7900 6800 7900 7250
+Wire Wire Line
+	9700 6400 9250 6400
+$Comp
+L Device:R R10
+U 1 1 6158C8A1
+P 9000 6600
+F 0 "R10" V 9100 6650 50  0000 C CNN
+F 1 "560K" V 9100 6500 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 8930 6600 50  0001 C CNN
+F 3 "~" H 9000 6600 50  0001 C CNN
+	1    9000 6600
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	9150 6600 9700 6600
+Wire Wire Line
+	8850 6600 7900 6600
+Connection ~ 7900 6600
+Wire Wire Line
+	7900 6600 7900 6700
+Wire Wire Line
+	9700 6100 7900 6100
+Connection ~ 7900 6100
+Wire Wire Line
+	7900 6100 7900 6200
+$Comp
+L Device:C C11
+U 1 1 61599E55
+P 9400 5500
+F 0 "C11" V 9148 5500 50  0000 C CNN
+F 1 "1uF" V 9239 5500 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 9438 5350 50  0001 C CNN
+F 3 "~" H 9400 5500 50  0001 C CNN
+	1    9400 5500
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:C C10
+U 1 1 6159A39E
+P 9150 5700
+F 0 "C10" V 8898 5700 50  0000 C CNN
+F 1 "1uF" V 8989 5700 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 9188 5550 50  0001 C CNN
+F 3 "~" H 9150 5700 50  0001 C CNN
+	1    9150 5700
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	9000 5700 8950 5700
+Wire Wire Line
+	8950 5700 8950 5800
+Wire Wire Line
+	8950 5800 9700 5800
+Wire Wire Line
+	9700 5700 9300 5700
+Wire Wire Line
+	9250 5600 9700 5600
+Wire Wire Line
+	9250 5500 9250 5600
+Wire Wire Line
+	9700 5500 9550 5500
+$Comp
+L Device:C C8
+U 1 1 615B16C7
+P 8250 7250
+F 0 "C8" V 8500 7250 50  0000 C CNN
+F 1 "100nF" V 8400 7250 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 8288 7100 50  0001 C CNN
+F 3 "~" H 8250 7250 50  0001 C CNN
+	1    8250 7250
+	0    1    -1   0   
+$EndComp
+Wire Wire Line
+	8100 7250 7900 7250
+Connection ~ 7900 7250
+Wire Wire Line
+	7900 7250 7900 7450
+Wire Wire Line
+	8400 7250 8500 7250
+Wire Wire Line
+	8500 7250 8500 6800
+Connection ~ 8500 6800
+Wire Wire Line
+	8500 6800 8400 6800
+Text Label 9250 6300 0    50   ~ 0
+OLED_RST
+Wire Wire Line
+	9250 6300 9700 6300
+NoConn ~ 9700 6000
+Text Label 950  3650 0    50   ~ 0
+OLED_RST
+Wire Wire Line
+	1250 3650 950  3650
 $EndSCHEMATC

P1_wifi/empty.kicad_wks

@@ -0,0 +1,5 @@
+(page_layout
+(setup (textsize 1.5 1.5)(linewidth 0.15)(textlinewidth 0.15)
+(left_margin 10)(right_margin 10)(top_margin 10)(bottom_margin 10))
+(line (name segm1:Line) (start 0 0) (end 0 0))
+)

P1_wifi/sym-lib-table

@@ -1,3 +1,4 @@
 (sym_lib_table
   (lib (name P1_wifi-rescue)(type Legacy)(uri ${KIPRJMOD}/P1_wifi-rescue.lib)(options "")(descr ""))
+  (lib (name P1_wifi-eagle-import)(type Legacy)(uri ${KIPRJMOD}/P1_wifi-eagle-import.lib)(options "")(descr ""))
 )