Merge branch 'main' of https://gitlab.pld.ttu.ee/karudu/IoTvalgustus

ProjektLED/.gitignore

+.pio
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch

ProjektLED/.vscode/extensions.json

+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}

ProjektLED/.vscode/settings.json

+{
+    "C_Cpp.errorSquiggles": "disabled"
+}
\ No newline at end of file

ProjektLED/include/README

+
+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

ProjektLED/lib/README

+
+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 <Foo.h>
+#include <Bar.h>
+
+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

ProjektLED/platformio.ini

+; 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:d1_mini]
+platform = espressif8266
+board = d1_mini
+framework = arduino
+lib_deps = ITTIoT, Buzzer, ClickEncoder, Adafruit NeoPixel
+upload_port = COM6
+monitor_speed = 115200
+upload_speed = 921600

ProjektLED/src/main.cpp

+/*
+ * IoT Buzzer example
+ *
+ * This example subscribe to the "buzzer" topic. When a message received, then it
+ * will make a sound
+ *
+ * Created 02 Febrary 2018 by Heiko Pikner
+ */
+ 
+// Includes global variables and librarys that the Buzzer uses
+#include <Arduino.h>
+#include <ittiot.h>
+#include <Adafruit_NeoPixel.h>
+#include <string.h>
+ 
+//Pin definition for the buzzer (GPIO15)
+#define BUZZER_PIN D8
+#define MODULE_TOPIC "ESP06/pir"
+#define MODULE_TOPIC_LED "LEDslider"
+#define WIFI_NAME "TalTech"
+#define WIFI_PASSWORD ""
+#define DHT_TOPIC "ESP06"
+ 
+//Stating, to which PIN the RGB LED has been connected
+#define PIN            D2
+bool OnState = false;
+int sliderVal = 10;
+ 
+// When we setup the NeoPixel library, we tell it how many pixels, and which pin to use to send signals.
+// Note that for older NeoPixel strips you might need to change the third parameter--see the strandtest
+// example for more information on possible values.
+Adafruit_NeoPixel pixels = Adafruit_NeoPixel(1, PIN, NEO_GRB + NEO_KHZ800);
+ 
+// Splitting string into smaller parts, so that the colour code can be set to the RGB LED
+// https://stackoverflow.com/questions/9072320/split-string-into-string-array
+String getValue(String data, char separator, int index)
+{
+  int found = 0;
+  int strIndex[] = {0, -1};
+  int maxIndex = data.length()-1;
+ 
+  for(int i=0; i<=maxIndex && found<=index; i++)
+  {
+    if(data.charAt(i)==separator || i==maxIndex)
+    {
+        found++;
+        strIndex[0] = strIndex[1]+1;
+        strIndex[1] = (i == maxIndex) ? i+1 : i;
+    }
+  }
+  return found>index ? data.substring(strIndex[0], strIndex[1]) : "";
+}
+ 
+// Changes the RGB LED color and send this info to the computer over COM port
+// mosquitto_pub -u test -P test -t "ITT/IOT/3/rgb" -m "51;255;153"
+void iot_received(String topic, String msg)
+{
+  Serial.print("MSG FROM USER callback, topic: ");
+  Serial.print(topic);
+  Serial.print(" payload: ");
+  Serial.println(msg);
+ 
+  if(topic == MODULE_TOPIC)
+  {
+    if(msg == "1"){
+      OnState = true;
+      Serial.println("true.");
+    }
+    else{
+      OnState = false;
+      Serial.println("false.");
+    }
+  }
+  if(topic == MODULE_TOPIC_LED){
+    //char *msg2;
+    //msg2 = msg;
+    //sliderVal = atoi(msg2);
+  }
+}
+ 
+// Subscrining to a MQTT topic, to get the RGB color code for the RGB LED
+void iot_connected()
+{
+  Serial.println("MQTT connected callback");
+  iot.subscribe(MODULE_TOPIC);
+  iot.log("IoT NeoPixel example!");
+}
+ 
+// Setting up some parameters for the ESP microcontroller
+void setup()
+{
+  Serial.begin(115200); // setting up serial connection parameter
+  Serial.println("Booting");
+ 
+  iot.setConfig("wname", WIFI_NAME);
+  iot.setConfig("wpass", WIFI_PASSWORD);
+  iot.setConfig("msrv", "193.40.245.72");
+  iot.setConfig("mport", "1883");
+  iot.setConfig("muser", "test");
+  iot.setConfig("mpass", "test");
+  iot.printConfig(); // print json config to serial
+  iot.setup();
+ 
+  pixels.begin(); // This initializes the NeoPixel library.
+}
+ 
+//Main code, which runs in loop
+void loop()
+{
+  iot.handle(); // Calls iot.handle out
+  if(OnState == true){
+    pixels.setPixelColor(0, 255, 255, 255);
+    pixels.show();
+    Serial.println("show.");
+  }
+  else{
+    pixels.setPixelColor(0, 0, 0, 0);
+    pixels.show();
+    Serial.println("clear.");
+  }
+  delay(200); // Delay of 200 ms
+}
\ No newline at end of file

ProjektLED/test/README

+
+This directory is intended for PlatformIO Test Runner 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 PlatformIO Unit Testing:
+- https://docs.platformio.org/en/latest/advanced/unit-testing/index.html

ProjektPIR/.gitignore

+.pio
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch

ProjektPIR/.vscode/extensions.json

+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}

ProjektPIR/include/README

+
+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

ProjektPIR/lib/README

+
+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 <Foo.h>
+#include <Bar.h>
+
+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

ProjektPIR/platformio.ini

+; 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:d1_mini]
+platform = espressif8266
+board = d1_mini
+framework = arduino
+lib_deps = ITTIoT
+upload_port = COM3
+upload_speed = 921600
+monitor_speed = 115200
\ No newline at end of file

ProjektPIR/src/main.cpp

+/*
+ * IoT PIR example
+ *
+ * This example subscribe to the "pir" topic. When a message received, then it
+ * will switch the pir module "ON" and "OFF"
+ *
+ * Created 21 Febuary 2018 by Heiko Pikner and Mallor Kingsepp
+ */
+ 
+// Includes global variables and librarys that the PIR shield uses
+#include <Arduino.h>
+#include <ittiot.h>
+ 
+#define MODULE_TOPIC "ESP06/pir"
+#define WIFI_NAME "TalTech"
+#define WIFI_PASSWORD ""
+ 
+//Pin definition for the PIR (GPIO14)
+#define PIR_PIN D5
+//Pin definition for the PIR LED (GPIO16)
+#define PIR_LED_PIN D4
+ 
+// PIR state for detection
+bool pirState;
+// State that switches PIR on and off
+bool onState;
+
+// If message received for PIR topic. For example:
+// mosquitto_pub -u test -P test -t "ITT/IOT/3/pir" -m "1"
+void iot_received(String topic, String msg)
+{
+  Serial.print("MSG FROM USER callback, topic: ");
+  Serial.print(topic);
+  Serial.print(" payload: ");
+  Serial.println(msg);
+ 
+  if(topic == MODULE_TOPIC)
+  {
+    // Switching the PIR shield on or off, depending what message is received
+    if(msg == "ON")
+    {
+  	   onState = true;
+       
+    }
+    if(msg == "OFF")
+    {
+  	   onState = false;
+    }
+  }
+}
+ 
+// Function started after the connection to the server is established.
+void iot_connected()
+{
+  Serial.println("MQTT connected callback");
+  // Subscribe to the topic "pir"
+  iot.subscribe(MODULE_TOPIC);
+  iot.log("IoT PIR example!");
+}
+ 
+void setup()
+{
+  Serial.begin(115200); // setting up serial connection parameter
+  Serial.println("Booting");
+ 
+  iot.setConfig("wname", WIFI_NAME);
+  iot.setConfig("wpass", WIFI_PASSWORD);
+  iot.setConfig("msrv", "193.40.245.72");
+  iot.setConfig("msport", "1883");
+  iot.printConfig(); // Print json config to serial
+  iot.setup(); // Initialize IoT library
+ 
+  // Initialize PIR pin
+  pinMode(PIR_PIN, INPUT);
+  pinMode(PIR_LED_PIN, OUTPUT);
+}
+ 
+void loop()
+{
+  iot.handle(); // IoT behind the plan work, it should be periodically called
+  delay(200); // Wait 0.2 seconds
+ 
+  if(onState == true){
+    // This part of the code is executed, when PIR shield is active
+    if(digitalRead(PIR_PIN))
+    {
+      if(pirState == false)
+      {
+        // When PIR has detected motion, then the LED is switched on and text “Motion detected!” is published to the MQTT broker
+        digitalWrite(PIR_LED_PIN, HIGH);
+        String msg = String("1");
+        iot.publishMsg("pir", msg.c_str());
+        //Serial.println(msg);
+        pirState = true;
+      }
+    }
+    else
+    {
+      if(pirState == true)
+      {
+        // PIR shields LED is switched off, when it is not detecting any motion
+        digitalWrite(PIR_LED_PIN, LOW);
+        String msg = String("0");
+        iot.publishMsg("pir", msg.c_str());
+        pirState = false;
+      }
+    }
+  }
+  else{
+    // When the PIR shield has been switched off, then its offline state is sent to the MQTT broker
+    iot.log("PIR offline");
+    delay(2000); // Waiting 2 secondes
+  }
+}
\ No newline at end of file

ProjektPIR/test/README

+
+This directory is intended for PlatformIO Test Runner 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 PlatformIO Unit Testing:
+- https://docs.platformio.org/en/latest/advanced/unit-testing/index.html

kontrollerid.txt

 ESP02 Nupp
 ESP02 Nupp
-ESP03 PIR
+ESP03 LED
 ESP04 Enkooder
 ESP04 Enkooder
-ESP06 LED
+ESP06 PIR