Merge from upstream

.gitignore

@@ -230,3 +230,14 @@ Gerber/
 # kicad backup stuff
 *-bak
 *-rescue.lib
+
+# emacs
+\#*
+*~
+
+# GTAGS
+GPATH
+GRTAGS
+GTAGS
+
+local.mk

.gitmodules

@@ -1,6 +1,33 @@
 [submodule "Circuit/freetronics_kicad_library"]
 	path = Circuit/freetronics_kicad_library
-	url = git@github.com:freetronics/freetronics_kicad_library.git
+	url = https://github.com/freetronics/freetronics_kicad_library.git
 [submodule "Circuit/kicad-ESP8266"]
 	path = Circuit/kicad-ESP8266
 	url = https://github.com/jdunmire/kicad-ESP8266.git
+[submodule "Libraries/ESP_Onboarding"]
+	path = Libraries/ESP_Onboarding
+	url = https://github.com/wolfeidau/ESP_Onboarding
+[submodule "Libraries/pubsubclient"]
+	path = Libraries/pubsubclient
+	url = https://github.com/Imroy/pubsubclient.git
+[submodule "Libraries/Adafruit_BME280_Library"]
+	path = Libraries/Adafruit_BME280_Library
+	url = https://github.com/adafruit/Adafruit_BME280_Library.git
+[submodule "Libraries/Adafruit_ADXL345"]
+	path = Libraries/Adafruit_ADXL345
+	url = https://github.com/adafruit/Adafruit_ADXL345.git
+[submodule "Libraries/ArduinoJson"]
+	path = Libraries/ArduinoJson
+	url = https://github.com/bblanchon/ArduinoJson.git
+[submodule "Libraries/Adafruit_Sensor"]
+	path = Libraries/Adafruit_Sensor
+	url = https://github.com/adafruit/Adafruit_Sensor.git
+[submodule "Libraries/Arduino-Temperature-Control-Library"]
+	path = Libraries/Arduino-Temperature-Control-Library
+	url = https://github.com/milesburton/Arduino-Temperature-Control-Library.git
+[submodule "Libraries/ESP_MQTTLogger"]
+	path = Libraries/ESP_MQTTLogger
+	url = https://github.com/wolfeidau/ESP_MQTTLogger
+[submodule "Libraries/adafruit_NeoPixel"]
+	path = Libraries/adafruit_NeoPixel
+	url = https://github.com/adafruit/adafruit_NeoPixel

Circuit/ESPlant-Sensors.sch

@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:ESPlant-rescue
 LIBS:freetronics_schematic
 LIBS:power
 LIBS:device
@@ -37,12 +38,12 @@ EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 3 3
-Title ""
-Date ""
-Rev ""
+Title "ESPlant"
+Date "2016-02-20"
+Rev "V1.5"
 Comp ""
-Comment1 ""
-Comment2 ""
+Comment1 "TAPR Open Hardware License"
+Comment2 "Copyright (C) 2015 John Spencer & Angus Gratton"
 Comment3 ""
 Comment4 ""
 $EndDescr

Circuit/ESPlant-cache.lib

@@ -6,8 +6,8 @@ EESchema-LIBRARY Version 2.3
 DEF +3V3 #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
 F1 "+3V3" 0 140 50 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 ALIAS +3.3V
 DRAW
 P 2 0 1 0  -30 50  0 100 N
@@ -68,8 +68,8 @@ ENDDEF
 DEF Battery BT 0 0 N Y 1 F N
 F0 "BT" 100 50 50 H V L CNN
 F1 "Battery" 100 -50 50 H V L CNN
-F2 "" 0 40 60 V V C CNN
-F3 "" 0 40 60 V V C CNN
+F2 "" 0 40 50 V V C CNN
+F3 "" 0 40 50 V V C CNN
 DRAW
 S -90 -7 90 -17 0 1 0 F
 S -90 50 90 40 0 1 0 F
@@ -87,8 +87,8 @@ ENDDEF
 DEF C C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
 F1 "C" 25 -100 50 H V L CNN
-F2 "" 38 -150 30 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 38 -150 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 $FPLIST
  C?
  C_????_*
@@ -130,8 +130,8 @@ ENDDEF
 DEF CONN_01X02 P 0 40 Y N 1 F N
 F0 "P" 0 150 50 H V C CNN
 F1 "CONN_01X02" 100 0 50 V V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 $FPLIST
  Pin_Header_Straight_1X02
  Pin_Header_Angled_1X02
@@ -152,8 +152,8 @@ ENDDEF
 DEF CONN_01X03 P 0 40 Y N 1 F N
 F0 "P" 0 200 50 H V C CNN
 F1 "CONN_01X03" 100 0 50 V V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 $FPLIST
  Pin_Header_Straight_1X03
  Pin_Header_Angled_1X03
@@ -176,8 +176,8 @@ ENDDEF
 DEF CONN_01X05 P 0 40 Y N 1 F N
 F0 "P" 0 300 50 H V C CNN
 F1 "CONN_01X05" 100 0 50 V V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 $FPLIST
  Pin_Header_Straight_1X05
  Pin_Header_Angled_1X05
@@ -204,8 +204,8 @@ ENDDEF
 DEF CONN_01X06 P 0 40 Y N 1 F N
 F0 "P" 0 350 50 H V C CNN
 F1 "CONN_01X06" 100 0 50 V V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 $FPLIST
  Pin_Header_Straight_1X06
  Pin_Header_Angled_1X06
@@ -234,8 +234,8 @@ ENDDEF
 DEF CONN_01X08 P 0 40 Y N 1 F N
 F0 "P" 0 450 50 H V C CNN
 F1 "CONN_01X08" 100 0 50 V V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 $FPLIST
  Pin_Header_Straight_1X08
  Pin_Header_Angled_1X08
@@ -339,8 +339,8 @@ ENDDEF
 DEF GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -250 50 H I C CNN
 F1 "GND" 0 -150 50 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 DRAW
 P 6 0 1 0  0 0  0 -50  50 -50  0 -100  -50 -50  0 -50 N
 X GND 1 0 0 0 D 50 50 1 1 W N
@@ -384,14 +384,13 @@ X K K 200 0 150 L 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LM2903
+# LM193-RESCUE-ESPlant
 #
-DEF LM2903 U 0 20 Y Y 2 F N
+DEF LM193-RESCUE-ESPlant U 0 20 Y Y 2 F N
 F0 "U" 150 150 60 H V C CNN
-F1 "LM2903" 200 -200 60 H V C CNN
+F1 "LM193-RESCUE-ESPlant" 200 -200 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
-ALIAS LM293 LM393 LM193
 DRAW
 P 4 0 1 0  -200 200  200 0  -200 -200  -200 200 N
 X ~ 1 500 0 300 L 40 40 1 1 C
@@ -441,10 +440,10 @@ ENDDEF
 DEF PWR_FLAG #FLG 0 0 N N 1 F P
 F0 "#FLG" 0 95 50 H I C CNN
 F1 "PWR_FLAG" 0 180 50 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 DRAW
-X pwr 1 0 0 0 U 20 20 0 0 w
+X pwr 1 0 0 0 U 50 50 0 0 w
 P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
 ENDDRAW
 ENDDEF
@@ -510,26 +509,26 @@ ENDDEF
 DEF SW_PUSH SW 0 40 N N 1 F N
 F0 "SW" 150 110 50 H V C CNN
 F1 "SW_PUSH" 0 -80 50 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 DRAW
 S -170 50 170 60 0 1 0 N
 P 4 0 1 0  -40 60  -30 90  30 90  40 60 N
-X 1 1 -300 0 200 R 60 60 0 1 P I
-X 2 2 300 0 200 L 60 60 0 1 P I
+X 1 1 -300 0 200 R 50 50 0 1 P I
+X 2 2 300 0 200 L 50 50 0 1 P I
 ENDDRAW
 ENDDEF
 #
 # TEST_1P
 #
 DEF TEST_1P W 0 30 N N 1 F N
-F0 "W" 0 270 40 H V C CNN
-F1 "TEST_1P" 0 200 40 H V C CNN
-F2 "" 200 0 60 H V C CNN
-F3 "" 200 0 60 H V C CNN
+F0 "W" 0 270 50 H V C CNN
+F1 "TEST_1P" 0 200 50 H V C CNN
+F2 "" 200 0 50 H V C CNN
+F3 "" 200 0 50 H V C CNN
 DRAW
 C 0 130 30 0 1 0 N
-X 1 1 0 0 100 U 60 60 1 1 P
+X 1 1 0 0 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #