From f3d18243aeae0ba38fc6f25fde51a3d5225346e9 Mon Sep 17 00:00:00 2001
From: Benjamin Runnels <kraven@kraven.org>
Date: Mon, 24 Aug 2015 14:02:06 -0500
Subject: [PATCH] Reverting some things that didn't merge right

---
 Makefile         | 12 ++++++------
 esp-link.vcxproj | 12 ++++++++++++
 user/config.c    |  2 ++
 user/config.h    |  2 ++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index a60880d..61cd321 100644
--- a/Makefile
+++ b/Makefile
@@ -31,14 +31,14 @@ ESPBAUD		?= 460800
 # --------------- chipset configuration   ---------------
 
 # Pick your flash size: "512KB", "1MB", or "4MB"
-FLASH_SIZE ?= 512KB
+FLASH_SIZE ?= 4MB
 
 ifeq ("$(FLASH_SIZE)","512KB")
 # Winbond 25Q40 512KB flash, typ for esp-01 thru esp-11
 ESP_SPI_SIZE        ?= 0       # 0->512KB (256KB+256KB)
-ESP_FLASH_MODE      ?= 0      # 0->QIO
-ESP_FLASH_FREQ_DIV  ?= 0      # 0->40Mhz
-ESP_FLASH_MAX       ?= 241664 # max bin file for 512KB flash: 236KB
+ESP_FLASH_MODE      ?= 0       # 0->QIO
+ESP_FLASH_FREQ_DIV  ?= 0       # 0->40Mhz
+ESP_FLASH_MAX       ?= 241664  # max bin file for 512KB flash: 236KB
 ET_FS               ?= 4m      # 4Mbit flash size in esptool flash command
 ET_FF               ?= 40m     # 40Mhz flash speed in esptool flash command
 ET_BLANK            ?= 0x7E000 # where to flash blank.bin to erase wireless settings
@@ -330,11 +330,11 @@ ifeq ("$(FLASH_SIZE)","512KB")
 build/eagle.esphttpd1.v6.ld: $(SDK_LDDIR)/eagle.app.v6.new.512.app1.ld
 	$(Q) sed -e '/\.irom\.text/{' -e 'a . = ALIGN (4);' -e 'a *(.espfs)' -e '}'  \
 			-e '/^  irom0_0_seg/ s/2B000/38000/' \
-	    $(SDK_LDDIR)/eagle.app.v6.new.512.app1.ld >$@
+			$(SDK_LDDIR)/eagle.app.v6.new.512.app1.ld >$@
 build/eagle.esphttpd2.v6.ld: $(SDK_LDDIR)/eagle.app.v6.new.512.app2.ld
 	$(Q) sed -e '/\.irom\.text/{' -e 'a . = ALIGN (4);' -e 'a *(.espfs)' -e '}'  \
 			-e '/^  irom0_0_seg/ s/2B000/38000/' \
-	    $(SDK_LDDIR)/eagle.app.v6.new.512.app2.ld >$@
+			$(SDK_LDDIR)/eagle.app.v6.new.512.app2.ld >$@
 else
 build/eagle.esphttpd1.v6.ld: $(SDK_LDDIR)/eagle.app.v6.new.1024.app1.ld
 	$(Q) sed -e '/\.irom\.text/{' -e 'a . = ALIGN (4);' -e 'a *(.espfs)' -e '}'  \
diff --git a/esp-link.vcxproj b/esp-link.vcxproj
index d462b62..558f09a 100644
--- a/esp-link.vcxproj
+++ b/esp-link.vcxproj
@@ -63,6 +63,10 @@
     <None Include="wiflash" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="cmd\cmd.c" />
+    <ClCompile Include="cmd\handlers.c" />
+    <ClCompile Include="cmd\rest.c" />
+    <ClCompile Include="cmd\tcpclient.c" />
     <ClCompile Include="espfs\espfs.c" />
     <ClCompile Include="espfs\espfstest\main.c" />
     <ClCompile Include="espfs\mkespfsimage\main.c" />
@@ -73,12 +77,15 @@
     <ClCompile Include="httpd\httpd.c" />
     <ClCompile Include="httpd\httpdespfs.c" />
     <ClCompile Include="serial\console.c" />
+    <ClCompile Include="serial\crc16.c" />
     <ClCompile Include="serial\serbridge.c" />
     <ClCompile Include="serial\serled.c" />
+    <ClCompile Include="serial\slip.c" />
     <ClCompile Include="serial\uart.c" />
     <ClCompile Include="user\cgi.c" />
     <ClCompile Include="user\cgiflash.c" />
     <ClCompile Include="user\cgipins.c" />
+    <ClCompile Include="user\cgitcp.c" />
     <ClCompile Include="user\cgiwifi.c" />
     <ClCompile Include="user\config.c" />
     <ClCompile Include="user\log.c" />
@@ -86,6 +93,9 @@
     <ClCompile Include="user\user_main.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="cmd\cmd.h" />
+    <ClInclude Include="cmd\rest.h" />
+    <ClInclude Include="cmd\tcpclient.h" />
     <ClInclude Include="espfs\espfs.h" />
     <ClInclude Include="espfs\espfsformat.h" />
     <ClInclude Include="espfs\mkespfsimage\mman-win32\mman.h" />
@@ -98,12 +108,14 @@
     <ClInclude Include="include\uart_hw.h" />
     <ClInclude Include="include\user_config.h" />
     <ClInclude Include="serial\console.h" />
+    <ClInclude Include="serial\crc16.h" />
     <ClInclude Include="serial\serbridge.h" />
     <ClInclude Include="serial\serled.h" />
     <ClInclude Include="serial\uart.h" />
     <ClInclude Include="user\cgi.h" />
     <ClInclude Include="user\cgiflash.h" />
     <ClInclude Include="user\cgipins.h" />
+    <ClInclude Include="user\cgitcp.h" />
     <ClInclude Include="user\cgiwifi.h" />
     <ClInclude Include="user\config.h" />
     <ClInclude Include="user\log.h" />
diff --git a/user/config.c b/user/config.c
index b8122be..b44b329 100644
--- a/user/config.c
+++ b/user/config.c
@@ -18,6 +18,8 @@ FlashConfig flashDefault = {
   0, 0x00ffffff, 0,                    // static ip, netmask, gateway
   0,                                   // log mode
   0,                                   // swap uart (don't by default)
+  1, 0,                                // tcp_enable, rssi_enable
+  "\0",                                // api_key
 };
 
 typedef union {
diff --git a/user/config.h b/user/config.h
index d92e7f2..18284a5 100644
--- a/user/config.h
+++ b/user/config.h
@@ -14,6 +14,8 @@ typedef struct {
   uint32_t staticip, netmask, gateway; // using DHCP if staticip==0
   uint8_t  log_mode;                   // UART log debug mode
   uint8_t  swap_uart;                  // swap uart0 to gpio 13&15
+  uint8_t  tcp_enable, rssi_enable;    // TCP client settings
+  char     api_key[48];                // RSSI submission API key (Grovestreams for now)
 } FlashConfig;
 extern FlashConfig flashConfig;