diff --git a/README.md b/README.md index b285f4a1..bf0dd891 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ Check out *IOT DEVICE PULLS ITS WEIGHT IN HOME BREWING* at http://hackaday.com/2 ## Documentation in other languages ### [English Documentation (work in progress)](docs/README_en.md) :us: -### [Nederlandse Vertaling (lopende werkzaamheden)](docs/README_nl.md) [](#lang-nl) -### [Documentação em Português (trabalho em andamento)](docs/README_pt.md) [](#lang-pt) +### [Nederlandse Vertaling (lopende werkzaamheden)](docs/README_nl.md) :nl: +### [Documentação em Português (trabalho em andamento)](docs/README_pt.md) :pt: *** @@ -36,6 +36,7 @@ Check out *IOT DEVICE PULLS ITS WEIGHT IN HOME BREWING* at http://hackaday.com/2 ## News +> 17.10.2017 Firmware 5.5.4: Various fixes for CraftBeerPi, BrewPiLess and Ubidots > 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. diff --git a/docs/FAQ-en.md b/docs/FAQ-en.md index ab56b275..29827408 100644 --- a/docs/FAQ-en.md +++ b/docs/FAQ-en.md @@ -3,6 +3,8 @@ - ***It doesn't work, I don't see anything**** The best way to find out what the iSpindle is doing as information is to read it's log. This can be done via a serial monitor like HTerm or Arduino IDE. Connect the spindle via Micro USB, then open the Com Port with the serial monitor above and read it. Set baud rate to `115200`. It brings light into the dark. +Here is a youtube howto: https://youtu.be/6xDW5GbIbUw + - ***How get to the iSpindel - the portal*** Switch it on, press the reset button 3-4 times which sets up an access point. That means you will see a new Wifi network "iSpindel" where you connect to with your computer, smartphone or tablet. Now the browser should automatically redirect you to the page[http://192.168.4.1](http://192.168.4.1). If not, navigate there yourself. If you are now on the portal page, under `Configuration` you can enter your token and the wifi password that you need for your network. Then click on `safe` and it will send the data to Ubidots. This means that the **iSpindel is not reachable in normal operation**, until you manually start the portal again. diff --git a/docs/FAQ.md b/docs/FAQ.md index 684c6ad4..ee277a39 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -1,7 +1,8 @@ # Fragen und Antworten FAQ - ***Es funktioniert nicht, ich sehe nichts*** -Am Besten du liest mit was die Spindel als Informationen ausgiebt. Das geht über einen Serial Monitor wie HTerm oder Arduino hat das auch. Die Spindel per Micro USB anschliessen, dann den Com Port mit obigen Serial Monitor öffnen und mitlesen. Das bringt Licht ins Dunkel. +Am Besten du liest mit was die Spindel als Informationen ausgiebt. Das geht über einen Serial Monitor wie HTerm oder Arduino. Die Spindel per Micro USB anschliessen, dann den Com Port mit obigen Serial Monitor öffnen und mitlesen, Baud `115200`. +Ein Youtube HowTo: https://youtu.be/6xDW5GbIbUw - ***Wie komme ich auf die iSpindel - das Portal*** Anschalten, 3-4 maliges drücken der Reset Taste stellt sie einen Access Point auf. D.h. du siehst ein neues WLAN "iSpindel" mit dem du dich verbindest. Jetzt wirst den Browser automatisch auf die Seite [http://192.168.4.1](http://192.168.4.1) dich weiterleiten. Falls nicht steuer sie selbst an. diff --git a/pio/lib/Globals/Globals.h b/pio/lib/Globals/Globals.h index 31e88e8a..dfc1ab87 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.5.3" +#define FIRMWAREVERSION "5.5.4" #define API_FHEM true @@ -49,7 +49,7 @@ extern Ticker flasher; #define ACCINTERVAL 200 #define MEDIANAVRG 3 -#define CBP_ENDPOINT (PSTR("/api/hydrometer/v1/data")) +#define CBP_ENDPOINT "/api/hydrometer/v1/data" #define DTUbiDots 0 #define DTThingspeak 1 diff --git a/pio/lib/Sender/Sender.cpp b/pio/lib/Sender/Sender.cpp index 4e461d48..e770a973 100644 --- a/pio/lib/Sender/Sender.cpp +++ b/pio/lib/Sender/Sender.cpp @@ -38,7 +38,7 @@ bool SenderClass::send(String server, String url, uint16_t port) msg += F(" HTTP/1.1\r\nHost: "); msg += server; msg += F("\r\nUser-Agent: iSpindel\r\nConnection: close\r\nContent-Type: application/json\r\nContent-Length: "); - msg += _jsonVariant.measureLength(); + msg += _jsonVariant.measureLength() + 2; msg += "\r\n"; _client.println(msg); @@ -126,7 +126,7 @@ bool SenderClass::sendFHEM(String server, uint16_t port, String name) String msg = String("GET /fhem?cmd.Test=set%20"); msg += name; - + for (const auto &kv : _jsonVariant.as()) { msg += "%20"; diff --git a/pio/src/iSpindel.cpp b/pio/src/iSpindel.cpp index 7ffd2141..7c2e23fd 100644 --- a/pio/src/iSpindel.cpp +++ b/pio/src/iSpindel.cpp @@ -883,13 +883,14 @@ void setup() if (wait > 50) break; } - float waited = (millis() - startedAt); - SerialOut(waited / 1000, false); - SerialOut(F(" s, result "), false); + auto waited = (millis() - startedAt); + SerialOut(waited, false); + SerialOut(F("ms, result "), false); SerialOut(WiFi.status()); if (WiFi.status() == WL_CONNECTED) { + SerialOut("IP: ", false); SerialOut(WiFi.localIP()); uploadData(my_api); delay(100); // workaround for https://github.com/esp8266/Arduino/issues/2750