commit 09b05f3a657a715718c2edd8df632d4bf945cb95 Author: Laura Hausmann Date: Sat Aug 10 13:53:09 2019 +0200 Initial commit diff --git a/esh-actor/.gitignore b/esh-actor/.gitignore new file mode 100644 index 0000000..2de98ab --- /dev/null +++ b/esh-actor/.gitignore @@ -0,0 +1,6 @@ +.pio +.pioenvs +.piolibdeps +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json diff --git a/esh-actor/.travis.yml b/esh-actor/.travis.yml new file mode 100644 index 0000000..7c486f1 --- /dev/null +++ b/esh-actor/.travis.yml @@ -0,0 +1,67 @@ +# Continuous Integration (CI) is the practice, in software +# engineering, of merging all developer working copies with a shared mainline +# several times a day < https://docs.platformio.org/page/ci/index.html > +# +# Documentation: +# +# * Travis CI Embedded Builds with PlatformIO +# < https://docs.travis-ci.com/user/integration/platformio/ > +# +# * PlatformIO integration with Travis CI +# < https://docs.platformio.org/page/ci/travis.html > +# +# * User Guide for `platformio ci` command +# < https://docs.platformio.org/page/userguide/cmd_ci.html > +# +# +# Please choose one of the following templates (proposed below) and uncomment +# it (remove "# " before each line) or use own configuration according to the +# Travis CI documentation (see above). +# + + +# +# Template #1: General project. Test it using existing `platformio.ini`. +# + +# language: python +# python: +# - "2.7" +# +# sudo: false +# cache: +# directories: +# - "~/.platformio" +# +# install: +# - pip install -U platformio +# - platformio update +# +# script: +# - platformio run + + +# +# Template #2: The project is intended to be used as a library with examples. +# + +# language: python +# python: +# - "2.7" +# +# sudo: false +# cache: +# directories: +# - "~/.platformio" +# +# env: +# - PLATFORMIO_CI_SRC=path/to/test/file.c +# - PLATFORMIO_CI_SRC=examples/file.ino +# - PLATFORMIO_CI_SRC=path/to/test/directory +# +# install: +# - pip install -U platformio +# - platformio update +# +# script: +# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/esh-actor/.vscode/extensions.json b/esh-actor/.vscode/extensions.json new file mode 100644 index 0000000..8281e64 --- /dev/null +++ b/esh-actor/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ] +} \ No newline at end of file diff --git a/esh-actor/include/README b/esh-actor/include/README new file mode 100644 index 0000000..194dcd4 --- /dev/null +++ b/esh-actor/include/README @@ -0,0 +1,39 @@ + +This directory is intended for project header files. + +A header file is a file containing C declarations and macro definitions +to be shared between several project source files. You request the use of a +header file in your project source file (C, C++, etc) located in `src` folder +by including it, with the C preprocessing directive `#include'. + +```src/main.c + +#include "header.h" + +int main (void) +{ + ... +} +``` + +Including a header file produces the same results as copying the header file +into each source file that needs it. Such copying would be time-consuming +and error-prone. With a header file, the related declarations appear +in only one place. If they need to be changed, they can be changed in one +place, and programs that include the header file will automatically use the +new version when next recompiled. The header file eliminates the labor of +finding and changing all the copies as well as the risk that a failure to +find one copy will result in inconsistencies within a program. + +In C, the usual convention is to give header files names that end with `.h'. +It is most portable to use only letters, digits, dashes, and underscores in +header file names, and at most one dot. + +Read more about using header files in official GCC documentation: + +* Include Syntax +* Include Operation +* Once-Only Headers +* Computed Includes + +https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/esh-actor/lib/README b/esh-actor/lib/README new file mode 100644 index 0000000..6debab1 --- /dev/null +++ b/esh-actor/lib/README @@ -0,0 +1,46 @@ + +This directory is intended for project specific (private) libraries. +PlatformIO will compile them to static libraries and link into executable file. + +The source code of each library should be placed in a an own separate directory +("lib/your_library_name/[here are source files]"). + +For example, see a structure of the following two libraries `Foo` and `Bar`: + +|--lib +| | +| |--Bar +| | |--docs +| | |--examples +| | |--src +| | |- Bar.c +| | |- Bar.h +| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html +| | +| |--Foo +| | |- Foo.c +| | |- Foo.h +| | +| |- README --> THIS FILE +| +|- platformio.ini +|--src + |- main.c + +and a contents of `src/main.c`: +``` +#include +#include + +int main (void) +{ + ... +} + +``` + +PlatformIO Library Dependency Finder will find automatically dependent +libraries scanning project source files. + +More information about PlatformIO Library Dependency Finder +- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/esh-actor/platformio.ini b/esh-actor/platformio.ini new file mode 100644 index 0000000..6bb127a --- /dev/null +++ b/esh-actor/platformio.ini @@ -0,0 +1,14 @@ +; PlatformIO Project Configuration File +; +; Build options: build flags, source filter +; Upload options: custom upload port, speed and extra flags +; Library options: dependencies, extra library storages +; Advanced options: extra scripting +; +; Please visit documentation for the other options and examples +; https://docs.platformio.org/page/projectconf.html + +[env:nodemcuv2] +platform = espressif8266 +board = nodemcuv2 +framework = arduino diff --git a/esh-actor/src/main.cpp b/esh-actor/src/main.cpp new file mode 100644 index 0000000..4771236 --- /dev/null +++ b/esh-actor/src/main.cpp @@ -0,0 +1,82 @@ +#include +#include + +// white pcb series +U8G2_SSD1306_128X32_UNIVISION_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ D0, /* clock=*/ D1, /* data=*/ D2); + +// black pcb series +//U8G2_SSD1306_128X32_UNIVISION_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ D2, /* clock=*/ D5, /* data=*/ D4); + +#include +#include +#include +#include +#include + +ESP8266WiFiMulti WiFiMulti; + +void setup(void) { + Serial.begin(9600); + pinMode(D3, OUTPUT); + digitalWrite(D3, LOW); + delay(10); + u8g2.begin(); + u8g2.setFont(u8g2_font_6x10_mf); + u8g2.setFontMode(0); + WiFi.mode(WIFI_STA); + WiFiMulti.addAP("Darknet-IOT", "kekseFTW"); +} + +uint16_t adcval = 300; +unsigned char contrast = 0; +void loop(void) { + u8g2.firstPage(); + WiFiClient client; + HTTPClient http; + + u8g2.setContrast(contrast); + do { + char macbuf[WiFi.macAddress().length()+1]; + WiFi.macAddress().toCharArray(macbuf, sizeof(macbuf)); + u8g2.drawStr(0, 7, macbuf); + if (WiFiMulti.run() == WL_CONNECTED){ + char ipbuf[WiFi.localIP().toString().length()+1]; + WiFi.localIP().toString().toCharArray(ipbuf, sizeof(ipbuf)); + u8g2.drawStr(0, 17, ipbuf); + u8g2.drawStr(0, 27, "api rq..."); + + String url = String("http://ctrans.local:5000/api") + "?mac=" + WiFi.macAddress() + "&datatype=int" + + "&actortype=ESP8266_simple_actor" + "&state=Waiting"; + + if(http.begin(client, url)) { + int httpCode = http.GET(); + if(httpCode > 0) { + String payload = http.getString(); + Serial.printf("HTTP Response Code: %d\n", httpCode); + if (payload == "1"){ + Serial.println("HIGH:" + payload); + digitalWrite(D3, HIGH); + } + else{ + Serial.println("LOW:" + payload); + digitalWrite(D3, LOW); + } + if (httpCode == HTTP_CODE_OK || httpCode == HTTP_CODE_MOVED_PERMANENTLY) { + u8g2.drawStr(0, 27, "api http ok"); + } else { + u8g2.drawStr(0, 27, "api http error"); + } + } + http.end(); + } else { + u8g2.drawStr(0, 27, "api connect fail"); + } + } + else{ + u8g2.drawStr(0, 17, "WiFi connecting..."); + } + + //delay(60000); + + } while ( u8g2.nextPage() ); +} diff --git a/esh-actor/test/README b/esh-actor/test/README new file mode 100644 index 0000000..df5066e --- /dev/null +++ b/esh-actor/test/README @@ -0,0 +1,11 @@ + +This directory is intended for PIO Unit Testing and project tests. + +Unit Testing is a software testing method by which individual units of +source code, sets of one or more MCU program modules together with associated +control data, usage procedures, and operating procedures, are tested to +determine whether they are fit for use. Unit testing finds problems early +in the development cycle. + +More information about PIO Unit Testing: +- https://docs.platformio.org/page/plus/unit-testing.html diff --git a/esh-esp.code-workspace b/esh-esp.code-workspace new file mode 100644 index 0000000..70a2970 --- /dev/null +++ b/esh-esp.code-workspace @@ -0,0 +1,17 @@ +{ + "folders": [ + { + "path": "esh-sensor" + }, + { + "name": "esh-actor", + "path": "esh-actor" + } + ], + "settings": { + "terminal.integrated.env.linux": { + "PATH": "/home/laura/.platformio/penv/bin:/home/laura/.platformio/penv:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl", + "PLATFORMIO_CALLER": "vscode" + } + } +} \ No newline at end of file diff --git a/esh-sensor/.gitignore b/esh-sensor/.gitignore new file mode 100644 index 0000000..2de98ab --- /dev/null +++ b/esh-sensor/.gitignore @@ -0,0 +1,6 @@ +.pio +.pioenvs +.piolibdeps +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json diff --git a/esh-sensor/.travis.yml b/esh-sensor/.travis.yml new file mode 100644 index 0000000..7c486f1 --- /dev/null +++ b/esh-sensor/.travis.yml @@ -0,0 +1,67 @@ +# Continuous Integration (CI) is the practice, in software +# engineering, of merging all developer working copies with a shared mainline +# several times a day < https://docs.platformio.org/page/ci/index.html > +# +# Documentation: +# +# * Travis CI Embedded Builds with PlatformIO +# < https://docs.travis-ci.com/user/integration/platformio/ > +# +# * PlatformIO integration with Travis CI +# < https://docs.platformio.org/page/ci/travis.html > +# +# * User Guide for `platformio ci` command +# < https://docs.platformio.org/page/userguide/cmd_ci.html > +# +# +# Please choose one of the following templates (proposed below) and uncomment +# it (remove "# " before each line) or use own configuration according to the +# Travis CI documentation (see above). +# + + +# +# Template #1: General project. Test it using existing `platformio.ini`. +# + +# language: python +# python: +# - "2.7" +# +# sudo: false +# cache: +# directories: +# - "~/.platformio" +# +# install: +# - pip install -U platformio +# - platformio update +# +# script: +# - platformio run + + +# +# Template #2: The project is intended to be used as a library with examples. +# + +# language: python +# python: +# - "2.7" +# +# sudo: false +# cache: +# directories: +# - "~/.platformio" +# +# env: +# - PLATFORMIO_CI_SRC=path/to/test/file.c +# - PLATFORMIO_CI_SRC=examples/file.ino +# - PLATFORMIO_CI_SRC=path/to/test/directory +# +# install: +# - pip install -U platformio +# - platformio update +# +# script: +# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/esh-sensor/.vscode/extensions.json b/esh-sensor/.vscode/extensions.json new file mode 100644 index 0000000..8281e64 --- /dev/null +++ b/esh-sensor/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ] +} \ No newline at end of file diff --git a/esh-sensor/.vscode/settings.json b/esh-sensor/.vscode/settings.json new file mode 100644 index 0000000..f78537c --- /dev/null +++ b/esh-sensor/.vscode/settings.json @@ -0,0 +1,7 @@ +{ + "terminal.integrated.env.linux": { + "PATH": "/home/laura/.platformio/penv/bin:/home/laura/.platformio/penv:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl", + "PLATFORMIO_CALLER": "vscode" + }, + "C_Cpp.intelliSenseEngineFallback": "Disabled" +} \ No newline at end of file diff --git a/esh-sensor/include/README b/esh-sensor/include/README new file mode 100644 index 0000000..194dcd4 --- /dev/null +++ b/esh-sensor/include/README @@ -0,0 +1,39 @@ + +This directory is intended for project header files. + +A header file is a file containing C declarations and macro definitions +to be shared between several project source files. You request the use of a +header file in your project source file (C, C++, etc) located in `src` folder +by including it, with the C preprocessing directive `#include'. + +```src/main.c + +#include "header.h" + +int main (void) +{ + ... +} +``` + +Including a header file produces the same results as copying the header file +into each source file that needs it. Such copying would be time-consuming +and error-prone. With a header file, the related declarations appear +in only one place. If they need to be changed, they can be changed in one +place, and programs that include the header file will automatically use the +new version when next recompiled. The header file eliminates the labor of +finding and changing all the copies as well as the risk that a failure to +find one copy will result in inconsistencies within a program. + +In C, the usual convention is to give header files names that end with `.h'. +It is most portable to use only letters, digits, dashes, and underscores in +header file names, and at most one dot. + +Read more about using header files in official GCC documentation: + +* Include Syntax +* Include Operation +* Once-Only Headers +* Computed Includes + +https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/esh-sensor/lib/README b/esh-sensor/lib/README new file mode 100644 index 0000000..6debab1 --- /dev/null +++ b/esh-sensor/lib/README @@ -0,0 +1,46 @@ + +This directory is intended for project specific (private) libraries. +PlatformIO will compile them to static libraries and link into executable file. + +The source code of each library should be placed in a an own separate directory +("lib/your_library_name/[here are source files]"). + +For example, see a structure of the following two libraries `Foo` and `Bar`: + +|--lib +| | +| |--Bar +| | |--docs +| | |--examples +| | |--src +| | |- Bar.c +| | |- Bar.h +| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html +| | +| |--Foo +| | |- Foo.c +| | |- Foo.h +| | +| |- README --> THIS FILE +| +|- platformio.ini +|--src + |- main.c + +and a contents of `src/main.c`: +``` +#include +#include + +int main (void) +{ + ... +} + +``` + +PlatformIO Library Dependency Finder will find automatically dependent +libraries scanning project source files. + +More information about PlatformIO Library Dependency Finder +- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/esh-sensor/platformio.ini b/esh-sensor/platformio.ini new file mode 100644 index 0000000..6bb127a --- /dev/null +++ b/esh-sensor/platformio.ini @@ -0,0 +1,14 @@ +; PlatformIO Project Configuration File +; +; Build options: build flags, source filter +; Upload options: custom upload port, speed and extra flags +; Library options: dependencies, extra library storages +; Advanced options: extra scripting +; +; Please visit documentation for the other options and examples +; https://docs.platformio.org/page/projectconf.html + +[env:nodemcuv2] +platform = espressif8266 +board = nodemcuv2 +framework = arduino diff --git a/esh-sensor/src/main.cpp b/esh-sensor/src/main.cpp new file mode 100644 index 0000000..6843a4d --- /dev/null +++ b/esh-sensor/src/main.cpp @@ -0,0 +1,91 @@ +#include +#include + +// white pcb series +U8G2_SSD1306_128X32_UNIVISION_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ D0, /* clock=*/ D1, /* data=*/ D2); + +// black pcb series +//U8G2_SSD1306_128X32_UNIVISION_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ D2, /* clock=*/ D5, /* data=*/ D4); + +#include +#include +#include +#include +#include + +ESP8266WiFiMulti WiFiMulti; + +void setup(void) { + Serial.begin(9600); + delay(10); + u8g2.begin(); + u8g2.setFont(u8g2_font_6x10_mf); + u8g2.setFontMode(0); + WiFi.mode(WIFI_STA); + WiFiMulti.addAP("Darknet-IOT", "kekseFTW"); + pinMode(D3, INPUT_PULLUP); + pinMode(D6, INPUT_PULLUP); + pinMode(D7, INPUT_PULLUP); + pinMode(D8, INPUT_PULLUP); +} + +uint16_t adcval = 300; +unsigned char contrast = 0; + +bool state = false; +bool tmp = false; + +void loop(void) { + u8g2.firstPage(); + WiFiClient client; + HTTPClient http; + + u8g2.setContrast(contrast); + + String payload = ""; + + do { + char macbuf[WiFi.macAddress().length()+1]; + WiFi.macAddress().toCharArray(macbuf, sizeof(macbuf)); + u8g2.drawStr(0, 7, macbuf); + + if (WiFiMulti.run() == WL_CONNECTED){ + char ipbuf[WiFi.localIP().toString().length()+1]; + WiFi.localIP().toString().toCharArray(ipbuf, sizeof(ipbuf)); + u8g2.drawStr(0, 17, ipbuf); + u8g2.drawStr(0, 27, "api rq..."); + + if (!digitalRead(D3)){ + if (!tmp){ + tmp = true; + state = !state; + String url = String("http://ctrans.local:5000/api") + "?mac=" + WiFi.macAddress() + "&datatype=bool" + + "&sensortype=ESP8266_simple_sensor" + "&value=" + state + "&displayunit=nA"; + if(http.begin(client, url)) { + int httpCode = http.GET(); + if(httpCode > 0) { + Serial.printf("HTTP Response Code: %d\n", httpCode); + if (httpCode == HTTP_CODE_OK || httpCode == HTTP_CODE_MOVED_PERMANENTLY) { + u8g2.drawStr(0, 27, "api http ok"); + } else { + u8g2.drawStr(0, 27, "api http error"); + } + } + http.end(); + } else { + u8g2.drawStr(0, 27, "api connect fail"); + } + } + } + else if (tmp) { + tmp = false; + } + } + else{ + u8g2.drawStr(0, 17, "WiFi connecting..."); + } + delay(50); + //delay(60000); + + } while ( u8g2.nextPage() ); +} diff --git a/esh-sensor/test/README b/esh-sensor/test/README new file mode 100644 index 0000000..df5066e --- /dev/null +++ b/esh-sensor/test/README @@ -0,0 +1,11 @@ + +This directory is intended for PIO Unit Testing and project tests. + +Unit Testing is a software testing method by which individual units of +source code, sets of one or more MCU program modules together with associated +control data, usage procedures, and operating procedures, are tested to +determine whether they are fit for use. Unit testing finds problems early +in the development cycle. + +More information about PIO Unit Testing: +- https://docs.platformio.org/page/plus/unit-testing.html