From dfd156b0796f89c568417c6cab4f101948f7e492 Mon Sep 17 00:00:00 2001
From: dannybackx <dannybackx@users.noreply.github.com>
Date: Sun, 4 Jun 2017 15:09:34 +0200
Subject: [PATCH] Put functions in the right places to minimize superfluous
 includes.

---
 Makefile           |  2 +-
 cmd/handlers.c     |  7 +++++++
 esp-link/cgiwifi.c | 43 +++++++++++++++++++++----------------------
 esp-link/cgiwifi.h |  3 +--
 serial/serbridge.c |  1 -
 socket/socket.c    |  1 -
 6 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index 8c34308..037d179 100644
--- a/Makefile
+++ b/Makefile
@@ -253,7 +253,7 @@ MODULES		+= $(foreach sdir,$(LIBRARIES_DIR),$(wildcard $(sdir)/*))
 EXTRA_INCDIR 	= include .
 
 # libraries used in this project, mainly provided by the SDK
-LIBS = c gcc hal phy pp net80211 wpa main lwip_536 crypto
+LIBS = c gcc hal phy pp net80211 wpa main lwip crypto
 
 # compiler flags using during compilation of source files
 CFLAGS	+= -Os -ggdb -std=c99 -Werror -Wpointer-arith -Wundef -Wall -Wl,-EL -fno-inline-functions \
diff --git a/cmd/handlers.c b/cmd/handlers.c
index ac5452c..51c4438 100644
--- a/cmd/handlers.c
+++ b/cmd/handlers.c
@@ -18,6 +18,7 @@
 #include <socket.h>
 #endif
 #include <ip_addr.h>
+#include "esp-link/cgi.h"
 
 #include "config.h"
 
@@ -379,6 +380,12 @@ void ICACHE_FLASH_ATTR cmdWifiQuerySSID(CmdPacket *cmd) {
   cmdResponseEnd();
 }
 
+// Start scanning, API interface
+void ICACHE_FLASH_ATTR cmdWifiStartScan(CmdPacket *cmd) {
+  // call a function that belongs in esp-link/cgiwifi.c due to variable access
+  wifiStartScan();
+}
+
 // Command handler for MQTT information
 void ICACHE_FLASH_ATTR cmdMqttGetClientId(CmdPacket *cmd) {
   CmdRequest req;
diff --git a/esp-link/cgiwifi.c b/esp-link/cgiwifi.c
index f5ab9af..50da3fa 100644
--- a/esp-link/cgiwifi.c
+++ b/esp-link/cgiwifi.c
@@ -15,7 +15,6 @@ Cgi/template routines for the /wifi url.
 
 
 #include <esp8266.h>
-#include "cmd.h"
 #include "cgiwifi.h"
 #include "cgi.h"
 #include "status.h"
@@ -228,27 +227,6 @@ static void ICACHE_FLASH_ATTR scanStartCb(void *arg) {
   wifi_station_scan(NULL, wifiScanDoneCb);
 }
 
-// Start scanning, web interface
-static int ICACHE_FLASH_ATTR cgiWiFiStartScan(HttpdConnData *connData) {
-  if (connData->conn==NULL) return HTTPD_CGI_DONE; // Connection aborted. Clean up.
-  jsonHeader(connData, 200);
-
-  // Don't duplicate code, reuse the function below
-  cmdWifiStartScan(0);
-
-  return HTTPD_CGI_DONE;
-}
-
-// Start scanning, API interface
-void ICACHE_FLASH_ATTR cmdWifiStartScan(CmdPacket *cmd) {
-  if (!cgiWifiAps.scanInProgress) {
-    cgiWifiAps.scanInProgress = 1;
-    os_timer_disarm(&scanTimer);
-    os_timer_setfn(&scanTimer, scanStartCb, NULL);
-    os_timer_arm(&scanTimer, 200, 0);
-  }
-}
-
 static int ICACHE_FLASH_ATTR cgiWiFiGetScan(HttpdConnData *connData) {
   if (connData->conn==NULL) return HTTPD_CGI_DONE; // Connection aborted. Clean up.
   char buff[1460];
@@ -295,6 +273,27 @@ static int ICACHE_FLASH_ATTR cgiWiFiGetScan(HttpdConnData *connData) {
   return HTTPD_CGI_MORE;
 }
 
+// Start scanning, without parameters
+void ICACHE_FLASH_ATTR wifiStartScan() {
+  if (!cgiWifiAps.scanInProgress) {
+    cgiWifiAps.scanInProgress = 1;
+    os_timer_disarm(&scanTimer);
+    os_timer_setfn(&scanTimer, scanStartCb, NULL);
+    os_timer_arm(&scanTimer, 200, 0);
+  }
+}
+
+// Start scanning, web interface
+int ICACHE_FLASH_ATTR cgiWiFiStartScan(HttpdConnData *connData) {
+  if (connData->conn==NULL) return HTTPD_CGI_DONE; // Connection aborted. Clean up.
+  jsonHeader(connData, 200);
+
+  // Don't duplicate code, reuse the function above.
+  wifiStartScan();
+
+  return HTTPD_CGI_DONE;
+}
+
 int ICACHE_FLASH_ATTR cgiWiFiScan(HttpdConnData *connData) {
     if (connData->requestType == HTTPD_METHOD_GET) {
         return cgiWiFiGetScan(connData);
diff --git a/esp-link/cgiwifi.h b/esp-link/cgiwifi.h
index bf5d803..ccae68f 100644
--- a/esp-link/cgiwifi.h
+++ b/esp-link/cgiwifi.h
@@ -28,7 +28,6 @@ int wifiGetApCount();
 void wifiGetApName(int, char *);
 int wifiSignalStrength(int);
 void connectToNetwork(char *, char *);
-void cmdWifiQuerySSID(CmdPacket *cmd);
-void cmdWifiStartScan(CmdPacket *cmd);
+void wifiStartScan();
 
 #endif
diff --git a/serial/serbridge.c b/serial/serbridge.c
index 29c03b2..7ba8e8e 100644
--- a/serial/serbridge.c
+++ b/serial/serbridge.c
@@ -9,7 +9,6 @@
 #include "config.h"
 #include "console.h"
 #include "slip.h"
-#include "cmd.h"
 #ifdef SYSLOG
 #include "syslog.h"
 #else
diff --git a/socket/socket.c b/socket/socket.c
index a17f216..30ebb52 100644
--- a/socket/socket.c
+++ b/socket/socket.c
@@ -7,7 +7,6 @@
 #include "c_types.h"
 #include "ip_addr.h"
 #include "socket.h"
-#include "cmd.h"
 
 #define SOCK_DBG