Lõplik kood

ProjektEnkooder/platformio.ini

@@ -12,8 +12,7 @@
 platform = espressif8266
 board = d1_mini
 framework = arduino
-
-;upload_port = COM4 ; vasak
-upload_port = COM5 ; parem
+upload_port = COM4 ; vasak
+;upload_port = COM5 ; parem
 lib_deps = ITTIoT, ClickEncoder
 monitor_speed = 115200

ProjektEnkooder/src/main.cpp

@@ -15,7 +15,7 @@ ClickEncoder encoder = ClickEncoder(ENC_PINA, ENC_PINB, ENC_BTN, ENC_STEPS_PER_N
 #define LEVEL_MIN 0
 #define LEVEL_MAX 255
 #define LEVEL_DEFAULT 127
-#define LEVEL_STEP 4
+#define LEVEL_STEP 16
 int32_t level = LEVEL_DEFAULT;
  
 void iot_connected()

ProjektLED/.vscode/settings.json

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

ProjektLED/platformio.ini

@@ -12,7 +12,7 @@
 platform = espressif8266
 board = d1_mini
 framework = arduino
-lib_deps = ITTIoT, Buzzer, ClickEncoder, Adafruit NeoPixel
-upload_port = COM6
+lib_deps = ITTIoT, Adafruit NeoPixel
+;upload_port = COM4 ; vasak
+upload_port = COM5 ; parem
 monitor_speed = 115200
\ No newline at end of file
-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 <Ticker.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 TOPIC_LIGHT_LEVEL "ESP04/light_level"
+#define TOPIC_BUTTON "ESP02/button"
+#define TOPIC_PIR "ESP06/pir"
+#define TOPIC_ROOM_STATUS "light_server/room_status"
+
 #define WIFI_NAME "TalTech"
 #define WIFI_PASSWORD ""
-#define DHT_TOPIC "ESP06"
+
+#define MAIN_UPDATE_RATE_MS 5
+#define LIGHT_OFF_TIMEOUT_SEC 5
+#define DIM_TIME_SEC 10.0
+#define PIR_TIMEOUT_SEC 1
  
 //Stating, to which PIN the RGB LED has been connected
-#define PIN            D2
+#define PIN_LED 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);
+// Devices
+Adafruit_NeoPixel pixels = Adafruit_NeoPixel(1, PIN_LED, NEO_GRB + NEO_KHZ800);
+
+Ticker Timer1Sec;
+Ticker TimerDim;
+
+// Globals
+int32_t light_level = 127; // Light level to set brightness to
+int32_t curr_light_level = 127; // Current light level
+int32_t ext_light_level = 127; // Received light level
+int32_t dim_start_light_level;
+int32_t dim_light_level;
+#define MODE_AUTO 0
+#define MODE_ON 1
+#define MODE_OFF 2
+#define MODE_END 3
+#define MODE_DIM 4
+uint8_t led_mode = MODE_AUTO;
+bool pir_sensor_state = false;
+bool pir_room_full = true;
+bool room_full = false;
+char StrBuf[16];
+int LightOffTimeoutSec = 0;
+int PirTimeoutSec = 0;
+
+void DimCallback();
 
-// 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)
+void SetLEDMode(int Mode)
 {
-  int found = 0;
-  int strIndex[] = {0, -1};
-  int maxIndex = data.length()-1;
+  if(Mode == MODE_AUTO)
+  {
+    iot.publishMsg("light_mode", "auto");
 
-  for(int i=0; i<=maxIndex && found<=index; i++)
+    light_level = ext_light_level;
+    if(!room_full)
     {
-    if(data.charAt(i)==separator || i==maxIndex)
+      if(pir_sensor_state)
+        PirTimeoutSec = 0;
+      else
+        PirTimeoutSec = PIR_TIMEOUT_SEC;
+    }
+  }
+  else if(Mode == MODE_ON)
+  {
+    iot.publishMsg("light_mode", "on");
+
+    light_level = 255;
+
+    LightOffTimeoutSec = LIGHT_OFF_TIMEOUT_SEC;
+  }
+  else if(Mode == MODE_OFF)
   {
-        found++;
-        strIndex[0] = strIndex[1]+1;
-        strIndex[1] = (i == maxIndex) ? i+1 : i;
+    iot.publishMsg("light_mode", "off");
+
+    light_level = 0;
+
+    LightOffTimeoutSec = 0;
   }
+  else if(Mode == MODE_DIM)
+  {
+    light_level = dim_start_light_level;
+    dim_light_level = dim_start_light_level;
+    TimerDim.attach(DIM_TIME_SEC / dim_start_light_level, DimCallback);
+  }
+
+  led_mode = Mode;
+}
+
+// Called every second
+void Callback1Sec()
+{
+  if(LightOffTimeoutSec)
+  {
+    LightOffTimeoutSec--;
+    if(LightOffTimeoutSec == 0)
+    {
+      iot.publishMsg("light_mode", "dim");
+      dim_start_light_level = 255;
+      SetLEDMode(MODE_DIM);
+    }
+  }
+
+  if(PirTimeoutSec)
+  {
+    PirTimeoutSec--;
+    if(PirTimeoutSec == 0)
+    {
+      pir_room_full = false;
+      if(led_mode == MODE_AUTO && !room_full) light_level = 0;
+    }
+  }
+}
+
+// Light dimming callback
+void DimCallback()
+{
+  light_level = --dim_light_level;
+  if(dim_light_level == 0)
+  {
+    TimerDim.detach();
+    SetLEDMode(MODE_OFF);
   }
-  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 == TOPIC_LIGHT_LEVEL) // Light level changed
+  {
+    uint32_t level = atoi(msg.c_str());
+  
+    ext_light_level = level;
+    if(led_mode == MODE_AUTO) 
+    {
+      if(room_full || pir_room_full) light_level = level;
+    }
+  }
+  else if(topic == TOPIC_BUTTON) // Button pressed
+  {
+    if(msg == "pressed")
+    {
+      if(led_mode != MODE_DIM)
+      {
+        led_mode++;
+        if(led_mode == MODE_END) led_mode = MODE_AUTO;
+
+        TimerDim.detach();
+        SetLEDMode(led_mode);
+      }
+      else
+      {
+        TimerDim.detach();
+        SetLEDMode(MODE_ON);
+      }
+    }
+  }
+  else if(topic == TOPIC_PIR)
+  {
+    if(msg == "jah")
+    {
+      if(pir_sensor_state == false)
+      {
+        pir_sensor_state = true;
+        pir_room_full = true;
+        PirTimeoutSec = 0;
 
-  if(topic == MODULE_TOPIC)
+        if(led_mode == MODE_AUTO && !room_full) light_level = ext_light_level;
+      }
+    }
+    else if(msg == "ei")
     {
-    if(msg == "1"){
-      OnState = true;
-      Serial.println("true.");
+      if(pir_sensor_state == true)
+      {
+        pir_sensor_state = false;
+        PirTimeoutSec = PIR_TIMEOUT_SEC;
+      }
+    }
+  }
+  else if(topic == TOPIC_ROOM_STATUS)
+  {
+    if(msg == "full")
+    {
+      if(room_full == false)
+      {
+        room_full = true;
+
+        if(led_mode == MODE_OFF) SetLEDMode(MODE_AUTO);
+
+        if(led_mode == MODE_AUTO) light_level = ext_light_level;
+      }
+    }
+    else if(msg == "empty")
+    {
+      if(room_full == true)
+      {
+        room_full = false;
+
+        if(led_mode == MODE_AUTO)
+        {
+          if(!pir_room_full) light_level = 0;
         }
-    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!");
+
+  iot.subscribe(TOPIC_LIGHT_LEVEL);
+  iot.subscribe(TOPIC_BUTTON);
+  iot.subscribe(TOPIC_PIR);
+  iot.subscribe(TOPIC_ROOM_STATUS);
 }
  
-// Setting up some parameters for the ESP microcontroller
 void setup()
 {
-  Serial.begin(115200); // setting up serial connection parameter
+  Serial.begin(115200);
   Serial.println("Booting");
  
   iot.setConfig("wname", WIFI_NAME);
@@ -101,22 +230,26 @@ void setup()
   iot.printConfig(); // print json config to serial
   iot.setup();
  
-  pixels.begin(); // This initializes the NeoPixel library.
+  pixels.begin();
+  pixels.setPixelColor(0, 255, 255, 255);
+  pixels.setBrightness(255);
+  pixels.show();
+
+  Timer1Sec.attach(1.0, Callback1Sec);
 }
 
-//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);
+  iot.handle();
+
+  if(curr_light_level != light_level)
+  {
+      // Light level has changed
+      curr_light_level = light_level;
+
+      pixels.setPixelColor(0, curr_light_level, curr_light_level, curr_light_level);
       pixels.show();
-    Serial.println("clear.");
   }
-  delay(200); // Delay of 200 ms
+
+  delay(MAIN_UPDATE_RATE_MS);
 }

ProjektLED2/.gitignore

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

ProjektLED2/.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"
-    ]
-}

ProjektLED2/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

ProjektLED2/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

ProjektLED2/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, Adafruit NeoPixel
-;upload_port = COM4 ; vasak
-upload_port = COM5 ; parem
-monitor_speed = 115200
\ No newline at end of file

ProjektLED2/src/main.cpp

-#include <Arduino.h>
-#include <ittiot.h>
-#include <Adafruit_NeoPixel.h>
-#include <Ticker.h>
-#include <string.h>
-
-#define TOPIC_LIGHT_LEVEL "ESP04/light_level"
-#define TOPIC_BUTTON "ESP02/button"
-#define TOPIC_PIR "ESP06/pir"
-#define TOPIC_ROOM_STATUS "light_server/room_status"
-
-#define WIFI_NAME "TalTech"
-#define WIFI_PASSWORD ""
-
-#define MAIN_UPDATE_RATE_MS 5
-#define LIGHT_OFF_TIMEOUT_SEC 10
-#define DIM_TIME_SEC 12.5
-#define PIR_TIMEOUT_SEC 5
- 
-//Stating, to which PIN the RGB LED has been connected
-#define PIN_LED D2
-bool OnState = false;
- 
-// Devices
-Adafruit_NeoPixel pixels = Adafruit_NeoPixel(1, PIN_LED, NEO_GRB + NEO_KHZ800);
-
-Ticker Timer1Sec;
-Ticker TimerDim;
-
-// Globals
-int32_t light_level = 127; // Light level to set brightness to
-int32_t curr_light_level = 127; // Current light level
-int32_t ext_light_level = 127; // Received light level
-int32_t dim_start_light_level;
-int32_t dim_light_level;
-#define MODE_AUTO 0
-#define MODE_ON 1
-#define MODE_OFF 2
-#define MODE_END 3
-#define MODE_DIM 4
-uint8_t led_mode = MODE_AUTO;
-bool pir_sensor_state = false;
-bool pir_room_full = true;
-bool room_full = false;
-char StrBuf[16];
-int LightOffTimeoutSec = 0;
-int PirTimeoutSec = 0;
-
-void DimCallback();
-
-void SetLEDMode(int Mode)
-{
-  if(Mode == MODE_AUTO)
-  {
-    iot.publishMsg("light_mode", "auto");
-
-    light_level = ext_light_level;
-    if(!room_full)
-    {
-      if(pir_sensor_state)
-        PirTimeoutSec = 0;
-      else
-        PirTimeoutSec = PIR_TIMEOUT_SEC;
-    }
-  }
-  else if(Mode == MODE_ON)
-  {
-    iot.publishMsg("light_mode", "on");
-
-    light_level = 255;
-
-    LightOffTimeoutSec = LIGHT_OFF_TIMEOUT_SEC;
-  }
-  else if(Mode == MODE_OFF)
-  {
-    iot.publishMsg("light_mode", "off");
-
-    light_level = 0;
-
-    LightOffTimeoutSec = 0;
-  }
-  else if(Mode == MODE_DIM)
-  {
-    light_level = dim_start_light_level;
-    dim_light_level = dim_start_light_level;
-    TimerDim.attach(DIM_TIME_SEC / dim_start_light_level, DimCallback);
-  }
-
-  led_mode = Mode;
-}
-
-// Called every second
-void Callback1Sec()
-{
-  if(LightOffTimeoutSec)
-  {
-    LightOffTimeoutSec--;
-    if(LightOffTimeoutSec == 0)
-    {
-      dim_start_light_level = 255;
-      SetLEDMode(MODE_DIM);
-    }
-  }
-
-  if(PirTimeoutSec)
-  {
-    PirTimeoutSec--;
-    if(PirTimeoutSec == 0)
-    {
-      pir_room_full = false;
-      if(led_mode == MODE_AUTO && !room_full) light_level = 0;
-    }
-  }
-}
-
-// Light dimming callback
-void DimCallback()
-{
-  light_level = --dim_light_level;
-  if(dim_light_level == 0)
-  {
-    TimerDim.detach();
-    SetLEDMode(MODE_OFF);
-  }
-}
-
-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 == TOPIC_LIGHT_LEVEL) // Light level changed
-  {
-    uint32_t level = atoi(msg.c_str());
-  
-    ext_light_level = level;
-    if(led_mode == MODE_AUTO) 
-    {
-      if(room_full || pir_room_full) light_level = level;
-    }
-  }
-  else if(topic == TOPIC_BUTTON) // Button pressed
-  {
-    if(msg == "pressed")
-    {
-      if(led_mode != MODE_DIM)
-      {
-        led_mode++;
-        if(led_mode == MODE_END) led_mode = MODE_AUTO;
-
-        TimerDim.detach();
-        SetLEDMode(led_mode);
-      }
-      else
-      {
-        TimerDim.detach();
-        SetLEDMode(MODE_ON);
-      }
-    }
-  }
-  else if(topic == TOPIC_PIR)
-  {
-    if(msg == "jah")
-    {
-      if(pir_sensor_state == false)
-      {
-        pir_sensor_state = true;
-        pir_room_full = true;
-        PirTimeoutSec = 0;
-
-        if(led_mode == MODE_AUTO && !room_full) light_level = ext_light_level;
-      }
-    }
-    else if(msg == "ei")
-    {
-      if(pir_sensor_state == true)
-      {
-        pir_sensor_state = false;
-        PirTimeoutSec = PIR_TIMEOUT_SEC;
-      }
-    }
-  }
-  else if(topic == TOPIC_ROOM_STATUS)
-  {
-    if(msg == "full")
-    {
-      if(room_full == false)
-      {
-        room_full = true;
-
-        if(led_mode == MODE_OFF) SetLEDMode(MODE_AUTO);
-
-        if(led_mode == MODE_AUTO) light_level = ext_light_level;
-      }
-    }
-    else if(msg == "empty")
-    {
-      if(room_full == true)
-      {
-        room_full = false;
-
-        if(led_mode == MODE_AUTO)
-        {
-          if(!pir_room_full) light_level = 0;
-        }
-      }
-    }
-  }
-}
- 
-// 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(TOPIC_LIGHT_LEVEL);
-  iot.subscribe(TOPIC_BUTTON);
-  iot.subscribe(TOPIC_PIR);
-  iot.subscribe(TOPIC_ROOM_STATUS);
-}
- 
-void setup()
-{
-  Serial.begin(115200);
-  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();
-  pixels.setPixelColor(0, 255, 255, 255);
-  pixels.setBrightness(255);
-  pixels.show();
-
-  Timer1Sec.attach(1.0, Callback1Sec);
-}
-
-void loop()
-{
-  iot.handle();
-
-  if(curr_light_level != light_level)
-  {
-      // Light level has changed
-      curr_light_level = light_level;
-
-      pixels.setPixelColor(0, curr_light_level, curr_light_level, curr_light_level);
-      pixels.show();
-  }
-
-  switch(led_mode)
-  {
-    case MODE_AUTO:
-    {
-      /*if(!room_full)
-      {
-        if(!pir_room_full)
-      }*/
-    } break;
-    case MODE_ON: // LED always on
-    {
-
-    } break;
-    case MODE_OFF: // LED always off
-    {
-
-    } break;
-  }
-
-  delay(MAIN_UPDATE_RATE_MS);
-}

ProjektLED2/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