Merge pull request #64 from aj-ptw/dev

AJ Keller · web-flow · commit f4c25ef31b8b · 2018-01-16T10:04:01.000-05:00
Dev
diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ UPLOAD_PORT = /dev/ttyUSB0
 # BOARD = openbci
 BOARD = huzzah
 FLASH_DEF = 4M1M
-# F_CPU = 160000000l
+F_CPU = 80000000l
 
 
 #########################################
diff --git a/README.md b/README.md
@@ -21,6 +21,10 @@ This document (the README file) is a hub to give you some information about the
 * [How can you get involved?](#get-involved)
 * [Get in touch](#contact-us)
 * [Find out more](#find-out-more)
+* [Installation](#install)
+* [Building](#build)
+* [Running](#running)
+* [License](#license)
 
 ## What are we doing?
 
@@ -103,18 +107,7 @@ And of course, you'll want to know our:
 
 Thank you so much (Danke schön! Merci beaucoup!) for visiting the project and we do hope that you'll join us on this amazing journey to make programming with OpenBCI fun and easy.
 
-# Documentation
-
-### Table of Contents:
----
-
-1. [Installation](#install)
-2. [Building](#build)
-3. [Running](#running)
-4. [License](#license)
-
-
-### <a name="install"></a> Installation:
+## <a name="install"></a> Installation:
 
 Use the `DefaultWifiShield.ino` in examples.
 
@@ -129,7 +122,7 @@ The ESP8266 runs arduino as well so there are several installs that need to happ
 The library we are interested in using is the [`SPISlave`](https://github.com/esp8266/Arduino/tree/master/libraries/SPISlave).
 
 
-### <a name="build"></a> Building and Flashing:
+## <a name="build"></a> Building and Flashing:
 
 There are two steps to flashing code. Compiling the codebase, and then flashing it onto the wifi module.
 Makefiles make it a lot easier. Especially if you use [makeEspArduino](https://github.com/plerup/makeEspArduino). Follow the instructions from the project's github.
@@ -156,7 +149,7 @@ The `make` command runs the default commands from `makeEspArduino` with OpenBCI_
 
     `make SKETCH=examples/WifiShieldJSON/WifiShieldJSON.ino UPLOAD_PORT=/dev/cu.usbserial-AI02BAAJ flash`
 
-### <a name="running"></a> Running:
+## <a name="running"></a> Running:
 
 There are two modes that the OpenBCI WiFi shield can run in
 
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,19 @@
+# v2.0.3
+
+### Enhancements
+
+* Reduce buffer size for better wifi manager
+* Fix LED flash when there are stored creds and shield attempts to connect
+* Add update wifi link to home page
+
+### Work In Progress
+
+* Hitting /wifi on some devices did not trigger wifi manager
+
+### Third party
+
+* Now building with v2.4.0 from ESP8266/Arduino
+
 # v2.0.2
 
 * Reduce buffer size for better OTA Updates
diff --git a/examples/DefaultWifiShield/DefaultWifiShield.ino b/examples/DefaultWifiShield/DefaultWifiShield.ino
@@ -168,14 +168,28 @@ bool readRequest(WiFiClient& client) {
   return false;
 }
 
-void requestWifiManager() {
+void requestWifiManagerStart() {
 #ifdef DEBUG
   debugPrintGet();
-  Serial.println("requestWifiManager");
 #endif
-  startWifiManager = true;
   sendHeadersForCORS();
-  server.send(301, "text/html", "<meta http-equiv=\"refresh\" content=\"1; URL='/'\" />");
+  // server.send(301, "text/html", "<meta http-equiv=\"refresh\" content=\"1; URL='/'\" />");
+
+  String out = "<!DOCTYPE html><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><html lang=\"en\"><h1 style=\"margin:  auto\;width: 80%\;text-align: center\;\">Push The World</h1><br><p style=\"margin:  auto\;width: 80%\;text-align: center\;\"><a href='http://";
+  if (WiFi.localIP().toString().equals("192.168.4.1") || WiFi.localIP().toString().equals("0.0.0.0")) {
+    out += "192.168.4.1";
+  } else {
+    out += WiFi.localIP().toString();
+  }
+  out += HTTP_ROUTE;
+  out += "'>Click to Go To WiFi Manager</a></p><html>";
+  server.send(200, "text/html", out);
+
+  ledFlashes = 5;
+  ledInterval = 250;
+  ledLastFlash = millis();
+
+  startWifiManager = true;
 }
 
 JsonObject& getArgFromArgs(int args) {
@@ -500,24 +514,46 @@ void setup() {
 #ifdef DEBUG
     debugPrintGet();
 #endif
-    String out = "<!DOCTYPE html><html lang=\"en\"><h1 style=\"margin:  auto\;width: 50%\;text-align: center\;\">Push The World</h1><br><p style=\"margin:  auto\;width: 50%\;text-align: center\;\"><a href='http://";
+    String ip = "192.168.4.1";
+    String out = "<!DOCTYPE html><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><html lang=\"en\"><h1 style=\"margin:  auto\;width: 90%\;text-align: center\;\">Push The World</h1><br>";
     if (WiFi.localIP().toString().equals("192.168.4.1") || WiFi.localIP().toString().equals("0.0.0.0")) {
       if (WiFi.SSID().equals("")) {
+        out += "<p style=\"margin:  auto\;width: 80%\;text-align: center\;\"><a href='http://";
         out += "192.168.4.1";
-        out += HTTP_ROUTE_WIFI;
-        out += "'>Click to Configure Wifi</a></p><br>";
+        out += HTTP_ROUTE_WIFI_CONFIG;
+        out += "'>Click to Configure Wifi</a><br>If the above link does not work type 192.168.4.1/wifi in web browser and press Enter or Go.<br>See updates on issue <a href='https://github.com/OpenBCI/OpenBCI_WIFI/issues/62'>#62</a> on Github.</p><br>";
       } else {
+        out += "<p style=\"margin:  auto\;width: 80%\;text-align: center\;\"><a href='http://";
+        out += "192.168.4.1";
+        out += HTTP_ROUTE_WIFI_CONFIG;
+        out += "'>Click to Configure Wifi</a><br>If the above link does not work type 192.168.4.1/wifi in web browser and press Enter or Go.<br>See updates on issue <a href='https://github.com/OpenBCI/OpenBCI_WIFI/issues/62'>#62</a> on Github.</p><br>";
+        out += "<p style=\"margin:  auto\;width: 80%\;text-align: center\;\"><a href='http://";
         out += "192.168.4.1";
         out += HTTP_ROUTE_WIFI_DELETE;
         out += "'>Click to Erase Wifi Credentials</a></p><br>";
       }
     } else {
+      out += "<p style=\"margin:  auto\;width: 80%\;text-align: center\;\"><a href='http://";
+      out += WiFi.localIP().toString();
+      out += HTTP_ROUTE_WIFI_CONFIG;
+      out += "'>Click to Configure Wifi</a><br>If the above link does not work type ";
+      out += WiFi.localIP().toString();
+      out += "/wifi in web browser and press Enter or Go.<br>See updates on issue <a href='https://github.com/OpenBCI/OpenBCI_WIFI/issues/62'>#62</a> on Github.</p><br>";
+      out += "<p style=\"margin:  auto\;width: 80%\;text-align: center\;\"><a href='http://";
       out += WiFi.localIP().toString();
       out += HTTP_ROUTE_WIFI_DELETE;
       out += "'>Click to Erase Wifi Credentials</a></p><br>";
     }
-    out += "<p style=\"margin:  auto\;width: 50%\;text-align: center\;\"> Please visit <a href='https://app.swaggerhub.com/apis/pushtheworld/openbci-wifi-server/2.0.0'>Swaggerhub</a> for the latest HTTP endpoints</p><br>";
-    out += "<p style=\"margin:  auto\;width: 50%\;text-align: center\;\"> Shield Firmware: " + String(SOFTWARE_VERSION) + "</p></html>";
+    out += "<p style=\"margin:  auto\;width: 80%\;text-align: center\;\"><a href='http://";
+    if (WiFi.localIP().toString().equals("192.168.4.1") || WiFi.localIP().toString().equals("0.0.0.0")) {
+      out += "192.168.4.1/update";
+    } else {
+      out += WiFi.localIP().toString();
+      out += "/update";
+    }
+    out += "'>Click to Update WiFi Firmware</a></p><br>";
+    out += "<p style=\"margin:  auto\;width: 80%\;text-align: center\;\"> Please visit <a href='https://app.swaggerhub.com/apis/pushtheworld/openbci-wifi-server/2.0.0'>Swaggerhub</a> for the latest HTTP endpoints</p><br>";
+    out += "<p style=\"margin:  auto\;width: 80%\;text-align: center\;\"> Shield Firmware: " + String(SOFTWARE_VERSION) + "</p></html>";
 
     server.send(200, "text/html", out);
   });
@@ -657,7 +693,7 @@ void setup() {
   });
   server.on(HTTP_ROUTE_BOARD, HTTP_OPTIONS, sendHeadersForOptions);
 
-  server.on(HTTP_ROUTE_WIFI, HTTP_GET, requestWifiManager);
+  server.on(HTTP_ROUTE_WIFI, HTTP_GET, requestWifiManagerStart);
   server.on(HTTP_ROUTE_WIFI, HTTP_DELETE, []() {
 #ifdef DEBUG
     debugPrintDelete();
@@ -667,7 +703,7 @@ void setup() {
   });
   server.on(HTTP_ROUTE_WIFI, HTTP_OPTIONS, sendHeadersForOptions);
 
-  server.on(HTTP_ROUTE_WIFI_CONFIG, HTTP_GET, requestWifiManager);
+  server.on(HTTP_ROUTE_WIFI_CONFIG, HTTP_GET, requestWifiManagerStart);
   server.on(HTTP_ROUTE_WIFI_CONFIG, HTTP_OPTIONS, sendHeadersForOptions);
 
   server.on(HTTP_ROUTE_WIFI_DELETE, HTTP_GET, []() {
@@ -699,8 +735,9 @@ void setup() {
     ledState = false;
     // digitalWrite(LED_NOTIFY, HIGH);
   } else {
-    ledFlashes = 2;
-    ledInterval = 500;
+    ledState = false;
+    ledFlashes = 4;
+    ledInterval = 250;
     wifiConnectTimeout = millis();
     tryConnectToAP = true;
 #ifdef DEBUG
@@ -754,10 +791,14 @@ void loop() {
       httpUpdater.setup(&server);
       server.begin();
       MDNS.addService("http", "tcp", 80);
-      digitalWrite(LED_NOTIFY, HIGH);
+      // digitalWrite(LED_NOTIFY, HIGH);
 #ifdef DEBUG
       Serial.println("Connected to network, switching to station mode.");
 #endif
+      ledState = false;
+      ledFlashes = 2;
+      ledInterval = 500;
+      ledLastFlash = millis();
   } else if (millis() > (wifiConnectTimeout + 10000)) {
 #ifdef DEBUG
       Serial.printf("Failed to connect to network with %d bytes on head\n", ESP.getFreeHeap());
@@ -824,12 +865,6 @@ void loop() {
       Serial.printf("Failed to connect with WiFi Manager with %d bytes on heap\n" , ESP.getFreeHeap());
     }
 #endif
-
-#ifdef DEBUG
-    Serial.println("Calling restart");
-#endif
-    // wifiReset = true;
-    // ESP.restart();
   }
 
   int packetsToSend = wifi.rawBufferHead - wifi.rawBufferTail;
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=OpenBCI_Wifi
-version=2.0.2
+version=2.0.3
 author=AJ Keller <pushtheworldllc@gmail.com>
 maintainer=AJ Keller <pushtheworldllc@gmail.com>
 sentence=The core of the OpenBCI Wifi Shield.
diff --git a/src/OpenBCI_Wifi.cpp b/src/OpenBCI_Wifi.cpp
@@ -462,7 +462,7 @@ String OpenBCI_Wifi_Class::getOutputProtocolString(OUTPUT_PROTOCOL outputProtoco
       return OUTPUT_NONE;
   }
 }
-
+#ifdef RAW_TO_JSON
 double OpenBCI_Wifi_Class::getScaleFactorVoltsGanglion() {
   return MCP_SCALE_FACTOR_VOLTS;
 }
@@ -494,6 +494,7 @@ double OpenBCI_Wifi_Class::getScaleFactorVoltsCyton(uint8_t gain) {
       return 1.0;
   }
 }
+#endif
 
 /**
  * Used to print out a long long number
diff --git a/src/OpenBCI_Wifi_Definitions.h b/src/OpenBCI_Wifi_Definitions.h
@@ -9,24 +9,52 @@
 #ifndef __OpenBCI_Wifi_Definitions__
 #define __OpenBCI_Wifi_Definitions__
 
-#define SOFTWARE_VERSION "v2.0.2"
+#define SOFTWARE_VERSION "v2.0.3"
 
-#define ADS1299_VREF 4.5
-#define MCP3912_VREF 1.2
-#define ADC_24BIT_RES 8388607.0
-#define ADC_24BIT_MAX_VAL_NANO_VOLT 8388607000000000.0
-#define BYTES_PER_SPI_PACKET 32
-#define BYTES_PER_OBCI_PACKET 33
 // #define DEBUG 1
-#define MAX_SRV_CLIENTS 2
-#define BYTES_PER_CHANNEL 3
+
 #ifdef RAW_TO_JSON
+  #define ADS1299_VREF 4.5
+
+  #define ADC_24BIT_RES 8388607.0
+  #define ADC_24BIT_MAX_VAL_NANO_VOLT 8388607000000000.0
+
+  #define ADS_GAIN_1 1
+  #define ADS_GAIN_2 2
+  #define ADS_GAIN_4 4
+  #define ADS_GAIN_6 6
+  #define ADS_GAIN_8 8
+  #define ADS_GAIN_12 12
+  #define ADS_GAIN_24 24
+
+  #define ADS_SCALE_FACTOR_VOLTS_1 0.000000536441867
+  #define ADS_SCALE_FACTOR_VOLTS_2 0.000000268220934
+  #define ADS_SCALE_FACTOR_VOLTS_4 0.000000134110467
+  #define ADS_SCALE_FACTOR_VOLTS_6 0.000000089406978
+  #define ADS_SCALE_FACTOR_VOLTS_8 0.000000067055233
+  #define ADS_SCALE_FACTOR_VOLTS_12 0.000000044703489
+  #define ADS_SCALE_FACTOR_VOLTS_24 0.000000022351744
+
+  #define ARDUINOJSON_USE_LONG_LONG 1
+  #define ARDUINOJSON_ADDITIONAL_BYTES_4_CHAN 115
+  #define ARDUINOJSON_ADDITIONAL_BYTES_8_CHAN 195
+  #define ARDUINOJSON_ADDITIONAL_BYTES_16_CHAN 355
+  #define ARDUINOJSON_ADDITIONAL_BYTES_24_CHAN 515
+  #define ARDUINOJSON_ADDITIONAL_BYTES_32_CHAN 675
+
+  #define GANGLION_GAIN 51
+
+  #define MCP_SCALE_FACTOR_VOLTS 0.00000000186995
+  #define MCP3912_VREF 1.2
   #define NUM_PACKETS_IN_RING_BUFFER_JSON 28
   #define NUM_PACKETS_IN_RING_BUFFER_RAW 1
 #else
-  #define NUM_PACKETS_IN_RING_BUFFER_RAW 250
+  #define NUM_PACKETS_IN_RING_BUFFER_RAW 200
   #define MAX_PACKETS_PER_SEND_TCP 42
 #endif
+#define BYTES_PER_SPI_PACKET 32
+#define BYTES_PER_OBCI_PACKET 33
+#define BYTES_PER_CHANNEL 3
 #define WIFI_SPI_MSG_LAST 0x01
 #define WIFI_SPI_MSG_MULTI 0x02
 #define WIFI_SPI_MSG_GAINS 0x03
@@ -37,20 +65,14 @@
 #define NUM_CHANNELS_GANGLION 4
 #define LED_PROG 0
 #define LED_NOTIFY 5
-#define GANGLION_GAIN 51
 #define DEFAULT_LATENCY 10000
 #define DEFAULT_MQTT_PORT 1883
 // #define bit(b) (1UL << (b)) // Taken directly from Arduino.h
 // Arduino JSON needs bytes for duplication
 // to recalculate visit:
 //   https://bblanchon.github.io/ArduinoJson/assistant/index.html
 // #define ARDUINOJSON_USE_DOUBLE 1
-#define ARDUINOJSON_USE_LONG_LONG 1
-#define ARDUINOJSON_ADDITIONAL_BYTES_4_CHAN 115
-#define ARDUINOJSON_ADDITIONAL_BYTES_8_CHAN 195
-#define ARDUINOJSON_ADDITIONAL_BYTES_16_CHAN 355
-#define ARDUINOJSON_ADDITIONAL_BYTES_24_CHAN 515
-#define ARDUINOJSON_ADDITIONAL_BYTES_32_CHAN 675
+
 #define MICROS_IN_SECONDS 1000000
 #define SPI_MASTER_POLL_TIMEOUT_MS 100
 #define SPI_TIMEOUT_CLIENT_RESPONSE 400
@@ -60,23 +82,7 @@
 #define NANO_VOLTS_IN_VOLTS 1000000000.0
 #define MAX_JSON_BUFFER_SIZE 4000
 
-#define ADS_GAIN_1 1
-#define ADS_GAIN_2 2
-#define ADS_GAIN_4 4
-#define ADS_GAIN_6 6
-#define ADS_GAIN_8 8
-#define ADS_GAIN_12 12
-#define ADS_GAIN_24 24
-
-#define ADS_SCALE_FACTOR_VOLTS_1 0.000000536441867
-#define ADS_SCALE_FACTOR_VOLTS_2 0.000000268220934
-#define ADS_SCALE_FACTOR_VOLTS_4 0.000000134110467
-#define ADS_SCALE_FACTOR_VOLTS_6 0.000000089406978
-#define ADS_SCALE_FACTOR_VOLTS_8 0.000000067055233
-#define ADS_SCALE_FACTOR_VOLTS_12 0.000000044703489
-#define ADS_SCALE_FACTOR_VOLTS_24 0.000000022351744
-
-#define MCP_SCALE_FACTOR_VOLTS 0.00000000186995
+
 
 #define BOARD_TYPE_CYTON "cyton"
 #define BOARD_TYPE_CYTON_DAISY "daisy"

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ String OpenBCI_Wifi_Class::getOutputProtocolString(OUTPUT_PROTOCOL outputProtoco`
`462`	`462`	`return OUTPUT_NONE;`
`463`	`463`	`}`
`464`	`464`	`}`
`465`		`-`
	`465`	`+#ifdef RAW_TO_JSON`
`466`	`466`	`double OpenBCI_Wifi_Class::getScaleFactorVoltsGanglion() {`
`467`	`467`	`return MCP_SCALE_FACTOR_VOLTS;`
`468`	`468`	`}`
`@@ -494,6 +494,7 @@ double OpenBCI_Wifi_Class::getScaleFactorVoltsCyton(uint8_t gain) {`
`494`	`494`	`return 1.0;`
`495`	`495`	`}`
`496`	`496`	`}`
	`497`	`+#endif`
`497`	`498`
`498`	`499`	`/**`
`499`	`500`	`* Used to print out a long long number`