diff --git a/MCU_Microchip_SAMD.dcm b/MCU_Microchip_SAMD.dcm
index 815a663562..7ada6b3ec9 100644
--- a/MCU_Microchip_SAMD.dcm
+++ b/MCU_Microchip_SAMD.dcm
@@ -1,9 +1,9 @@
-EESchema-DOCLIB  Version 2.0
-#
-$CMP ATSAMD21G18A-AUT
-D SAM D21 Microchip SMART ARM-based Flash MCU, 48Mhz, 256K Flash, 32K SRAM, TQFP-48
-K 32-bit ARM Cortex-M0+ MCU Microcontroller
-F http://ww1.microchip.com/downloads/en/DeviceDoc/SAMD21-Family-DataSheet-DS40001882D.pdf
-$ENDCMP
-#
-#End Doc Library
+EESchema-DOCLIB  Version 2.0
+#
+$CMP ATSAMD21G18A-AUT
+D SAM D21 Microchip SMART ARM-based Flash MCU, 48Mhz, 256K Flash, 32K SRAM, TQFP-48
+K 32-bit ARM Cortex-M0+ MCU Microcontroller
+F http://ww1.microchip.com/downloads/en/DeviceDoc/SAMD21-Family-DataSheet-DS40001882D.pdf
+$ENDCMP
+#
+#End Doc Library
diff --git a/MCU_Microchip_SAMD.lib b/MCU_Microchip_SAMD.lib
index 01747c1775..9e1cca1d88 100644
--- a/MCU_Microchip_SAMD.lib
+++ b/MCU_Microchip_SAMD.lib
@@ -1,67 +1,67 @@
-EESchema-LIBRARY Version 2.4
-#encoding utf-8
-#
-# ATSAMD21G18A-AUT
-#
-DEF ATSAMD21G18A-AUT U 0 20 Y Y 1 F N
-F0 "U" -700 1750 50 H V C CNN
-F1 "ATSAMD21G18A-AUT" 600 1750 50 H V C CNN
-F2 "Package_QFP:TQFP-48_7x7mm_P0.5mm" -950 -1750 50 H I C CNN
-F3 "" 0 1000 50 H I C CNN
-$FPLIST
- TQFP*7x7mm*P0.5mm*
-$ENDFPLIST
-DRAW
-S -800 1700 800 -1700 0 1 10 f
-X PA00 1 -1000 1600 200 R 50 50 1 1 B
-X PA05 10 -1000 1100 200 R 50 50 1 1 B
-X PA06 11 -1000 1000 200 R 50 50 1 1 B
-X PA07 12 -1000 900 200 R 50 50 1 1 B
-X PA08 13 -1000 800 200 R 50 50 1 1 B
-X PA09 14 -1000 700 200 R 50 50 1 1 B
-X PA10 15 -1000 600 200 R 50 50 1 1 B
-X PA11 16 -1000 500 200 R 50 50 1 1 B
-X VDDIO 17 -200 1900 200 D 50 50 1 1 W
-X GND 18 -100 -1900 200 U 50 50 1 1 W
-X PB10 19 1000 1200 200 L 50 50 1 1 B
-X PA01 2 -1000 1500 200 R 50 50 1 1 B
-X PB11 20 1000 1100 200 L 50 50 1 1 B
-X PA12 21 -1000 400 200 R 50 50 1 1 B
-X PA13 22 -1000 300 200 R 50 50 1 1 B
-X PA14 23 -1000 200 200 R 50 50 1 1 B
-X PA15 24 -1000 100 200 R 50 50 1 1 B
-X PA16 25 -1000 0 200 R 50 50 1 1 B
-X PA17 26 -1000 -100 200 R 50 50 1 1 B
-X PA18 27 -1000 -200 200 R 50 50 1 1 B
-X PA19 28 -1000 -300 200 R 50 50 1 1 B
-X PA20 29 -1000 -400 200 R 50 50 1 1 B
-X PA02 3 -1000 1400 200 R 50 50 1 1 B
-X PA21 30 -1000 -500 200 R 50 50 1 1 B
-X PA22 31 -1000 -600 200 R 50 50 1 1 B
-X PA23 32 -1000 -700 200 R 50 50 1 1 B
-X PA24 33 -1000 -800 200 R 50 50 1 1 B
-X PA25 34 -1000 -900 200 R 50 50 1 1 B
-X GND 35 -100 -1900 200 U 50 50 1 1 P N
-X VDDIO 36 -200 1900 200 D 50 50 1 1 P N
-X PB22 37 1000 1000 200 L 50 50 1 1 B
-X PB23 38 1000 900 200 L 50 50 1 1 B
-X PA27 39 -1000 -1000 200 R 50 50 1 1 B
-X PA03 4 -1000 1300 200 R 50 50 1 1 B
-X ~RESET 40 -1000 -1500 200 R 50 50 1 1 I
-X PA28 41 -1000 -1100 200 R 50 50 1 1 B
-X GND 42 -100 -1900 200 U 50 50 1 1 P N
-X VDDCORE 43 200 1900 200 D 50 50 1 1 w
-X VDDIN 44 -100 1900 200 D 50 50 1 1 W
-X PA30 45 -1000 -1200 200 R 50 50 1 1 B
-X PA31 46 -1000 -1300 200 R 50 50 1 1 B
-X PB02 47 1000 1600 200 L 50 50 1 1 B
-X PB03 48 1000 1500 200 L 50 50 1 1 B
-X GNDANA 5 100 -1900 200 U 50 50 1 1 W
-X VDDANA 6 100 1900 200 D 50 50 1 1 W
-X PB08 7 1000 1400 200 L 50 50 1 1 B
-X PB09 8 1000 1300 200 L 50 50 1 1 B
-X PA04 9 -1000 1200 200 R 50 50 1 1 B
-ENDDRAW
-ENDDEF
-#
-#End Library
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# ATSAMD21G18A-AUT
+#
+DEF ATSAMD21G18A-AUT U 0 20 Y Y 1 F N
+F0 "U" -700 1750 50 H V C CNN
+F1 "ATSAMD21G18A-AUT" 600 1750 50 H V C CNN
+F2 "Package_QFP:TQFP-48_7x7mm_P0.5mm" -950 -1750 50 H I C CNN
+F3 "" 0 1000 50 H I C CNN
+$FPLIST
+ TQFP*7x7mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -800 1700 800 -1700 0 1 10 f
+X PA00 1 -1000 1600 200 R 50 50 1 1 B
+X PA05 10 -1000 1100 200 R 50 50 1 1 B
+X PA06 11 -1000 1000 200 R 50 50 1 1 B
+X PA07 12 -1000 900 200 R 50 50 1 1 B
+X PA08 13 -1000 800 200 R 50 50 1 1 B
+X PA09 14 -1000 700 200 R 50 50 1 1 B
+X PA10 15 -1000 600 200 R 50 50 1 1 B
+X PA11 16 -1000 500 200 R 50 50 1 1 B
+X VDDIO 17 -200 1900 200 D 50 50 1 1 W
+X GND 18 -100 -1900 200 U 50 50 1 1 W
+X PB10 19 1000 1200 200 L 50 50 1 1 B
+X PA01 2 -1000 1500 200 R 50 50 1 1 B
+X PB11 20 1000 1100 200 L 50 50 1 1 B
+X PA12 21 -1000 400 200 R 50 50 1 1 B
+X PA13 22 -1000 300 200 R 50 50 1 1 B
+X PA14 23 -1000 200 200 R 50 50 1 1 B
+X PA15 24 -1000 100 200 R 50 50 1 1 B
+X PA16 25 -1000 0 200 R 50 50 1 1 B
+X PA17 26 -1000 -100 200 R 50 50 1 1 B
+X PA18 27 -1000 -200 200 R 50 50 1 1 B
+X PA19 28 -1000 -300 200 R 50 50 1 1 B
+X PA20 29 -1000 -400 200 R 50 50 1 1 B
+X PA02 3 -1000 1400 200 R 50 50 1 1 B
+X PA21 30 -1000 -500 200 R 50 50 1 1 B
+X PA22 31 -1000 -600 200 R 50 50 1 1 B
+X PA23 32 -1000 -700 200 R 50 50 1 1 B
+X PA24 33 -1000 -800 200 R 50 50 1 1 B
+X PA25 34 -1000 -900 200 R 50 50 1 1 B
+X GND 35 -100 -1900 200 U 50 50 1 1 P N
+X VDDIO 36 -200 1900 200 D 50 50 1 1 P N
+X PB22 37 1000 1000 200 L 50 50 1 1 B
+X PB23 38 1000 900 200 L 50 50 1 1 B
+X PA27 39 -1000 -1000 200 R 50 50 1 1 B
+X PA03 4 -1000 1300 200 R 50 50 1 1 B
+X ~RESET 40 -1000 -1500 200 R 50 50 1 1 I
+X PA28 41 -1000 -1100 200 R 50 50 1 1 B
+X GND 42 -100 -1900 200 U 50 50 1 1 P N
+X VDDCORE 43 200 1900 200 D 50 50 1 1 w
+X VDDIN 44 -100 1900 200 D 50 50 1 1 W
+X PA30 45 -1000 -1200 200 R 50 50 1 1 B
+X PA31 46 -1000 -1300 200 R 50 50 1 1 B
+X PB02 47 1000 1600 200 L 50 50 1 1 B
+X PB03 48 1000 1500 200 L 50 50 1 1 B
+X GNDANA 5 100 -1900 200 U 50 50 1 1 W
+X VDDANA 6 100 1900 200 D 50 50 1 1 W
+X PB08 7 1000 1400 200 L 50 50 1 1 B
+X PB09 8 1000 1300 200 L 50 50 1 1 B
+X PA04 9 -1000 1200 200 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/MCU_Module.dcm b/MCU_Module.dcm
index 1f233487ca..0766c73be6 100644
--- a/MCU_Module.dcm
+++ b/MCU_Module.dcm
@@ -72,6 +72,18 @@ K STM32 Nucleo ST
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/data_brief/DM00105918.pdf
 $ENDCMP
 #
+$CMP NodeMCU_ESP-12E
+D ESP-12E 802.11 b/g/n Wi-Fi Module
+K 802.11 Wi-Fi module
+F https://github.com/nodemcu/nodemcu-devkit-v1.0/blob/master/NODEMCU_DEVKIT_V1.0.PDF
+$ENDCMP
+#
+$CMP NodeMCU_ESP-32S
+D ESP-32S/ESP-WROOM-32 802.11 b/g/n Wi-Fi+BT+BLE Module
+K ESP32S WiFi Bluetooth microcontroller
+F https://einstronic.com/wp-content/uploads/2017/06/NodeMCU-32S-Catalogue.pdf
+$ENDCMP
+#
 $CMP VisionSOM-6UL
 D i.MX6-UL NXP ARM Cortex-A7 696MHz single core industrial SoM computer
 K somlabs module
diff --git a/MCU_Module.lib b/MCU_Module.lib
index 0b43e45e02..1c80ab1769 100644
--- a/MCU_Module.lib
+++ b/MCU_Module.lib
@@ -695,6 +695,104 @@ X NC 9 -1100 700 150 R 50 50 1 1 N N
 ENDDRAW
 ENDDEF
 #
+# NodeMCU_ESP-12E
+#
+DEF NodeMCU_ESP-12E U 0 20 Y Y 1 F N
+F0 "U" -850 850 50 H V C CNN
+F1 "NodeMCU_ESP-12E" 650 850 50 H V C CNN
+F2 "Module:NodeMCU_ESP-12E" -750 -850 50 H I C CNN
+F3 "" -200 -1150 50 H I C CNN
+$FPLIST
+ NodeMCU*
+$ENDFPLIST
+DRAW
+S -900 -800 900 800 0 1 10 f
+X ADC_EX/A0 1 -1000 400 100 R 50 50 1 1 I
+X GND 10 -100 -900 100 U 50 50 1 1 W
+X +3V3 11 0 900 100 D 50 50 1 1 W
+X EN 12 -1000 600 100 R 50 50 1 1 I
+X ~RST 13 -1000 700 100 R 50 50 1 1 I
+X GND 14 0 -900 100 U 50 50 1 1 W
+X VIN 15 -100 900 100 D 50 50 1 1 W
+X +3V3 16 100 900 100 D 50 50 1 1 W
+X GND 17 100 -900 100 U 50 50 1 1 W
+X D10/TX0/IO1 18 1000 -600 100 L 50 50 1 1 B
+X D9/RX0/IO3 19 1000 -500 100 L 50 50 1 1 B
+X ADC 2 -1000 300 100 R 50 50 1 1 I
+X D8/TX2/SPI_SS/IO15 20 1000 0 100 L 50 50 1 1 B
+X D7/RX2/MOSI/IO13 21 1000 100 100 L 50 50 1 1 B
+X D6/MISO/IO12 22 1000 200 100 L 50 50 1 1 B
+X D5/SCLK/IO14 23 1000 300 100 L 50 50 1 1 B
+X GND 24 200 -900 100 U 50 50 1 1 W
+X +3V3 25 200 900 100 D 50 50 1 1 W
+X D4/TX1/IO2 26 1000 500 100 L 50 50 1 1 B
+X D3/IO0 27 1000 600 100 L 50 50 1 1 B
+X D2/I2C_SDA/IO4 28 1000 -300 100 L 50 50 1 1 B
+X D1/I2C_SCL/IO5 29 1000 -200 100 L 50 50 1 1 B
+X NC 3 -900 200 100 R 50 50 1 1 N N
+X D0/IO16 30 1000 700 100 L 50 50 1 1 B
+X IO10/FLASH_SD3 4 -1000 0 100 R 50 50 1 1 B
+X IO9/FLASH_SD2 5 -1000 -100 100 R 50 50 1 1 B
+X IO8/MOSI/RX1/FLASH_SD1 6 -1000 -200 100 R 50 50 1 1 B
+X IO11/CS0/FLASH_CMD 7 -1000 -500 100 R 50 50 1 1 B
+X IO7/MISO/FLASH_SDO 8 -1000 -300 100 R 50 50 1 1 B
+X IO6/SCLK/FLASH_CLK 9 -1000 -400 100 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# NodeMCU_ESP-32S
+#
+DEF NodeMCU_ESP-32S U 0 20 Y Y 1 F N
+F0 "U" -900 1150 50 H V C CNN
+F1 "NodeMCU_ESP-32S" 600 1150 50 H V C CNN
+F2 "Module:NodeMCU_ESP-32S" -700 -1150 50 H I C CNN
+F3 "" 0 -1300 50 H I C CNN
+$FPLIST
+ NodeMCU_ESP-32S*
+$ENDFPLIST
+DRAW
+S -1000 -1100 1000 1100 0 1 10 f
+X +3V3 1 0 1200 100 D 50 50 1 1 W
+X IO26/ADC19/DAC2 10 -1100 -300 100 R 50 50 1 1 B
+X IO27/ADC17/T7 11 -1100 -100 100 R 50 50 1 1 B
+X T6/SPI_CLK/ADC16/IO14 12 1100 600 100 L 50 50 1 1 B
+X T5/SPI_MISO/ADC15/IO12 13 1100 700 100 L 50 50 1 1 B
+X GND 14 -100 -1200 100 U 50 50 1 1 W
+X T4/SPI_MOSI/ADC14/IO13 15 1100 800 100 L 50 50 1 1 B
+X IO9/RX1/FLASH_SD2 16 -1100 -600 100 R 50 50 1 1 B
+X IO10/TX1/FLASH_SD3 17 -1100 -500 100 R 50 50 1 1 B
+X IO11/FLASH_CMD 18 -1100 -1000 100 R 50 50 1 1 B
+X VIN 19 -100 1200 100 D 50 50 1 1 W
+X ~EN/RESET 2 -1100 1000 100 R 50 50 1 1 I
+X IO6/FLASH_SCK 20 -1100 -900 100 R 50 50 1 1 B
+X IO7/FLASH_SD0 21 -1100 -800 100 R 50 50 1 1 B
+X IO8/FLASH_SD1 22 -1100 -700 100 R 50 50 1 1 B
+X T3/SPI_SS/ADC13/IO15 23 1100 500 100 L 50 50 1 1 B
+X IO2/ADC12/T2/BLED 24 -1100 0 100 R 50 50 1 1 B
+X IO0/ADC11/T1/BTN0 25 -1100 100 100 R 50 50 1 1 B
+X IO4/ADC10/T0 26 -1100 200 100 R 50 50 1 1 B
+X RX2/IO16 27 1100 -700 100 L 50 50 1 1 B
+X TX2/IO17 28 1100 -600 100 L 50 50 1 1 B
+X VSPI_SS/IO5 29 1100 -100 100 L 50 50 1 1 B
+X IO36/ADC0/SensVP 3 -1100 800 100 R 50 50 1 1 B
+X VSPI_SCK/IO18 30 1100 0 100 L 50 50 1 1 B
+X VSPI_MISO/IO19 31 1100 100 100 L 50 50 1 1 B
+X GND 32 0 -1200 100 U 50 50 1 1 W
+X I2C_SDA/IO21 33 1100 -400 100 L 50 50 1 1 B
+X RX0/IO3 34 1100 -1000 100 L 50 50 1 1 B
+X TX0/IO1 35 1100 -900 100 L 50 50 1 1 B
+X I2C_SCL/IO22 36 1100 -300 100 L 50 50 1 1 B
+X VSPI_MOSI/ADC1/IO23 37 1100 200 100 L 50 50 1 1 B
+X GND 38 100 -1200 100 U 50 50 1 1 W
+X IO39/ADC3/SensVN 4 -1100 700 100 R 50 50 1 1 B
+X IO34/ADC6 5 -1100 400 100 R 50 50 1 1 B
+X IO35/ADC7 6 -1100 300 100 R 50 50 1 1 B
+X IO32/ADC4/XTAL32/T9 7 -1100 600 100 R 50 50 1 1 B
+X IO33/ADC5/XTAL32/T8 8 -1100 500 100 R 50 50 1 1 B
+X IO25/ADC18/DAC1 9 -1100 -200 100 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 # VisionSOM-6UL
 #
 DEF VisionSOM-6UL U 0 20 Y Y 1 F N