renamed directories

software/firmware/energy-monitor/02-energy-monitor-mqtt/environment.h

@@ -3,4 +3,4 @@
 #define secret_password "guestguest"
 #define mqtt_server "192.168.2.103"
 #define mqtt_port 1883
-#define mqtt_prefix "/iot-platform/engergy-montitor/test-device"
+#define mqtt_prefix "/iot-platform/engergy-monitor/test-device"

software/firmware/energy-monitor/README.md

@@ -108,7 +108,7 @@ To connect to your Wifi and access your MQTT server you have to add this to an `
 #define secret_password "guestguest"
 #define mqtt_server "192.168.2.103"
 #define mqtt_port 1883
-#define mqtt_prefix "/iot-platform/engergy-montitor/test-device"
+#define mqtt_prefix "/iot-platform/energy-monitor/test-device"
 ```
 
 The `mqtt_server` in tis example posts to my local IP adress. The Wifi network is a `Guest` network I just created for this test.
@@ -121,8 +121,8 @@ You can subscribe to your local MQTT server and subscribe to all or just the int
 
 ```sh
 mosquitto_sub -h localhost -t '#' -p 1883 #all
-mosquitto_sub -h localhost -t '/iot-platform/engergy-montitor/test-device/ampere' -p 1883 #power
+mosquitto_sub -h localhost -t '/iot-platform/energy-monitor/test-device/ampere' -p 1883 #power
-mosquitto_sub -h localhost -t '/iot-platform/engergy-montitor/test-device/watt' -p 1883 #current
+mosquitto_sub -h localhost -t '/iot-platform/energy-monitor/test-device/watt' -p 1883 #current
 ```
 
 ##### Interesting code blocks

software/firmware/energy-montior/01-energy-monitor-serial-out/01-energy-monitor-serial-out.ino

@@ -1,26 +0,0 @@
-/*
-SCT-013 Sensor - Power meassurement, based on Thomas Edlinger's code for "www.edistechlab.com"
-Required libraries (Tools -> manage libraries)
- - EmonLib libary V1.1.0 by OpenEnergyMonitor
-Based on EmonLibrary examples openenergymonitor.org, Licence GNU GPL V3
-*/
-
-#include "EmonLib.h"
-EnergyMonitor emon1;
-const byte current1Pin = A1; // ADC-PIN
-const byte voltage = 230;  // Power voltage in Europe = 230 V
-
-void setup() {
-  Serial.begin(115200);
-  analogReadResolution(ADC_BITS); // activate 12 Bit resolution for our ESP32
-  emon1.current(current1Pin, 8);  // Pin and Calibration
-}
-
-void loop() {
-  double Irms = emon1.calcIrms(1480);
-  Serial.print(Irms*voltage);
-  Serial.print(" Watt  -  ");
-  Serial.print(Irms);
-  Serial.println(" Ampere");
-  delay(1000);
-}

software/firmware/energy-montior/02-energy-monitor-mqtt/02-energy-monitor-mqtt.ino

@@ -1,116 +0,0 @@
-/*
-Required libraries (Tools -> manage libraries)
- - EmonLib@1.1.0
- - PubSubClient@2.8.0
- - Wifi
-*/
-#include <stdlib.h>
-#include <string.h>
-#include "EmonLib.h"
-#include <WiFi.h>
-#include <PubSubClient.h>
-#include "environment.h" // put your credentials and configuration in, here
-
-// sensor
-EnergyMonitor emon1;
-const byte current1Pin = A1; // ADC-PIN
-const byte voltage = 230;  // Power voltage in Europe = 230 V
-
-// refrences from environment.h
-const char* ssid = secrect_ssid;
-const char* password = secret_password;
-const char* mqttServer = mqtt_server;
-const int mqttPort = mqtt_port;
-const char* mqttPrefix = mqtt_prefix;
-
-// wifi and MQTT
-WiFiClient wifiClient;
-PubSubClient client(wifiClient);
-
-
-void setup() {
-  Serial.begin(115200);
-  Serial.setTimeout(500);
-  setup_energy_sensor();
-  setup_wifi();
-  setup_mqtt();
-}
-
-void setup_energy_sensor() {
-  analogReadResolution(ADC_BITS); // activate 12 Bit resolution for our ESP32
-  emon1.current(current1Pin, 8);  // Pin and Calibration
-}
-
-void setup_wifi() {
-    delay(10);
-    Serial.println();
-    Serial.print("Connecting to ");
-    Serial.println(ssid);
-    WiFi.begin(ssid, password);
-    while (WiFi.status() != WL_CONNECTED) {
-      delay(500);
-      Serial.print(".");
-    }
-    randomSeed(micros());
-    Serial.println("");
-    Serial.println("WiFi connected");
-    Serial.println("IP address: ");
-    Serial.println(WiFi.localIP());
-}
-
-void setup_mqtt() {
-  client.setServer(mqttServer, mqttPort);
-  // Loop until we're reconnected
-  while (!client.connected()) {
-    Serial.print("Attempting MQTT connection...");
-    // Create a random client ID
-    String clientId = "ESP32Client-";
-    clientId += String(random(0xffff), HEX);
-    // Attempt to connect
-    if (client.connect(clientId.c_str())) {
-      Serial.println("connected");
-      //Once connected, publish an announcement...
-      client.publish(concat(mqttPrefix, "/status"), "online");
-      // ... and resubscribe
-    } else {
-      Serial.print("failed, rc=");
-      Serial.print(client.state());
-      Serial.println(" try again in 5 seconds");
-      // Wait 5 seconds before retrying
-      delay(5000);
-    }
-  }
-}
-
-
-char* concat(const char* str1, const char* str2) {
-    char* result;
-    asprintf(&result, "%s%s", str1, str2);
-    return result;
-}
-
-void loop() {
-  // get values
-  double irms = emon1.calcIrms(1480);
-  double power = irms * voltage;
-
-  // debug, print out on serial
-  Serial.print(power);
-  Serial.print(" Watt  -  ");
-  Serial.print(irms);
-  Serial.println(" Ampere");
-
-  // convert double to char array for MQTT
-  char powerArray[10];
-  snprintf(powerArray, 10, "%f", power);
-  char irmsArray[10];
-  snprintf(irmsArray, 10, "%f", irms);
-
-
-  // publish values
-  client.publish(concat(mqttPrefix, "/watt"), powerArray);
-  client.publish(concat(mqttPrefix, "/ampere"), irmsArray);
- 
-  // wait a second
-  delay(1000);
-}

software/firmware/energy-montior/02-energy-monitor-mqtt/environment.h

@@ -1,6 +0,0 @@
-// Replace with your network credentials
-#define secrect_ssid "Guest"
-#define secret_password "guestguest"
-#define mqtt_server "192.168.2.103"
-#define mqtt_port 1883
-#define mqtt_prefix "/iot-platform/engergy-montitor/test-device"

software/firmware/energy-montior/README.md

@@ -1,144 +0,0 @@
-# Energy Monitor
-
-Our energy monitor is based on the openenergymonitor.org project (Licence GNU GPL V3). 
-
-It uses our HelTec Wireless Stick. This - of course - can be replaced by a cheaper ESP32 module.
-
-Power Measurement is done by a SCT013 clamp (100A:50mA).
-
-## Used materials
-
-* ESP32 module (e.g. Heltec Wireless Stick)
-* 3 x SCT-013-100 (100 A), see: http://openenergymonitor.org/emon/node/156
-* 6 x 10 kOhm Resistors 1/4 W
-* 1 x 22 Ohm Resistor 1/4 W (TODO: I am using a 47 Ohm Resistor to be replaced)
-* 3 x 10 uF Elko 10 V
-* 3 x 3,5 mm audio jack connector
-
-### PinOut
-
-![PinOut](https://resource.heltec.cn/download/Wireless_Stick_V3/HTIT-WS_V3.png "PinOut")
-
-We use A1, A2 and A3 because the are free (most ADCs are already used on the HelTec Board)
-
-### Sensors 
-
-The SCT-013 sensors are small current transformers (SCT). They have a ferromagnetic core that can be opened and in which we can enclose our conductor. This conductor is the primary winding and the secondary winding is fixed in the sensor and can have 2000 turns. This gives us a ratio of 1:2000 as an example.
-
-When AC current flows through the conductor, a magnetic flux is generated in the ferromagnetic core, which in turn generates an electric current in the secondary winding.
-
-I could not meassure "small" power consumptions (like a LED lamp or a light stripe, as the magnetix flux in the ferromagnet core seems to be too small). 
-
-![clamp on wire](./docs/images/clamp1.jpeg "clamp on a wire")
-
-I was able to measure high loads (like a heater the can be switched between 1 kW and 2 kW).
-
-![heater](./docs/images/example-heater.png "serial out of a heater")
-
-Make sure the clamp is *always positioned towards the consumer*, otherwise it does *not* work. There is a small arrow on the case.
-
-![point the clamp](./docs/images/clamp2.jpeg "point the clamp")
-
-> Attention: I could not measure any meaningful values on the "cable". I had to go to the wire.
-
-![cable](./docs/images/clamp3.jpeg "use the clamp on the wire, not on the cable")
-
-### Breadboard
-
-Let's start with a simple breadboard layout.
-
-![Breadboard](./docs/images/breadboard.png "breakboard layout")
-![Photo of breadboard](./docs/images/photo-breadboard.jpeg "photo of breadboard")
-
-To understand this, have a look at this plan:
-
-![Plan](./docs/images/plan.png "plan")
-
-R1 & R2 are a voltage divider that provides the 1.65 V source. We use 10 kΩ for mains powered monitors. If we want to run on batteries, we have to choose differnt ones (like 470 kΩ resistors to keep the power consumption to a minimum).
-
-Capacitor C1 has a low reactance - a few hundred ohms - and provides a path for the alternating current to bypass the resistor. A value of 10 μF is suitable.
-
-R3 is the burden resistor. Ideal burden would be 19 Ω. As this is not a common value, you could choose 18 Ω or 22 Ω (I am still using a 47 Ω restistor, that has to be replaced).
-
-See the Fritzing file for [details](./energy-monitor/energy-monitor.fzz).
-
-### Code
-
-#### Print to serial out
-
-Start with a simple code that just prints the values. The code is quite simple, as we can use the existing *[EmonLib libary V1.1.0 by OpenEnergyMonitor](https://docs.openenergymonitor.org/electricity-monitoring/ct-sensors/)*.
-
-[Check out the small amount of code to print the values to serial out.](./01-energy-monitor-serial-out/) This piece of code is based on on Thomas Edlinger's code for [Edi's Tech Lab](https://www.edistechlab.com).
-
-The only interesting part is this line:
-
-```C
-  emon1.current(current1Pin, 8);  // Pin and Calibration
-```
-
-The [calibration](https://docs.openenergymonitor.org/electricity-monitoring/ctac/calibration.html) value "8" was done with a Fluke multimeter (and maybe a not so ideal burden resistor).
-
-The code just prints the current power consumption to serial out:
-
-```
-16:28:18.915 -> 2853.16 Watt  -  12.41 Ampere
-16:28:19.998 -> 2854.63 Watt  -  12.41 Ampere
-16:28:21.119 -> 2850.93 Watt  -  12.40 Ampere
-16:28:22.207 -> 1702.19 Watt  -  7.40 Ampere
-16:28:23.289 -> 400.62 Watt  -  1.74 Ampere
-16:28:24.367 -> 94.42 Watt  -  0.41 Ampere
-```
-#### Post to MQTT
-
-##### Boot up MQTT
-
-First, boot your local server infrastructure:
-
-```sh
-docker-compose --file software/container/docker-compose.yml up
-```
-
-##### Credentials
-
-To connect to your Wifi and access your MQTT server you have to add this to an `environment` [header file](./02-energy-monitor-mqtt/environment.h):
-
-```C
-// Replace with your network credentials
-#define secrect_ssid "Guest"
-#define secret_password "guestguest"
-#define mqtt_server "192.168.2.103"
-#define mqtt_port 1883
-#define mqtt_prefix "/iot-platform/engergy-montitor/test-device"
-```
-
-The `mqtt_server` in tis example posts to my local IP adress. The Wifi network is a `Guest` network I just created for this test.
-
-The `mqtt_prefix` should be different per device, as this is the topic prefix used to identify the device.
-
-#### Testing
-
-You can subscribe to your local MQTT server and subscribe to all or just the interesting topics:
-
-```sh
-mosquitto_sub -h localhost -t '#' -p 1883 #all
-mosquitto_sub -h localhost -t '/iot-platform/engergy-montitor/test-device/ampere' -p 1883 #power
-mosquitto_sub -h localhost -t '/iot-platform/engergy-montitor/test-device/watt' -p 1883 #current
-```
-
-##### Interesting code blocks
-
-Posting to MQTT is quite simple. After setting up Wifi and connection to the MQTT server, it's just a few lines of code:
-
-```C
-  client.publish(concat(mqttPrefix, "/watt"), powerArray);
-  client.publish(concat(mqttPrefix, "/ampere"), irmsArray);
-```
-
-Have a look at the complete [example](./02-energy-monitor-mqtt/).
-
-## Links
-
-* A very comprehensive project to build an energy monitor can be found in the [ESP32 + ESPHome Open Source Energy Monitor project by Daniel BP](https://github.com/danpeig/ESP32EnergyMonitor).
-* A nice (German) [video tutorial can be found at Eddie's Techlab](https://edistechlab.com/sct013-sensor-zum-wechselstrom-messen/).
-* Have a look at the [complete documentation of the Open Energy Monitor project](https://docs.openenergymonitor.org/).
-* There is also a German [example project](http://www.technik-fan.de/index.php/Open_Energy_Monitor_mit_dem_ESP32) (that currently cannot be reached over TLS, so be careful before clicking this link).