diff --git a/.travis.yml b/.travis.yml index 6f7efe13..1fa6cfe5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ script: - platformio run deploy: provider: releases + prerelease: true api_key: secure: bU4iotLTrslYAlXQmSoMaGfCsjpM96TrKKne/2gFTlg++EQwjD/Z/i6T59lO7YVwp1GTD3qp/E4vSXfgkEm559mFIKZkd1IT8Vx/hpjX5CU6/OinGNmj1hYJw5M9DI1kQtc0wFDpbyNDnjPpKqBpFmIpqFyJUC7b3vctk/BMPkiiI5ncuBGp2f35M4qN2FedpTWoZdSAVZms7hsKFP4qZcih6stSlncUNf/niLwf78B31r5Td3G1aYQtHkB0BzyGQSgCvVuZ+PBm6zD/EWqRUGo6OWBCgwykbIZlgu45J4q46yQ2uS1CvRf4DFzIWU79bPg26MmxpjFe3oZucITTUtvOSzHFn8b1nuJE8IajYdM1KHSREl8Piej3A446P+JDQPk6ki3jCRyQentaZofI2ePUuqrvsV3iL4qKXMWpX1cOGU2c6nx0vvl/oft4rEcccibGpGZr0RIL7Ebpp7D4DSQ+bM+2XkuFab3W3QdrqrB6A0DOJuJfu/MvxEgkLtlpypZ2Z3g/F/TDgJkLSNEvX9e6kGAAIiIgkKz/zuuy04eNX+jox22TldovjbNSMCDfeeD6ghfKm0Q1+mdZax2dhvldgKOiwcZFL+TozN3AdPkr5GG/9m+dVaUGdrMK/n6uEJ++FZeUmdT8Pa2u/m3w2A4zeqMUWLM4WZMaUDW4cnA= file: ".pioenvs/d1_mini_stage/firmware.bin" diff --git a/README.md b/README.md index 382c1e82..a92bfd38 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ iSpindel | iSpindle =================== +![Dashboard](/pics/blackedition.png) + **DIY elektronische Bierspindel | electronic Hydrometer** -***https://universam1.github.io/iSpindel*** [![Build Status](https://travis-ci.org/universam1/iSpindel.svg?branch=master)](https://travis-ci.org/universam1/iSpindel) @@ -27,6 +28,8 @@ Check out *IOT DEVICE PULLS ITS WEIGHT IN HOME BREWING* at http://hackaday.com/2 *** ## News + +> 28.09.2017 Firmware 5.5.0: Recall saved Wifi credential thus persisting over configuration changes > 31.08.2017 iSpindle.py Version 1.3.1: genericTCP Update (local server & prep for public server); Firmware 5.4.2: Memory improvements. > 29.08.2017 Firmware 5.4.1: Rewrite of the upload class to streamline and allow further data items. Also add iSpindel.de as data server as preset. > 08.08.2017 [calibration tool](https://universam1.github.io/iSpindel/tools/calibration/calibration.htm) to calculate gravity as alternative to the Excel sheet @@ -35,22 +38,6 @@ Check out *IOT DEVICE PULLS ITS WEIGHT IN HOME BREWING* at http://hackaday.com/2 > 22.05.2017 updated build docs > 22.05.2017 switching build environment to platform.io > 01.05.2017 Major Firmware update to 5.x ->### Calculate the Gravity ->now within the iSpindel by expression evaluation! The conversion polynom can be stored per iSpindel and sends as an additional metric (without a unit). Therefore, whether Plato or SG is prefered is up to the user defined polynom. There are two variable available `tilt` and `temp` -> ->### [Kalibrierung](docs/Kalibrierung.md) -> ->![Gravity](pics/polynom.png) -> ->### [Firmware update via Web Browser](docs/Firmware.md) -> ->![Offset](pics/firmware.png) - ->### Calibrate Hardware Offset ->of the MPU6050. Greatly reduces the issue of not perfectly aligned sensor. -> ->![Offset](pics/offset.png) - > 12.04.2017 Mentioned in http://www.homebrewtalk.com/showthread.php?t=598187 > 01.03.2017 Mentioned in hackaday.com http://hackaday.com/2017/03/01/iot-device-pulls-its-weight-in-home-brewing/ > 23.02.17 English documentation added @@ -79,7 +66,7 @@ Check out *IOT DEVICE PULLS ITS WEIGHT IN HOME BREWING* at http://hackaday.com/2 >- Power saving on empty battery >- added custom Battery conversion factor >- Bugfixes - +> > 11.12.16 Sources and drawer online > 11.12.16: FHEM upload documentation & firmware (thanks @MSBannert!) > 07.12.16: Schematics @@ -88,9 +75,9 @@ Check out *IOT DEVICE PULLS ITS WEIGHT IN HOME BREWING* at http://hackaday.com/2 *** -> The `iSpindle` is a young project and under heavy development, see german [Hobbybrauer.de Thread](http://hobbybrauer.de/forum/viewtopic.php?f=7&t=11235). Contribution and support is appreciated especially regarding creation and translation of documentation. Feel free to provide a `pull request`. +> The `iSpindle` is under heavy development, see german [Hobbybrauer.de Thread](http://hobbybrauer.de/forum/viewtopic.php?f=7&t=11235). Contribution and support is appreciated especially regarding creation and translation of documentation. Feel free to provide a `pull request`. > -> Die `iSpindel` befindet sich zur Zeit mitten in der Entwicklung, siehe dazu [den Hobbybrauer.de Thread](http://hobbybrauer.de/forum/viewtopic.php?f=7&t=11235). Mithilfe ist herzlich willkommen und Ergänzungen bitte per Pull Request einreichen. Großes Dank an alle die Unterstützung leisten seitens Grundlagen erarbeiten oder passende Hardware zu finden. +> Die `iSpindel` befindet sich in andauernder Entwicklung, siehe dazu [den Hobbybrauer.de Thread](http://hobbybrauer.de/forum/viewtopic.php?f=7&t=11235). Mithilfe ist herzlich willkommen und Ergänzungen bitte per Pull Request einreichen. Großes Dank an alle die Unterstützung leisten seitens Grundlagen erarbeiten oder passende Hardware zu finden. ![Spindel im Reinwasser](pics/floating.jpg) ![Dashboard](pics/Dashboard.jpg) diff --git a/bin/CHANGELOG b/bin/CHANGELOG deleted file mode 100644 index 7e064578..00000000 --- a/bin/CHANGELOG +++ /dev/null @@ -1,25 +0,0 @@ -5.4.2 Memory improvements -5.4.1 Rewrite of the upload class to streamline and allow further data items. Also add iSpindel.de as data server as preset. -5.2.1 Workaround for https://github.com/esp8266/Arduino/issues/2750 -5.1.2 Major rewrite, calculating Gravity by iSpindel, adding zero compensation etc. -4.1.7 solve endless wait for Access Point -4.1.6 New routine to restore Wifi credentials from Flash. - Double reset fixed which was not caught in RC_Cal restart - Connection improvements -4.0.1 inifinte sleep time developed: the maximum 71min RTC time extends through step-sleeps - Wifi RF calibration introduced when calling configuration - fixed bug of emergency interval - fixed UI numeric formating -3.5.0 genericTCP -3.4.6 OneWire stability improvements -3.4.4 fixes for TControl -3.4.2: Added CraftBeerPi, TControl, FHEM, generic HTTP - major Portal rework, added labels - upload speed improvements - Power saving on empty battery - added custom Battery conversion factor - Bugfixes -2.1.4: Increased resolution of angle -2.1.2: Improved Wifi connection, faster reconnect with difficult APs. Changed captive portal. -2.0.0: Added Ubidots Auto Config -1.3.2: implemented Median filter. Average of 3 median of 5x 200 rounds diff --git a/bin/iSpindel-5.1.2.bin b/bin/iSpindel-5.1.2.bin deleted file mode 100644 index 60ccc3ca..00000000 Binary files a/bin/iSpindel-5.1.2.bin and /dev/null differ diff --git a/bin/iSpindel-5.2.1.bin b/bin/iSpindel-5.2.1.bin deleted file mode 100644 index 286cc76c..00000000 Binary files a/bin/iSpindel-5.2.1.bin and /dev/null differ diff --git a/bin/iSpindel.3.4.4.bin b/bin/iSpindel.3.4.4.bin deleted file mode 100644 index 072f8071..00000000 Binary files a/bin/iSpindel.3.4.4.bin and /dev/null differ diff --git a/bin/iSpindel.4.1.6.bin b/bin/iSpindel.4.1.6.bin deleted file mode 100644 index b7a2b103..00000000 Binary files a/bin/iSpindel.4.1.6.bin and /dev/null differ diff --git a/pics/blackedition.png b/pics/blackedition.png new file mode 100644 index 00000000..759e82db Binary files /dev/null and b/pics/blackedition.png differ diff --git a/pics/firmware.png b/pics/firmware.png deleted file mode 100644 index 977b6385..00000000 Binary files a/pics/firmware.png and /dev/null differ diff --git a/pics/offset.png b/pics/offset.png deleted file mode 100644 index 5776f755..00000000 Binary files a/pics/offset.png and /dev/null differ diff --git a/pics/polynom.png b/pics/polynom.png deleted file mode 100644 index 430fa47d..00000000 Binary files a/pics/polynom.png and /dev/null differ diff --git a/pio/lib/Globals/Globals.h b/pio/lib/Globals/Globals.h index b796b018..e7ecc2ec 100644 --- a/pio/lib/Globals/Globals.h +++ b/pio/lib/Globals/Globals.h @@ -26,7 +26,7 @@ extern Ticker flasher; // #include // defines go here -#define FIRMWAREVERSION "5.4.2" +#define FIRMWAREVERSION "5.5.0" #define API_FHEM true diff --git a/pio/lib/WiFiManagerKT/WiFiManagerKT.cpp b/pio/lib/WiFiManagerKT/WiFiManagerKT.cpp index 81624d17..3a23a95a 100644 --- a/pio/lib/WiFiManagerKT/WiFiManagerKT.cpp +++ b/pio/lib/WiFiManagerKT/WiFiManagerKT.cpp @@ -595,7 +595,13 @@ void WiFiManager::handleWifi() { page += "
"; } - page += FPSTR(HTTP_FORM_START); + // page += FPSTR(HTTP_FORM_START); + page += FPSTR(HTTP_FORM_START1); + page += _ssid; + page += FPSTR(HTTP_FORM_START2); + page += _pass; + page += FPSTR(HTTP_FORM_START3); + char parLength[2]; // add the extra parameters to the form for (int i = 0; i < _paramsCount; i++) { diff --git a/pio/lib/WiFiManagerKT/WiFiManagerKT.h b/pio/lib/WiFiManagerKT/WiFiManagerKT.h index aee203b1..092d232a 100644 --- a/pio/lib/WiFiManagerKT/WiFiManagerKT.h +++ b/pio/lib/WiFiManagerKT/WiFiManagerKT.h @@ -118,7 +118,11 @@ const char HTTP_HEAD_END[] PROGMEM = "
"; const char HTTP_PORTAL_OPTIONS[] PROGMEM = "





"; const char HTTP_ITEM[] PROGMEM = "
{v} {r}%
"; const char JSON_ITEM[] PROGMEM = "{\"SSID\":\"{v}\", \"Encryption\":{i}, \"Quality\":\"{r}\"}"; -const char HTTP_FORM_START[] PROGMEM = "
"; +// const char HTTP_FORM_START[] PROGMEM = ""; +const char HTTP_FORM_START1[] PROGMEM = ""; + const char HTTP_FORM_LABEL[] PROGMEM = ""; const char HTTP_FORM_PARAM[] PROGMEM = ""; const char HTTP_FORM_END[] PROGMEM = "
"; @@ -208,6 +212,8 @@ class WiFiManager //Scan for WiFiNetworks in range and sort by signal strength //space for indices array allocated on the heap and should be freed when no longer required int scanWifiNetworks(int **indicesptr); + String _ssid = ""; + String _pass = ""; private: std::unique_ptr dnsServer; @@ -224,8 +230,6 @@ class WiFiManager const char *_apName = "no-net"; const char *_apPassword = NULL; - String _ssid = ""; - String _pass = ""; unsigned long _configPortalTimeout = 0; unsigned long _connectTimeout = 0; unsigned long _configPortalStart = 0; diff --git a/pio/src/iSpindel.cpp b/pio/src/iSpindel.cpp index 2e419bbd..d3008c78 100644 --- a/pio/src/iSpindel.cpp +++ b/pio/src/iSpindel.cpp @@ -315,17 +315,16 @@ bool startConfiguration() wifiManager.addParameter(&custom_url); WiFiManagerParameter custom_polynom_lbl("
"); wifiManager.addParameter(&custom_polynom_lbl); - // f.e. '0.00438*(tilt)*(tilt) + 0.13647*(tilt) - 6.96' WiFiManagerParameter custom_polynom("POLYN", "Polynominal", my_polynominal, 70, WFM_NO_LABEL); wifiManager.addParameter(&custom_polynom); - // WiFiManagerParameter custom_polynom_temp("POLYTEMP", "calibration Temperatur C", String(my_polynominal_temp).c_str(), 5, TYPE_NUMBER); - // wifiManager.addParameter(&custom_polynom_temp); + + wifiManager._ssid = my_ssid; + wifiManager._pass = my_psk; SerialOut(F("started Portal")); wifiManager.startConfigPortal("iSpindel"); strcpy(my_polynominal, custom_polynom.getValue()); - // my_polynominal_temp = String(custom_polynom_temp.getValue()).toInt(); validateInput(custom_name.getValue(), my_name); validateInput(custom_token.getValue(), my_token); diff --git a/platformio.ini b/platformio.ini index 2133fd80..d35ef97d 100644 --- a/platformio.ini +++ b/platformio.ini @@ -30,4 +30,3 @@ upload_speed = 921600 lib_deps = ArduinoJson ESPAsyncWebServer - ESPAsyncTCP