Compare commits

..

No commits in common. "main" and "master" have entirely different histories.
main ... master

19 changed files with 585 additions and 702 deletions

View File

@ -2,7 +2,6 @@
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"ijustdev.gitea-vscode",
"platformio.platformio-ide"
],
"unwantedRecommendations": [

View File

@ -1,4 +1,6 @@
{
"gitea.instanceURL": "https://hjkgitunix.dedyn.io/hans-jurgen/Wetterstation_Boris.git",
"gitea.owner": "hans-jürgen"
{
"gitea.instanceURL": "https://hjkgitunix.dedyn.io/",
"gitea.owner": "hans-jurgen",
"gitea.repo": "Wetterstation",
"gitea.token": " vscodegitea"
}

1
data/Korektur.txt Normal file
View File

@ -0,0 +1 @@
1.02910

View File

@ -1 +0,0 @@
0

1
data/status.txt Normal file
View File

@ -0,0 +1 @@
5

View File

@ -1,39 +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
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

View File

@ -1,31 +0,0 @@
#include <Arduino.h>
#include <EEPROM.h>
#define AkkuLeer 0x80
#define ADS1115noReady 0x01
#define HTU21noReady 0x02
#define BMP280noReady 0x04
#define MCP9808noReady 0x08
byte SystemStatus;
void writeSystemStatus()
{
EEPROM.begin(512);
EEPROM.put(0,SystemStatus);
EEPROM.commit();
EEPROM.end();
}
void readSystemStatus()
{
EEPROM.begin(512);
EEPROM.get(0,SystemStatus);
EEPROM.commit();
EEPROM.end();
}

View File

@ -11,12 +11,9 @@ float valTemp;
// Create MCP9808 temperature sensor object
Adafruit_MCP9808 tempsensor = Adafruit_MCP9808();
bool F_MCP9808;
char Temperature[15] = {0};
void init_MCP9808(){
F_MCP9808 = true;
// Make sure the sensor is found, you can also pass in a different i2c
// address with tempsensor.begin(0x19) for example, also can be left in blank for default address use
// Also there is a table with all addres possible for this sensor, you can connect multiple sensors
@ -32,12 +29,10 @@ void init_MCP9808(){
// 1 1 1 0x1F
if (!tempsensor.begin(0x18)) {
Serial.println("Couldn't find MCP9808! Check your connections and verify the address is correct.");
SystemStatus = SystemStatus | MCP9808noReady;
F_MCP9808 = false;
} else {
Serial.println("Found MCP9808!");
datenSave(-20);
while (1);
}
Serial.println("Found MCP9808!");
tempsensor.setResolution(3); // sets the resolution mode of reading, the modes are defined in the table bellow:
// Mode Resolution SampleTime
// 0 0.5°C 30 ms

View File

@ -20,7 +20,6 @@
* ADS1115_WE adc = ADS1115_WE(&Wire, I2C_ADDRESS); -> all together
*/
ADS1115_WE adc = ADS1115_WE(I2C_ADDRESS);
bool F_ADS1115;
struct {
char Akku[15] = {0};
@ -29,11 +28,8 @@ struct {
void initADS() {
Wire.begin();
F_ADS1115 = true;
if(!adc.init()){
Serial.println("ADS1115 not connected!");
SystemStatus = (SystemStatus | ADS1115noReady);
F_ADS1115 = false;
}
/* Set the voltage range of the ADC to adjust the gain

View File

@ -1,87 +0,0 @@
#include "Wire.h"
#define Anzahl_Sensoren_BME280 1 // Mögliche Werte: '0','1','2'
#define Korrektur_Luftdruck 0.0 // Korrekturwert um Abweichungen zu offiziellen Wetterstationen auszugleichen
//----------------------------------------------------------------
// Konfiguration BME280 - Temperatur und Luftfeuchte
//----------------------------------------------------------------
#include "Adafruit_Sensor.h"
#include "Adafruit_BME280.h"
uint8_t BME280_adresse[2] = {0x76, 0x77};
#define SEALEVELPRESSURE_HPA (1013.25f)
//----------------------------------------------------------------
const float No_Val = 999.99;
float Temp[2] = {No_Val, No_Val};
float Feuchte[2] = {No_Val, No_Val};
float L_Druck[2] = {No_Val, No_Val};
struct {
char temperature[15] = {0};
char pressure[15] = {0};
char approx_altitud[15] = {0};
char humity[15] = {0};
} BME280Data;
void Sensor_BME280() {
if (Anzahl_Sensoren_BME280 > 0) {
float Temperatur_BME;
float Luftfeuchte_BME;
float Luftdruck_BME;
boolean check;
Adafruit_BME280 my_bme;
for (byte i = 0; i < Anzahl_Sensoren_BME280; i++) {
check = my_bme.begin(BME280_adresse[i]); // I2C Adresse
delay (100); // time to get system ready
if (check) { // if bme ok
Temperatur_BME = my_bme.readTemperature();
Luftfeuchte_BME = my_bme.readHumidity();
Luftdruck_BME = my_bme.readPressure();
Serial.print("Temperature (BME280):\t\t");
Serial.print(Temperatur_BME);
Serial.println(" °C");
Serial.print("Luftfeuchtigkeit (BME280):\t");
Serial.print(Luftfeuchte_BME);
Serial.println(" %");
Serial.print("Luftdruck (BME280):\t\t");
Serial.print(Luftdruck_BME/100);
Serial.println(" hPa");
}
else {
Temperatur_BME = No_Val;
Luftfeuchte_BME = No_Val;
Luftdruck_BME = No_Val;
}
if (i == 0) { // erster BME
Temp[0] = Temperatur_BME; // Hier kann die Zuordnung der Sensoren geändert werden
Feuchte[0] = Luftfeuchte_BME; // Hier kann die Zuordnung der Sensoren geändert werden
L_Druck[0] = Luftdruck_BME/100;
}
if (i == 1) { // zweiter BME
Temp[1] = Temperatur_BME; // Hier kann die Zuordnung der Sensoren geändert werden
Feuchte[1] = Luftfeuchte_BME; // Hier kann die Zuordnung der Sensoren geändert werden
L_Druck[1] = Luftdruck_BME/100;
}
}
}
}
void M2M_BME280(String deviceId = "4711") {
char topic[100];
dtostrf(Temp[0],7,1,BME280Data.temperature);
sprintf(topic, "%s%s%s", "hjk/devices/", deviceId.c_str(), "/telemetry/temperature_BME_280" );
client.publish(topic, BME280Data.temperature, true);
dtostrf(Feuchte[0],7,1,BME280Data.humity);
sprintf(topic, "%s%s%s", "hjk/devices/", deviceId.c_str(), "/telemetry/humity_BME280" );
client.publish(topic, BME280Data.humity, true);
dtostrf(L_Druck[0],7,1,BME280Data.pressure);
sprintf(topic, "%s%s%s", "hjk/devices/", deviceId.c_str(), "/telemetry/pressure" );
client.publish(topic, BME280Data.pressure, true);
}

View File

@ -4,12 +4,12 @@
#include <Adafruit_BMP280.h>
#define SEALEVELPRESSURE_HPA (1013.25) // 1013.25
#define SEALEVELPRESSURE_HPA (1002.7) // 1013.25
// Richen 219 m über NN
// Eppingem 195 m über NN
Adafruit_BMP280 bmp; // I2C
float K_BMP280 = -0.0;
float K_BMP280 = -1.30;
bool F_BMP280;
@ -23,15 +23,14 @@ struct {
void Init_BMP280(){
bool status = bmp.begin();
bool status = bmp.begin(0x76);
F_BMP280 = true;
if (!status) {
Serial.println("Could not find a valid BME280 sensor, check wiring!");
F_BMP280 = false;
SystemStatus = SystemStatus | BMP280noReady;
} else{
Serial.print("SensorID was: 0x"); Serial.println(bmp.sensorID(),16);
delay(5000);
/* Serial.print("SensorID was: 0x"); Serial.println(bmp.sensorID(),16);
delay(5000); */
/* Default settings from datasheet. */
bmp.setSampling(Adafruit_BMP280::MODE_NORMAL, /* Operating Mode. */
Adafruit_BMP280::SAMPLING_X2, /* Temp. oversampling */
@ -56,8 +55,8 @@ void read_BMP_280() {
Serial.print("Pressure:\t\t");
float p = bmp.readPressure() / 100.0F;
p = p + KorrekturLuftdruck;
dtostrf(p,7,1,BMP280Data.pressure);
//p = p + 22;
dtostrf(p,5,0,BMP280Data.pressure);
Serial.print(BMP280Data.pressure);
Serial.println(" hPa");

View File

@ -1,8 +1,9 @@
#include <Arduino.h>
ADC_MODE(ADC_VCC);
const float MinimalSpannung = 2.85;
float korectur = 0.001015;
float korectur = 9.2800899887514060742407199100112e-4;
char floatString[15] = {0};
float AKKU;
@ -12,11 +13,10 @@ float getBattery()
Serial.print("Batterie:\t\t 3.05 V\n");
return 3.05;
#endif
int Vcc = analogRead(A0);
Vcc = Vcc * ((100+220+220)/100);
int Vcc = ESP.getVcc();
float VCC = Vcc * korectur ;
Serial.printf("Rohdaten: %d, ", Vcc);
dtostrf(VCC,8,2,floatString);
Serial.printf("Vcc: \t%s V\n", floatString);
dtostrf(VCC,7,2,floatString);
Serial.printf("Vcc: %s V\n", floatString);
return VCC;
}

View File

@ -1,7 +1,7 @@
#include <Arduino.h>
const float MinimalSpannung = 2.85;
float koa = 0.984326019;
float korectur = 1.02910;
char floatString[15] = {0};
float AKKU;

View File

@ -6,7 +6,7 @@
Adafruit_HTU21DF htu = Adafruit_HTU21DF();
bool F_HTU_21D;
float K_HTU= -0.00;
float K_HTU= -1.30;
struct {
char temperature[15] = {0};
@ -17,13 +17,10 @@ void init_HTU21(){
F_HTU_21D = false;
if (!htu.begin()) {
Serial.println("Couldn't find sensor HUT21D!");
SystemStatus = SystemStatus | HTU21noReady;
}
else {
F_HTU_21D = true;
Serial.println("HUT21D gefunden");
}
F_HTU_21D = true;
Serial.println("HUT21D gefunden");
}
void read_HTU21D() {

View File

@ -1,46 +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 <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
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

View File

@ -1,120 +1,65 @@
; 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]
platform = espressif8266
board = d1
framework = arduino
board_build.filesystem = littlefs
monitor_port = COM5
monitor_speed = 74800
monitor_filters = time
upload_port = COM5
lib_deps =
knolleary/PubSubClient @ 2.8
adafruit/Adafruit HTU21DF Library @ 1.0.5
wollewald/ADS1115_WE @ 1.4.3
adafruit/Adafruit MCP9808 Library @ 2.0.0
adafruit/Adafruit BusIO @ 1.16.1
adafruit/Adafruit BME280 Library @ 2.2.4
adafruit/Adafruit Unified Sensor @ 1.1.14
build_flags =
-DTEMPTEST33=1
-DNOBATT=0
-DMaxErrCount=20
[env:debug] ; Entwicklungssystem
build_flags = ${env.build_flags}
-DDEBUG=0
-DNOADS=0
-DNAME=\"WETTERSTATION\"
-DSTASSID=\"MagentaWLAN-RGDO\"
-DSTAPSK=\"93329248424922704583\"
-DGATEWAY=\"192.168.127.1\"
-DDNS=\"192.168.127.1\"
-DKMYIP=\"192.168.127.40\"
-Dmqtt_server=\"hjkmqtt.dedyn.io\"
-Dmqtt_port=61883
-DTERROR=5
-DTLOWBATT=60
-DTINTERVAL=1
-DKorrekturLuftdruck=0.0
[env:marcel] ; Produktivsystem:
build_flags = ${env.build_flags}
-DDEBUG=0
-DEMAIL=\"koerner.c.m@gmail.com\"
-DNAME=\"WETTERSTATIONMARCEL\"
-DSTASSID=\"EasyBox-838169\"
-DSTAPSK=\"RcZmua6Xv4R4V5Kf\"
-DGATEWAY=\"192.168.2.1\"
-DDNS=\"192.168.2.1\"
-DKMYIP=\"192.168.2.81\"
-Dmqtt_server=\"hjkmqtt.dedyn.io\"
-Dmqtt_port=8883
-DTERROR=20
-DTLOWBATT=60
-DTINTERVAL=10
-DKorrekturLuftdruck=0.0
[env:boris] ; Produktivsystem:
build_flags = ${env.build_flags}
-DDEBUG=0
-DEMAIL=\"koerner.c.m@gmail.com\"
-DNAME=\"WETTERSTATIONBORIS\"
-DSTASSID=\"FRITZ!Box7362SL\"
-DSTAPSK=\"BorisundEva2007\"
-DGATEWAY=\"192.168.2.1\"
-DDNS=\"192.168.2.1\"
-DKMYIP=\"192.168.2.41\"
-Dmqtt_server=\"hjkmqtt.dedyn.io\"
-Dmqtt_port=8883
-DTERROR=20
-DTLOWBATT=60
-DTINTERVAL=5
-DKorrekturLuftdruck=0.0
[env:hjk]
build_flags = ${env.build_flags}
-DDEBUG=0
-DNOADS=0
-DNAME=\"WETTERSTATION\"
-DSTASSID=\"MagentaWLAN-RGDO\"
-DSTAPSK=\"93329248424922704583\"
-DGATEWAY=\"192.168.127.1\"
-DDNS=\"192.168.127.1\"
-DKMYIP=\"192.168.127.41\"
-Dmqtt_server=\"hjkmqtt.dedyn.io\"
-Dmqtt_port=61883
-DTERROR=5
-DTLOWBATT=60
-DTINTERVAL=10
-DKorrekturLuftdruck=23.6
[env:filamentbox]
build_flags = ${env.build_flags}
-DDEBUG=0
-DNOADS=0
-DNAME=\"filamenbox\"
-DSTASSID=\"MagentaWLAN-RGDO\"
-DSTAPSK=\"93329248424922704583\"
-DGATEWAY=\"192.168.127.1\"
-DDNS=\"192.168.127.1\"
-DKMYIP=\"192.168.127.42\"
-Dmqtt_server=\"hjkmqtt.dedyn.io\"
-Dmqtt_port=61883
-DTERROR=5
-DTLOWBATT=60
-DTINTERVAL=15
-DKorrekturLuftdruck=0.0
; 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]
platform = espressif8266
board = d1
framework = arduino
monitor_port = /dev/ttyUSB0
monitor_speed = 74800
monitor_filters = time
board_build.filesystem = littlefs
lib_deps =
knolleary/PubSubClient @ 2.8
adafruit/Adafruit HTU21DF Library @ 1.0.5
adafruit/Adafruit BMP280 Library @ 2.6.6
wollewald/ADS1115_WE @ 1.4.3
adafruit/Adafruit MCP9808 Library @ 2.0.0
build_flags =
-DTEMPTEST33=1
-DNOBATT=0
-DMaxErrCount=30
-DMQTT=0
[env:debug] ; Entwicklungssystem
build_flags = ${env.build_flags}
-DDEBUG=0
-DNOADS=0
-DNAME=\"WETTERSTATIONEPPINGEN\"
-DSTASSID=\"St.-Peters-Gasse\"
-DSTAPSK=\"1952994784599318\"
-DGATEWAY=\"192.168.127.1\"
-DDNS=\"192.168.127.1\"
-DKMYIP=\"192.168.127.48\"
-Dmqtt_server=\"hjkmqtt.dedyn.io\"
-Dmqtt_port=8883
-DTERROR=5
-DTLOWBATT=60
-DTINTERVAL=1
[env:release] ; Produktivsystem:
build_flags = ${env.build_flags}
-DDEBUG=0
-DEMAIL=\"koerner.c.m@gmail.com\"
-DNAME=\"WETTERSTATIONMARCEL\"
-DSTASSID=\"EasyBox-838169\"
-DSTAPSK=\"RcZmua6Xv4R4V5Kf\"
-DGATEWAY=\"192.168.2.1\"
-DDNS=\"192.168.2.1\"
-DKMYIP=\"192.168.2.81\"
-Dmqtt_server=\"hjkmqtt.dedyn.io\"
-Dmqtt_port=8883
-DTERROR=20
-DTLOWBATT=60
-DTINTERVAL=10

View File

@ -1,331 +1,394 @@
#include <Arduino.h>
#include <FS.h> //this needs to be first, or it all crashes and burns...
#include <string>
#include <ESP8266WiFi.h> //https://github.com/esp8266/Arduino
#include <PubSubClient.h>
#include <Ticker.h>
// #define BUILTIN_LED D2
#define TRIGGER_PIN D7
#define START_STOP_PIN D6
void reconnect();
void setup_wifi();
void verifyFingerprint();
void callback(char* topic1, byte* payload, unsigned int length);
void pulse_pin(uint8_t pin);
WiFiClient espClient;
PubSubClient client(espClient);
#include <error.h>
#include<mess_htu21.h>
//#include <mess_BMP280.h>
#include <mess_BME280.h>
#include <mess_Ub.h>
#include <messADS1115.h>
#include <mcp9808.h>
const char* ssid = STASSID;
const char* password = STAPSK;
String hostname = NAME;
const char *MyIP = KMYIP;
IPAddress ip;
IPAddress gateway;
IPAddress subnet(255, 255, 255, 0);
IPAddress dns;
IPAddress secondaryDNS(8, 8, 8, 8);
const char* mqtt_fprint = "a3:44:1d:aa:6e:e5:c7:55:02:20:98:ea:9b:df:1a:42:a2:f3:e3:0d";
const char* mqtt_user = "mqtt";
const char* mqtt_pass = "fische";
const unsigned long interval = TINTERVAL * 60000000LU; // Minuten * Mikrosekunden für Sleep Mode
const unsigned long intervalLowBatt = TLOWBATT * 60000000LU; // Minuten * Mikrosekunden für Sleep Mode, Akku entladen
const unsigned long stoerung = TERROR * 60000000LU; // Minuten * Mikrosekunden für Sleep Mode
unsigned long previousMillis = 0;
long deviceId;
char sID[16];
char clientName[30];
unsigned long startTime;
unsigned long endTime;
char topic[100];
char topic_1[50];
char topicWert[20];
char msg[20];
long int Feldstaerke;
void setup() {
startTime = millis();
/* pinMode(BUILTIN_LED, OUTPUT);
digitalWrite(BUILTIN_LED, LOW);
delay(5000);
digitalWrite(BUILTIN_LED, HIGH); */
Serial.begin(74880);
while ( !Serial ) delay(100); // wait for native usb
WiFi.mode( WIFI_OFF );
WiFi.forceSleepBegin();
Serial.println();
Serial.println();
Serial.println();
Serial.println();
readSystemStatus();
Serial.printf("Systemstatus : 0x%02x \n", SystemStatus);
SystemStatus = 0x00;
writeSystemStatus();
delay(500);
#if (MQTT == 0)
init_HTU21();
//Init_BMP280();
Sensor_BME280();
init_MCP9808();
initADS();
#endif
if (!F_ADS1115 == true){
AKKU = getBattery(); // ca. 170 ms
Serial.println("ALTE UB MESSUNG:");
}
else{
MessungADS();
AKKU = readChannel(ADS1115_COMP_0_GND);
}
// ca. 280 ms
if (F_HTU_21D == true){
read_HTU21D();
}
if (F_ADS1115 == true){
MessungADS();
}
/* if (F_BMP280 == true){
read_BMP_280();
}*/
if (F_MCP9808 == true){
valTemp = getTemperature_MCP9808();
}
setup_wifi(); // ca. 4,5 s
deviceId = ESP.getChipId();
sprintf(sID, "%010ld", deviceId);
Serial.print("ID: \t\t"); Serial.println(deviceId);
// ca. 5 s
//espClient.setFingerprint(mqtt_fprint);
client.setServer(mqtt_server, mqtt_port);
client.setCallback(callback);
Serial.printf("Systemstatus : 0x%02x \n", SystemStatus);
//----------
}
void loop() {
unsigned long Pause = 0;
if (!client.connected()) {
reconnect();
}
int currentMillis = millis();
if (currentMillis - previousMillis >= 10000) {
previousMillis = currentMillis;
dtostrf(AKKU,8,2,ADSData.Akku);
sprintf(topic, "%s%s%s", "hjk/devices/", hostname.c_str(), "/telemetry/battery" );
client.publish(topic, ADSData.Akku, true);
if (F_ADS1115 == true){
sprintf(topic, "%s%s%s", "hjk/devices/", hostname.c_str(), "/telemetry/Solar" );
client.publish(topic, ADSData.Solar, true);
}
if (F_HTU_21D) M2M_HTU21D(hostname.c_str());
M2M_BME280(hostname.c_str());
if (F_MCP9808) M2M_Temperatur_MCP9808(hostname.c_str());
sprintf(msg,"%ld", Feldstaerke);
sprintf(topic, "%s%s%s", "hjk/devices/", hostname.c_str(), "/telemetry/RSSI" );
client.publish(topic, msg, true);
sprintf(msg,"0x%02x", SystemStatus);
sprintf(topic, "%s%s%s", "hjk/devices/", hostname.c_str(), "/telemetry/SystemStatus" );
client.publish(topic, msg, true);
client.loop();
delay(500);
//digitalWrite(BUILTIN_LED, HIGH);
/* ESP.deepSleep(5e6);
delay(100); */
endTime = millis();
if (AKKU < MinimalSpannung){
// ---------------------------------
Pause = intervalLowBatt -((endTime - startTime) * 1000); // Pause ca. 60 Minuten
Serial.println("AKKU entladen!");
SystemStatus = (SystemStatus | AkkuLeer);
Serial.printf("Systemstatus : 0x%04x \n", SystemStatus);
writeSystemStatus();
}
else{
Pause = interval -((endTime - startTime) * 1000); // Pause ca. 15 Minuten
}
if(Pause <=0){
Pause = 1;
}
//ESP.restart();
Serial.print("Ich gehe für ca. "); Serial.print((Pause/1000/1000/60)+1); Serial.println( " Minuten schlafen.");
//ESP.deepSleep(Pause, WAKE_RF_DISABLED); // Pause
digitalWrite(START_STOP_PIN, !LOW);
#if (DEBUG == 1)
ESP.deepSleep(10e6);
#else
writeSystemStatus();
ESP.deepSleep(Pause);
#endif
delay(100);
}
}
void setup_wifi() {
long ErrCount = 0;
delay(10);
// We start by connecting to a WiFi network
Serial.println();
Serial.print("Connecting to ");
Serial.print(ssid);
Serial.print(" ");
WiFi.forceSleepWake();
delay( 1 );
WiFi.persistent( false );
WiFi.mode( WIFI_STA );
WiFi.setHostname(hostname.c_str()); //define hostname
WiFi.hostname(hostname.c_str());
WiFi.mode( WIFI_STA );
if (!ip.fromString(MyIP)) { // try to parse into the IPAddress
Serial.println("UnParsable IP");
}
if (!dns.fromString(DNS)) { // try to parse into the IPAddress
Serial.println("UnParsable DNS");
}
if (!gateway.fromString(GATEWAY)) { // try to parse into the IPAddress
Serial.println("UnParsable GATEWAY");
}
//WiFi.config( ip, dns, gateway, subnet );
if (!WiFi.config(ip, gateway, subnet, dns, secondaryDNS))
{
Serial.println("STA Failed to configure");
}
WiFi.begin(ssid, password);
while (WiFi.status() != WL_CONNECTED) {
delay(500);
Serial.print(".");
ErrCount ++;
if (ErrCount >= MaxErrCount){
endTime = millis();
unsigned long Pause = stoerung -((endTime - startTime) * 1000); // Pause
Serial.println();
Serial.println("STÖRUNG WiFi.");
Serial.print("Ich gehe für ca. "); Serial.print(Pause/1000/1000/60); Serial.println( " Minuten schlafen.");
ESP.deepSleep(Pause, WAKE_NO_RFCAL); // Pause
delay(100);
}
}
Serial.println(" WiFi connected");
Serial.print("IP address: \t");
Feldstaerke = WiFi.RSSI();
Serial.print(WiFi.localIP()); Serial.print("\tRESSI: "); Serial.println(Feldstaerke);
/* delay(2000);
ESP.deepSleep(2e6, WAKE_RF_DEFAULT);
delay(100); */
}
void callback(char* topic1, byte* payload, unsigned int length)
{
Serial.print("Message arrived [");
Serial.print(topic1);
Serial.print("] ");
for (unsigned int i = 0; i < length; i++) {
msg[i] = (char)payload[i];
}
msg[length] = '\0';
Serial.println(msg);
if(strcmp(topic1, topic_1)== 0){
Serial.print(msg);
Serial.println();
korectur = atof(msg);
Serial.print("Korektur:\t");Serial.println(korectur, 8);
}
}
void reconnect() {
// Loop until we're reconnected
sprintf(clientName, "%s%s", "ESP8266Wetter", sID);
while (!client.connected()) {
Serial.print("Attempting MQTT connection...");
//verifyFingerprint();
// Attempt to connect
if (client.connect(clientName)) {
Serial.println("connected");
// Once connected, publish an announcement...
// client.publish("outTopic", "hello world");
// ... and resubscribe
// client.subscribe("inTopic");
} else {
Serial.print("failed, rc=");
Serial.print(client.state());
Serial.println(" try again in 5 seconds");
// Wait 5 seconds before retrying
delay(5000);
ESP.restart();
}
}
}
void verifyFingerprint() {
unsigned long Pause = 0;
if(client.connected() || espClient.connected()) return; //Already connected
Serial.print("\n\tChecking TLS @ ");
Serial.print(mqtt_server);
Serial.print("...");
if (!espClient.connect(mqtt_server, mqtt_port)) {
//Serial.println("\n\tConnection failed. Rebooting.");
Serial.println("\n\tConnection failed.");
Serial.flush();
//blink.detach();
//blink.attach(0.05, flip);
//delay(5000);
endTime = millis();
Pause = stoerung -((endTime - startTime) * 1000); // Pause ca. 15 Minuten
Serial.print("\tIch gehe für "); Serial.print((Pause/1000/1000/60)+1); Serial.println( " Minuten schlafen.");
ESP.deepSleep(Pause, WAKE_RF_DISABLED); // Pause
delay(500);
}
espClient.stop();
delay(100);
}
void pulse_pin(uint8_t pin)
{
digitalWrite(pin, LOW);
delay(1);
digitalWrite(pin, HIGH);
}
#include <Arduino.h>
#include <FS.h> //this needs to be first, or it all crashes and burns...
#include <LittleFS.h>
#include <string>
#include <ESP8266WiFi.h> //https://github.com/esp8266/Arduino
#include <PubSubClient.h>
#include <Ticker.h>
#define BUILTIN_LED D15
#define TRIGGER_PIN D7
#define START_STOP_PIN D6
void reconnect();
void setup_wifi();
void datenSave(int wert);
int readDaten();
int saveKorektur(float wert);
float readKorectur();
void verifyFingerprint();
void callback(char* topic1, byte* payload, unsigned int length);
void pulse_pin(uint8_t pin);
WiFiClientSecure espClient;
PubSubClient client(espClient);
#include<mess_htu21.h>
#include <mess_BMP280.h>
#include <mess_Ub.h>
#include <messADS1115.h>
#include <mcp9808.h>
const char* ssid = STASSID;
const char* password = STAPSK;
String hostname = NAME;
const char *MyIP = KMYIP;
IPAddress ip;
IPAddress gateway;
IPAddress subnet(255, 255, 255, 0);
IPAddress dns;
IPAddress secondaryDNS(8, 8, 8, 8);
const char* mqtt_fprint = "a3:44:1d:aa:6e:e5:c7:55:02:20:98:ea:9b:df:1a:42:a2:f3:e3:0d";
const char* mqtt_user = "mqtt";
const char* mqtt_pass = "fische";
const unsigned long interval = TINTERVAL * 60000000LU; // Minuten * Mikrosekunden für Sleep Mode
const unsigned long intervalLowBatt = TLOWBATT * 60000000LU; // Minuten * Mikrosekunden für Sleep Mode, Akku entladen
const unsigned long stoerung = TERROR * 60000000LU; // Minuten * Mikrosekunden für Sleep Mode
unsigned long previousMillis = 0;
long deviceId;
char sID[16];
char clientName[30];
unsigned long startTime;
unsigned long endTime;
char topic[100];
char topic_1[50];
char topicWert[20];
char msg[20];
int SystemStatus;
void setup() {
pinMode(TRIGGER_PIN, OUTPUT);
pinMode(START_STOP_PIN, OUTPUT);
digitalWrite(TRIGGER_PIN, HIGH);
digitalWrite(START_STOP_PIN, LOW);
pulse_pin(TRIGGER_PIN); // ==> 1
Serial.begin(74880);
while ( !Serial ) delay(100); // wait for native usb
Serial.println(F("BMP280 Sensor event test"));
Serial.println("HTU21D-F test");
startTime = millis();
WiFi.mode( WIFI_OFF );
WiFi.forceSleepBegin();
pulse_pin(TRIGGER_PIN); // ==> 1
Serial.println();
//Serial.println("Testpunkt 1");
/* if (!LittleFS.begin()) {
Serial.println("LittleFS mount failed");
delay(5000);
return;
} */
//Serial.println("Testpunkt 2");
/* Dir dir = LittleFS.openDir("/data");
while (dir.next()) {
Serial.print(dir.fileName());
if(dir.fileSize()) {
File f = dir.openFile("r");
Serial.println(f.size());
}
} */
//Serial.println("Testpunkt 3");
Serial.println();
Serial.println();
Serial.println();
//SystemStatus = readDaten();
//korectur = readKorectur();
//Serial.print("Korektur: "); Serial.println(korectur,6);
pinMode(BUILTIN_LED, OUTPUT); // Initialize the BUILTIN_LED pin as an output
//digitalWrite(BUILTIN_LED, LOW);
//digitalWrite(BUILTIN_LED, HIGH);
//Serial.print("STATUS (Systemmeldung): "); Serial.println(SystemStatus);
#if (MQTT == 0)
init_HTU21();
Init_BMP280();
//initADS();
//init_MCP9808();
#endif
AKKU = getBattery(); // ca. 170 ms
// ca. 280 ms
if (F_HTU_21D == true){
read_HTU21D();
}
read_BMP_280();
//MessungADS();
setup_wifi(); // ca. 4,5 s
// ca. 12ms
// ---------------------------------
// Status ändern !!! 0
//datenSave(0);
// ---------------------------------
//digitalWrite(BUILTIN_LED, HIGH);
deviceId = ESP.getChipId();
sprintf(sID, "%010ld", deviceId);
Serial.print("ID: \t\t"); Serial.println(deviceId);
// ca. 5 s
espClient.setFingerprint(mqtt_fprint);
client.setServer(mqtt_server, mqtt_port);
client.setCallback(callback);
//----------
}
void loop() {
unsigned long Pause = 0;
if (!client.connected()) {
reconnect();
}
//client.loop();
int currentMillis = millis();
if (currentMillis - previousMillis >= 10000) {
previousMillis = currentMillis;
read_HTU21D();
read_BMP_280();
//valTemp = getTemperature_MCP9808();
dtostrf(AKKU,8,2,ADSData.Akku);
sprintf(topic, "%s%s%s", "hjk/devices/", hostname.c_str(), "/telemetry/battery" );
client.publish(topic, ADSData.Akku, true);
#if(MQTT == 0)
M2M_HTU21D(hostname.c_str());
M2M_BMP280(hostname.c_str());
M2M_Temperatur_MCP9808(hostname.c_str());
#endif
long int Feldstaerke = WiFi.RSSI();
sprintf(msg,"%ld", Feldstaerke);
sprintf(topic, "%s%s%s", "hjk/devices/", hostname.c_str(), "/telemetry/RSSI" );
client.publish(topic, msg, true);
client.loop();
delay(500);
digitalWrite(BUILTIN_LED, HIGH);
/* ESP.deepSleep(5e6);
delay(100); */
endTime = millis();
if (AKKU < MinimalSpannung){
// ---------------------------------
// Status ändern !!! -5
datenSave(-5);
// ---------------------------------
Pause = intervalLowBatt -((endTime - startTime) * 1000); // Pause ca. 60 Minuten
Serial.println("AKKU entladen!");
}
else{
Pause = interval -((endTime - startTime) * 1000); // Pause ca. 15 Minuten
}
if(Pause <=0){
Pause = 1;
}
//ESP.restart();
Serial.print("Ich gehe für ca. "); Serial.print((Pause/1000/1000/60)+1); Serial.println( " Minuten schlafen.");
//ESP.deepSleep(Pause, WAKE_RF_DISABLED); // Pause
digitalWrite(START_STOP_PIN, !LOW);
#if (DEBUG == 1)
ESP.deepSleep(10e6);
#else
ESP.deepSleep(Pause);
#endif
delay(100);
}
}
void setup_wifi() {
long ErrCount = 0;
delay(10);
// We start by connecting to a WiFi network
Serial.println();
Serial.print("Connecting to ");
Serial.print(ssid);
Serial.print(" ");
WiFi.forceSleepWake();
delay( 1 );
WiFi.persistent( false );
WiFi.mode( WIFI_STA );
//WiFi.setHostname(hostname.c_str()); //define hostname
WiFi.hostname(hostname.c_str());
WiFi.mode( WIFI_STA );
if (!ip.fromString(MyIP)) { // try to parse into the IPAddress
Serial.println("UnParsable IP");
}
if (!dns.fromString(DNS)) { // try to parse into the IPAddress
Serial.println("UnParsable DNS");
}
if (!gateway.fromString(GATEWAY)) { // try to parse into the IPAddress
Serial.println("UnParsable GATEWAY");
}
//WiFi.config( ip, dns, gateway, subnet );
if (!WiFi.config(ip, gateway, subnet, dns, secondaryDNS))
{
Serial.println("STA Failed to configure");
}
WiFi.begin(ssid, password);
while (WiFi.status() != WL_CONNECTED) {
delay(500);
Serial.print(".");
ErrCount ++;
if (ErrCount >= MaxErrCount){
// ---------------------------------
// Status ändern !!! -1
datenSave(-1);
// ---------------------------------
endTime = millis();
unsigned long Pause = stoerung -((endTime - startTime) * 1000); // Pause
Serial.println();
Serial.println("STÖRUNG WiFi.");
Serial.print("Ich gehe für ca. "); Serial.print(Pause/1000/1000/60); Serial.println( " Minuten schlafen.");
ESP.deepSleep(Pause, WAKE_NO_RFCAL); // Pause
delay(100);
}
}
Serial.println(" WiFi connected");
Serial.print("IP address: \t");
Serial.print(WiFi.localIP()); Serial.print("\tRESSI: "); Serial.println(WiFi.RSSI());
/* delay(2000);
ESP.deepSleep(2e6, WAKE_RF_DEFAULT);
delay(100); */
}
void callback(char* topic1, byte* payload, unsigned int length)
{
Serial.print("Message arrived [");
Serial.print(topic1);
Serial.print("] ");
for (unsigned int i = 0; i < length; i++) {
msg[i] = (char)payload[i];
}
msg[length] = '\0';
Serial.println(msg);
if(strcmp(topic1, topic_1)== 0){
Serial.print(msg);
Serial.println();
korectur = atof(msg);
Serial.print("Korektur:\t");Serial.println(korectur, 8);
int er = saveKorektur(korectur);
if (er != 0){
Serial.println("Daten konnten nicht gespeichert werden.");
}
float test = readKorectur();
Serial.print("Korektur:\t");Serial.println(test, 8);
}
}
void reconnect() {
// Loop until we're reconnected
sprintf(clientName, "%s%s", "ESP8266Client", sID);
while (!client.connected()) {
Serial.print("Attempting MQTT connection...");
verifyFingerprint();
// Attempt to connect
if (client.connect(clientName)) {
Serial.println("connected");
// Once connected, publish an announcement...
client.publish("outTopic", "hello world");
// ... and resubscribe
client.subscribe("inTopic");
} else {
Serial.print("failed, rc=");
Serial.print(client.state());
Serial.println(" try again in 5 seconds");
// Wait 5 seconds before retrying
delay(5000);
ESP.restart();
}
}
}
void datenSave(int wert){
File k = LittleFS.open("/status.txt", "w");
if(!k){
Serial.println("file open failed");
}
k.println(wert);
k.close();
}
int readDaten()
{
int Error;
File k = LittleFS.open("/status.txt", "r");
if(!k){
Serial.println("file open failed");
Error = -10;
}else{
String data = k.readString();
Error = data.toInt();
k.close();
}
return Error;
}
int saveKorektur(float wert){
int Error = 0;
File k = LittleFS.open("/Korektur.txt", "w");
if(!k){
Serial.println("file open failed");
Error = -1;
}else{
k.println(String(wert,8));
k.close();
}
return Error;
}
float readKorectur(){
float Korektur;
File k = LittleFS.open("/Korektur.txt", "r");
if(!k){
Serial.println("file open failed");
Korektur = 1.00;
}else{
String data = k.readString();
Korektur = data.toFloat();
k.close();
}
return Korektur;
}
void verifyFingerprint() {
unsigned long Pause = 0;
if(client.connected() || espClient.connected()) return; //Already connected
Serial.print("\n\tChecking TLS @ ");
Serial.print(mqtt_server);
Serial.print("...");
if (!espClient.connect(mqtt_server, mqtt_port)) {
//Serial.println("\n\tConnection failed. Rebooting.");
Serial.println("\n\tConnection failed.");
Serial.flush();
//blink.detach();
//blink.attach(0.05, flip);
//delay(5000);
endTime = millis();
Pause = stoerung -((endTime - startTime) * 1000); // Pause ca. 15 Minuten
Serial.print("\tIch gehe für "); Serial.print((Pause/1000/1000/60)+1); Serial.println( " Minuten schlafen.");
ESP.deepSleep(Pause, WAKE_RF_DISABLED); // Pause
delay(500);
}
espClient.stop();
delay(100);
}
void pulse_pin(uint8_t pin)
{
digitalWrite(pin, LOW);
delay(1);
digitalWrite(pin, HIGH);
}

View File

@ -1,11 +1,11 @@
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
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

4
workspace.code-workspace Normal file
View File

@ -0,0 +1,4 @@
{
"folders": [],
"settings": {}
}