diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 080e70d..8215247 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,6 +2,7 @@ // See http://go.microsoft.com/fwlink/?LinkId=827846 // for the documentation about the extensions.json format "recommendations": [ + "ijustdev.gitea-vscode", "platformio.platformio-ide" ], "unwantedRecommendations": [ diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..6066476 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "gitea.instanceURL": "https://hjkgitunix.dedyn.io/hans-jurgen/Wetterstation_Boris.git", + "gitea.owner": "hans-jürgen" +} \ No newline at end of file diff --git a/include/messADS1115.h b/include/messADS1115.h index 7aa5747..d469a04 100644 --- a/include/messADS1115.h +++ b/include/messADS1115.h @@ -1,154 +1,154 @@ -/*************************************************************************** -* Example sketch for the ADS1115_WE library -* -* This sketch shows how to use the ADS1115 in single shot mode. -* -* Further information can be found on: -* https://wolles-elektronikkiste.de/ads1115 (German) -* https://wolles-elektronikkiste.de/en/ads1115-a-d-converter-with-amplifier (English) -* -***************************************************************************/ -#include -#include -#include -#define I2C_ADDRESS 0x48 - -/* There are several ways to create your ADS1115_WE object: - * ADS1115_WE adc = ADS1115_WE(); -> uses Wire / I2C Address = 0x48 - * ADS1115_WE adc = ADS1115_WE(I2C_ADDRESS); -> uses Wire / I2C_ADDRESS - * ADS1115_WE adc = ADS1115_WE(&Wire); -> you can pass any TwoWire object / I2C Address = 0x48 - * 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}; - char Solar[15] = {0}; -} ADSData; - -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 - * Please note that you must not apply more than VDD + 0.3V to the input pins! - * - * ADS1115_RANGE_6144 -> +/- 6144 mV - * ADS1115_RANGE_4096 -> +/- 4096 mV - * ADS1115_RANGE_2048 -> +/- 2048 mV (default) - * ADS1115_RANGE_1024 -> +/- 1024 mV - * ADS1115_RANGE_0512 -> +/- 512 mV - * ADS1115_RANGE_0256 -> +/- 256 mV - */ - adc.setVoltageRange_mV(ADS1115_RANGE_4096); //comment line/change parameter to change range - - /* Set the inputs to be compared - * - * ADS1115_COMP_0_1 -> compares 0 with 1 (default) - * ADS1115_COMP_0_3 -> compares 0 with 3 - * ADS1115_COMP_1_3 -> compares 1 with 3 - * ADS1115_COMP_2_3 -> compares 2 with 3 - * ADS1115_COMP_0_GND -> compares 0 with GND - * ADS1115_COMP_1_GND -> compares 1 with GND - * ADS1115_COMP_2_GND -> compares 2 with GND - * ADS1115_COMP_3_GND -> compares 3 with GND - */ - //adc.setCompareChannels(ADS1115_COMP_0_GND); //uncomment if you want to change the default - - /* Set number of conversions after which the alert pin will assert - * - or you can disable the alert - * - * ADS1115_ASSERT_AFTER_1 -> after 1 conversion - * ADS1115_ASSERT_AFTER_2 -> after 2 conversions - * ADS1115_ASSERT_AFTER_4 -> after 4 conversions - * ADS1115_DISABLE_ALERT -> disable comparator / alert pin (default) - */ - //adc.setAlertPinMode(ADS1115_ASSERT_AFTER_1); //uncomment if you want to change the default - - /* Set the conversion rate in SPS (samples per second) - * Options should be self-explaining: - * - * ADS1115_8_SPS - * ADS1115_16_SPS - * ADS1115_32_SPS - * ADS1115_64_SPS - * ADS1115_128_SPS (default) - * ADS1115_250_SPS - * ADS1115_475_SPS - * ADS1115_860_SPS - */ - //adc.setConvRate(ADS1115_128_SPS); //uncomment if you want to change the default - - /* Set continuous or single shot mode: - * - * ADS1115_CONTINUOUS -> continuous mode - * ADS1115_SINGLE -> single shot mode (default) - */ - //adc.setMeasureMode(ADS1115_CONTINUOUS); //uncomment if you want to change the default - - /* Choose maximum limit or maximum and minimum alert limit (window) in volts - alert pin will - * assert when measured values are beyond the maximum limit or outside the window - * Upper limit first: setAlertLimit_V(MODE, maximum, minimum) - * In max limit mode the minimum value is the limit where the alert pin assertion will be - * be cleared (if not latched) - * - * ADS1115_MAX_LIMIT - * ADS1115_WINDOW - * - */ - //adc.setAlertModeAndLimit_V(ADS1115_MAX_LIMIT, 3.0, 1.5); //uncomment if you want to change the default - - /* Enable or disable latch. If latch is enabled the alert pin will assert until the - * conversion register is read (getResult functions). If disabled the alert pin assertion - * will be cleared with next value within limits. - * - * ADS1115_LATCH_DISABLED (default) - * ADS1115_LATCH_ENABLED - */ - //adc.setAlertLatch(ADS1115_LATCH_ENABLED); //uncomment if you want to change the default - - /* Sets the alert pin polarity if active: - * - * ADS1115_ACT_LOW -> active low (default) - * ADS1115_ACT_HIGH -> active high - */ - //adc.setAlertPol(ADS1115_ACT_LOW); //uncomment if you want to change the default - - /* With this function the alert pin will assert, when a conversion is ready. - * In order to deactivate, use the setAlertLimit_V function - */ - //adc.setAlertPinToConversionReady(); //uncomment if you want to change the default - -} - -float readChannel(ADS1115_MUX channel) { - float voltage = 0.0; - adc.setCompareChannels(channel); - adc.startSingleMeasurement(); - while(adc.isBusy()){} - voltage = adc.getResult_V(); // alternative: getResult_mV for Millivolt - return voltage; -} - -void MessungADS() { - float voltage = 0.0; - - voltage = readChannel(ADS1115_COMP_0_GND); - dtostrf(voltage,8,2,ADSData.Akku); - Serial.print("Akku:\t\t\t"); - Serial.print(ADSData.Akku); - Serial.println(" V"); - - voltage = readChannel(ADS1115_COMP_1_GND); - dtostrf(voltage,8,2,ADSData.Solar); - Serial.print("Solar:\t\t\t"); - Serial.print(ADSData.Solar); - Serial.println(" V"); - -} +/*************************************************************************** +* Example sketch for the ADS1115_WE library +* +* This sketch shows how to use the ADS1115 in single shot mode. +* +* Further information can be found on: +* https://wolles-elektronikkiste.de/ads1115 (German) +* https://wolles-elektronikkiste.de/en/ads1115-a-d-converter-with-amplifier (English) +* +***************************************************************************/ +#include +#include +#include +#define I2C_ADDRESS 0x48 + +/* There are several ways to create your ADS1115_WE object: + * ADS1115_WE adc = ADS1115_WE(); -> uses Wire / I2C Address = 0x48 + * ADS1115_WE adc = ADS1115_WE(I2C_ADDRESS); -> uses Wire / I2C_ADDRESS + * ADS1115_WE adc = ADS1115_WE(&Wire); -> you can pass any TwoWire object / I2C Address = 0x48 + * 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}; + char Solar[15] = {0}; +} ADSData; + +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 + * Please note that you must not apply more than VDD + 0.3V to the input pins! + * + * ADS1115_RANGE_6144 -> +/- 6144 mV + * ADS1115_RANGE_4096 -> +/- 4096 mV + * ADS1115_RANGE_2048 -> +/- 2048 mV (default) + * ADS1115_RANGE_1024 -> +/- 1024 mV + * ADS1115_RANGE_0512 -> +/- 512 mV + * ADS1115_RANGE_0256 -> +/- 256 mV + */ + adc.setVoltageRange_mV(ADS1115_RANGE_4096); //comment line/change parameter to change range + + /* Set the inputs to be compared + * + * ADS1115_COMP_0_1 -> compares 0 with 1 (default) + * ADS1115_COMP_0_3 -> compares 0 with 3 + * ADS1115_COMP_1_3 -> compares 1 with 3 + * ADS1115_COMP_2_3 -> compares 2 with 3 + * ADS1115_COMP_0_GND -> compares 0 with GND + * ADS1115_COMP_1_GND -> compares 1 with GND + * ADS1115_COMP_2_GND -> compares 2 with GND + * ADS1115_COMP_3_GND -> compares 3 with GND + */ + //adc.setCompareChannels(ADS1115_COMP_0_GND); //uncomment if you want to change the default + + /* Set number of conversions after which the alert pin will assert + * - or you can disable the alert + * + * ADS1115_ASSERT_AFTER_1 -> after 1 conversion + * ADS1115_ASSERT_AFTER_2 -> after 2 conversions + * ADS1115_ASSERT_AFTER_4 -> after 4 conversions + * ADS1115_DISABLE_ALERT -> disable comparator / alert pin (default) + */ + //adc.setAlertPinMode(ADS1115_ASSERT_AFTER_1); //uncomment if you want to change the default + + /* Set the conversion rate in SPS (samples per second) + * Options should be self-explaining: + * + * ADS1115_8_SPS + * ADS1115_16_SPS + * ADS1115_32_SPS + * ADS1115_64_SPS + * ADS1115_128_SPS (default) + * ADS1115_250_SPS + * ADS1115_475_SPS + * ADS1115_860_SPS + */ + //adc.setConvRate(ADS1115_128_SPS); //uncomment if you want to change the default + + /* Set continuous or single shot mode: + * + * ADS1115_CONTINUOUS -> continuous mode + * ADS1115_SINGLE -> single shot mode (default) + */ + //adc.setMeasureMode(ADS1115_CONTINUOUS); //uncomment if you want to change the default + + /* Choose maximum limit or maximum and minimum alert limit (window) in volts - alert pin will + * assert when measured values are beyond the maximum limit or outside the window + * Upper limit first: setAlertLimit_V(MODE, maximum, minimum) + * In max limit mode the minimum value is the limit where the alert pin assertion will be + * be cleared (if not latched) + * + * ADS1115_MAX_LIMIT + * ADS1115_WINDOW + * + */ + //adc.setAlertModeAndLimit_V(ADS1115_MAX_LIMIT, 3.0, 1.5); //uncomment if you want to change the default + + /* Enable or disable latch. If latch is enabled the alert pin will assert until the + * conversion register is read (getResult functions). If disabled the alert pin assertion + * will be cleared with next value within limits. + * + * ADS1115_LATCH_DISABLED (default) + * ADS1115_LATCH_ENABLED + */ + //adc.setAlertLatch(ADS1115_LATCH_ENABLED); //uncomment if you want to change the default + + /* Sets the alert pin polarity if active: + * + * ADS1115_ACT_LOW -> active low (default) + * ADS1115_ACT_HIGH -> active high + */ + //adc.setAlertPol(ADS1115_ACT_LOW); //uncomment if you want to change the default + + /* With this function the alert pin will assert, when a conversion is ready. + * In order to deactivate, use the setAlertLimit_V function + */ + //adc.setAlertPinToConversionReady(); //uncomment if you want to change the default + +} + +float readChannel(ADS1115_MUX channel) { + float voltage = 0.0; + adc.setCompareChannels(channel); + adc.startSingleMeasurement(); + while(adc.isBusy()){} + voltage = adc.getResult_V(); // alternative: getResult_mV for Millivolt + return voltage; +} + +void MessungADS() { + float voltage = 0.0; + + voltage = readChannel(ADS1115_COMP_0_GND); + dtostrf(voltage,8,2,ADSData.Akku); + Serial.print("Akku:\t\t\t"); + Serial.print(ADSData.Akku); + Serial.println(" V"); + + voltage = readChannel(ADS1115_COMP_1_GND); + dtostrf(voltage,8,2,ADSData.Solar); + Serial.print("Solar:\t\t\t"); + Serial.print(ADSData.Solar); + Serial.println(" V"); + +} diff --git a/include/mess_BME280.h b/include/mess_BME280.h new file mode 100644 index 0000000..e022002 --- /dev/null +++ b/include/mess_BME280.h @@ -0,0 +1,87 @@ +#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); +} \ No newline at end of file diff --git a/include/mess_BMP280.h b/include/mess_BMP280.h index d522814..c9793f4 100644 --- a/include/mess_BMP280.h +++ b/include/mess_BMP280.h @@ -1,80 +1,80 @@ -#include -#include -#include -#include - - -#define SEALEVELPRESSURE_HPA (1013.25) // 1013.25 -// Richen 219 m über NN -// Eppingem 195 m über NN - -Adafruit_BMP280 bmp; // I2C -float K_BMP280 = -0.0; - -bool F_BMP280; - -struct { - char temperature[15] = {0}; - char pressure[15] = {0}; - char approx_altitud[15] = {0}; - char humity[15] = {0}; -} BMP280Data; - - - -void Init_BMP280(){ - bool status = bmp.begin(); - 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); */ - /* Default settings from datasheet. */ - bmp.setSampling(Adafruit_BMP280::MODE_NORMAL, /* Operating Mode. */ - Adafruit_BMP280::SAMPLING_X2, /* Temp. oversampling */ - Adafruit_BMP280::SAMPLING_X16, /* Pressure oversampling */ - Adafruit_BMP280::FILTER_X16, /* Filtering. */ - Adafruit_BMP280::STANDBY_MS_500); /* Standby time. */ - - //bmp_temp->printSensorDetails(); - Serial.println("BMP280 gefunden"); - } -} - -void read_BMP_280() { - - - Serial.print("Temperature (BMP280):\t"); - float t = bmp.readTemperature(); - t = t + K_BMP280; - dtostrf(t,7,1,BMP280Data.temperature); - Serial.print(BMP280Data.temperature); - Serial.println(" °C"); - - Serial.print("Pressure:\t\t"); - float p = bmp.readPressure() / 100.0F; - p = p + 13; - dtostrf(p,7,1,BMP280Data.pressure); - Serial.print(BMP280Data.pressure); - Serial.println(" hPa"); - - Serial.print("Approx. Altitude:\t"); - float a = bmp.readAltitude(SEALEVELPRESSURE_HPA); - dtostrf(a,7,1,BMP280Data.approx_altitud); - Serial.print(BMP280Data.approx_altitud); - Serial.println(" m über NN"); - - Serial.println(); -} -void M2M_BMP280(String deviceId = "4711") { - char topic[100]; - sprintf(topic, "%s%s%s", "hjk/devices/", deviceId.c_str(), "/telemetry/temperature_BMP_280" ); - client.publish(topic, BMP280Data.temperature, true); - sprintf(topic, "%s%s%s", "hjk/devices/", deviceId.c_str(), "/telemetry/pressure" ); - client.publish(topic, BMP280Data.pressure, true); - sprintf(topic, "%s%s%s", "hjk/devices/", deviceId.c_str(), "/telemetry/approx_altitude" ); - client.publish(topic, BMP280Data.approx_altitud); +#include +#include +#include +#include + + +#define SEALEVELPRESSURE_HPA (1013.25) // 1013.25 +// Richen 219 m über NN +// Eppingem 195 m über NN + +Adafruit_BMP280 bmp; // I2C +float K_BMP280 = -0.0; + +bool F_BMP280; + +struct { + char temperature[15] = {0}; + char pressure[15] = {0}; + char approx_altitud[15] = {0}; + char humity[15] = {0}; +} BMP280Data; + + + +void Init_BMP280(){ + bool status = bmp.begin(); + 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); + /* Default settings from datasheet. */ + bmp.setSampling(Adafruit_BMP280::MODE_NORMAL, /* Operating Mode. */ + Adafruit_BMP280::SAMPLING_X2, /* Temp. oversampling */ + Adafruit_BMP280::SAMPLING_X16, /* Pressure oversampling */ + Adafruit_BMP280::FILTER_X16, /* Filtering. */ + Adafruit_BMP280::STANDBY_MS_500); /* Standby time. */ + + //bmp_temp->printSensorDetails(); + Serial.println("BMP280 gefunden"); + } +} + +void read_BMP_280() { + + + Serial.print("Temperature (BMP280):\t"); + float t = bmp.readTemperature(); + t = t + K_BMP280; + dtostrf(t,7,1,BMP280Data.temperature); + Serial.print(BMP280Data.temperature); + Serial.println(" °C"); + + Serial.print("Pressure:\t\t"); + float p = bmp.readPressure() / 100.0F; + p = p + KorrekturLuftdruck; + dtostrf(p,7,1,BMP280Data.pressure); + Serial.print(BMP280Data.pressure); + Serial.println(" hPa"); + + Serial.print("Approx. Altitude:\t"); + float a = bmp.readAltitude(SEALEVELPRESSURE_HPA); + dtostrf(a,7,1,BMP280Data.approx_altitud); + Serial.print(BMP280Data.approx_altitud); + Serial.println(" m über NN"); + + Serial.println(); +} +void M2M_BMP280(String deviceId = "4711") { + char topic[100]; + sprintf(topic, "%s%s%s", "hjk/devices/", deviceId.c_str(), "/telemetry/temperature_BMP_280" ); + client.publish(topic, BMP280Data.temperature, true); + sprintf(topic, "%s%s%s", "hjk/devices/", deviceId.c_str(), "/telemetry/pressure" ); + client.publish(topic, BMP280Data.pressure, true); + sprintf(topic, "%s%s%s", "hjk/devices/", deviceId.c_str(), "/telemetry/approx_altitude" ); + client.publish(topic, BMP280Data.approx_altitud); } \ No newline at end of file diff --git a/include/mess_Ub.h b/include/mess_Ub.h index 358e4b0..0b74537 100644 --- a/include/mess_Ub.h +++ b/include/mess_Ub.h @@ -2,7 +2,7 @@ const float MinimalSpannung = 2.85; -float korectur = 0.0009350; +float korectur = 0.001015; char floatString[15] = {0}; float AKKU; @@ -13,7 +13,7 @@ float getBattery() return 3.05; #endif int Vcc = analogRead(A0); - Vcc = Vcc * ((100+220+680)/100); + Vcc = Vcc * ((100+220+220)/100); float VCC = Vcc * korectur ; Serial.printf("Rohdaten: %d, ", Vcc); dtostrf(VCC,8,2,floatString); diff --git a/include/mess_Ub_old.h b/include/mess_Ub_old.h index 9f947f6..2a18215 100644 --- a/include/mess_Ub_old.h +++ b/include/mess_Ub_old.h @@ -1,24 +1,24 @@ -#include - -const float MinimalSpannung = 2.85; -float koa = 0.984326019; -char floatString[15] = {0}; -float AKKU; - -float getBattery(float kor = 1.000) -{ - #if (NOBATT == 1) - Serial.print("Batterie:\t\t 3.05 V\n"); - return 3.05; - #endif - float valA0 = analogRead(A0); - valA0 = valA0 * 3.7; // (R1 + r1 + r2) / r2 - // r1 und r2 Spannungsteiler - // r1 = 270k, r2 = 100k - // Spannungsbereich = 5.2 Volt - valA0= valA0 / 1024; - valA0 = valA0 * kor; - dtostrf(valA0,7,2,floatString); - Serial.printf("Batterie:\t\t %s V\n", floatString); - return valA0; +#include + +const float MinimalSpannung = 2.85; +float koa = 0.984326019; +char floatString[15] = {0}; +float AKKU; + +float getBattery(float kor = 1.000) +{ + #if (NOBATT == 1) + Serial.print("Batterie:\t\t 3.05 V\n"); + return 3.05; + #endif + float valA0 = analogRead(A0); + valA0 = valA0 * 3.7; // (R1 + r1 + r2) / r2 + // r1 und r2 Spannungsteiler + // r1 = 270k, r2 = 100k + // Spannungsbereich = 5.2 Volt + valA0= valA0 / 1024; + valA0 = valA0 * kor; + dtostrf(valA0,7,2,floatString); + Serial.printf("Batterie:\t\t %s V\n", floatString); + return valA0; } \ No newline at end of file diff --git a/include/mess_htu21.h b/include/mess_htu21.h index 15d077c..959dac4 100644 --- a/include/mess_htu21.h +++ b/include/mess_htu21.h @@ -1,52 +1,52 @@ -#include -#include -#include -#include - -Adafruit_HTU21DF htu = Adafruit_HTU21DF(); - -bool F_HTU_21D; -float K_HTU= -0.00; - -struct { - char temperature[15] = {0}; - char humity[15] = {0}; -} htuData; - -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"); - } -} - -void read_HTU21D() { - float t = htu.readTemperature(); - t = t + K_HTU; - dtostrf(t,7,1,htuData.temperature); - float h = htu.readHumidity(); - dtostrf(h,7,1,htuData.humity); - Serial.print("Temperature (HTU21D):\t"); - Serial.print(htuData.temperature); - Serial.println(" °C"); - Serial.print("Luftfeuchtigkeit:\t"); - Serial.print(htuData.humity); - Serial.println(" %"); - -} - -void M2M_HTU21D(String deviceId = "4711") { - char topic[100]; - sprintf(topic, "%s%s%s", "hjk/devices/", deviceId.c_str(), "/telemetry/temperature_Htu_21" ); - client.publish(topic, htuData.temperature, true); - sprintf(topic, "%s%s%s", "hjk/devices/", deviceId.c_str(), "/telemetry/humity" ); - client.publish(topic, htuData.humity, true); - /* Serial.printf("HTU21:\t\t %s °C\n", htuData.temperature); - Serial.printf("HTU21:\t\t %s %%\n", htuData.humity); */ +#include +#include +#include +#include + +Adafruit_HTU21DF htu = Adafruit_HTU21DF(); + +bool F_HTU_21D; +float K_HTU= -0.00; + +struct { + char temperature[15] = {0}; + char humity[15] = {0}; +} htuData; + +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"); + } +} + +void read_HTU21D() { + float t = htu.readTemperature(); + t = t + K_HTU; + dtostrf(t,7,1,htuData.temperature); + float h = htu.readHumidity(); + dtostrf(h,7,1,htuData.humity); + Serial.print("Temperature (HTU21D):\t"); + Serial.print(htuData.temperature); + Serial.println(" °C"); + Serial.print("Luftfeuchtigkeit:\t"); + Serial.print(htuData.humity); + Serial.println(" %"); + +} + +void M2M_HTU21D(String deviceId = "4711") { + char topic[100]; + sprintf(topic, "%s%s%s", "hjk/devices/", deviceId.c_str(), "/telemetry/temperature_Htu_21" ); + client.publish(topic, htuData.temperature, true); + sprintf(topic, "%s%s%s", "hjk/devices/", deviceId.c_str(), "/telemetry/humity" ); + client.publish(topic, htuData.humity, true); + /* Serial.printf("HTU21:\t\t %s °C\n", htuData.temperature); + Serial.printf("HTU21:\t\t %s %%\n", htuData.humity); */ } \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index cc3e43b..6d85416 100644 --- a/platformio.ini +++ b/platformio.ini @@ -13,16 +13,18 @@ platform = espressif8266 board = d1 framework = arduino board_build.filesystem = littlefs -monitor_port = COM6 +monitor_port = COM5 monitor_speed = 74800 monitor_filters = time -upload_port = COM6 +upload_port = COM5 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 + adafruit/Adafruit BusIO @ 1.16.1 + adafruit/Adafruit BME280 Library @ 2.2.4 + adafruit/Adafruit Unified Sensor @ 1.1.14 build_flags = -DTEMPTEST33=1 @@ -46,6 +48,7 @@ build_flags = ${env.build_flags} -DTERROR=5 -DTLOWBATT=60 -DTINTERVAL=1 + -DKorrekturLuftdruck=0.0 [env:marcel] ; Produktivsystem: build_flags = ${env.build_flags} @@ -62,6 +65,7 @@ build_flags = ${env.build_flags} -DTERROR=20 -DTLOWBATT=60 -DTINTERVAL=10 + -DKorrekturLuftdruck=0.0 [env:boris] ; Produktivsystem: build_flags = ${env.build_flags} @@ -78,6 +82,7 @@ build_flags = ${env.build_flags} -DTERROR=20 -DTLOWBATT=60 -DTINTERVAL=5 + -DKorrekturLuftdruck=0.0 [env:hjk] build_flags = ${env.build_flags} @@ -93,7 +98,8 @@ build_flags = ${env.build_flags} -Dmqtt_port=61883 -DTERROR=5 -DTLOWBATT=60 - -DTINTERVAL=5 + -DTINTERVAL=10 + -DKorrekturLuftdruck=23.6 [env:filamentbox] build_flags = ${env.build_flags} @@ -110,4 +116,5 @@ build_flags = ${env.build_flags} -DTERROR=5 -DTLOWBATT=60 -DTINTERVAL=15 + -DKorrekturLuftdruck=0.0 diff --git a/src/main.cpp b/src/main.cpp index a461510..1961a57 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,7 +5,7 @@ #include #include -#define BUILTIN_LED D15 +// #define BUILTIN_LED D2 #define TRIGGER_PIN D7 #define START_STOP_PIN D6 @@ -25,7 +25,8 @@ PubSubClient client(espClient); #include -#include +//#include +#include #include @@ -72,6 +73,10 @@ 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 ); @@ -84,10 +89,13 @@ void setup() { readSystemStatus(); Serial.printf("Systemstatus : 0x%02x \n", SystemStatus); SystemStatus = 0x00; + writeSystemStatus(); delay(500); #if (MQTT == 0) init_HTU21(); - Init_BMP280(); + //Init_BMP280(); + Sensor_BME280(); + init_MCP9808(); initADS(); #endif @@ -106,9 +114,9 @@ void setup() { if (F_ADS1115 == true){ MessungADS(); } - if (F_BMP280 == true){ + /* if (F_BMP280 == true){ read_BMP_280(); - } + }*/ if (F_MCP9808 == true){ valTemp = getTemperature_MCP9808(); } @@ -143,7 +151,7 @@ void loop() { } if (F_HTU_21D) M2M_HTU21D(hostname.c_str()); - if (F_BMP280) M2M_BMP280(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" ); @@ -153,7 +161,7 @@ void loop() { client.publish(topic, msg, true); client.loop(); delay(500); - digitalWrite(BUILTIN_LED, HIGH); + //digitalWrite(BUILTIN_LED, HIGH); /* ESP.deepSleep(5e6); delay(100); */ endTime = millis(); @@ -265,7 +273,7 @@ void callback(char* topic1, byte* payload, unsigned int length) void reconnect() { // Loop until we're reconnected - sprintf(clientName, "%s%s", "ESP8266Client", sID); + sprintf(clientName, "%s%s", "ESP8266Wetter", sID); while (!client.connected()) { Serial.print("Attempting MQTT connection..."); //verifyFingerprint(); @@ -273,9 +281,9 @@ void reconnect() { if (client.connect(clientName)) { Serial.println("connected"); // Once connected, publish an announcement... - client.publish("outTopic", "hello world"); + // client.publish("outTopic", "hello world"); // ... and resubscribe - client.subscribe("inTopic"); + // client.subscribe("inTopic"); } else { Serial.print("failed, rc="); Serial.print(client.state());