mirror of
https://github.com/1technophile/OpenMQTTGateway.git
synced 2026-03-08 08:17:13 +01:00
* Update arduino core to 3.1.1 * Fix Blufi build * Update arduinojson, fix build errors with idf * Fix narrowing * fix RF builds * WIP-Convert ino files to cpp * Fix pilight build * Fix Somfy actuator build. * Update esp32dev-rf partition * Fix Weatherstation build * Fix GFSunInverter build * Fix esp32dev-ir build * Fix ble-aws build * Fix eth builds * Fix m5Stack missing pins_arduino.h * Fix build errors for M5 stack/tough, others are upstream issues. * Fix RTL 433 build - remaining errors are from radolib * Fix nodemcu build * fix 2g builds * Fix serial build * Fix actuator on off builds * Fix SSD1306 build - remaining errors are from radiolib * Fix multiple definition of OTAserver_cert * Fix nodemcu rf2 build * Fix ADC builds * Fix sensor builds * Fix LORA builds * Fix multi-receiver builds - remaining errors are in radiolib * Fix fastled builds * Fix theegns board builds * Fix broker builds * Update fastled - old version failed all-test build * Fix RN8209 builds * Fix max temp actuator builds * Fix PWM builds * Fix C37 sensor builds * Fix HTU21 builds * Fix INA266 builds * Fix undefined variables in mqtt discovery * Fix webui build * Fix fastled invalid pin error * Fix wifi manual setup builds * Fix onewire/all-test build - bin too big error remaining * Fix theengs plug build * Fix rfbridge builds * Fix blufi builds * Fix undefined functions in serial * Fix preprocessor definition checks * Set IDF log level to erre * Add delay in loop to prevent watchdog timeout * Use xTaskCreateUniveral to support single core processors * Remove old HTTPUpdate files - upsteam fixed. * Cleanup and move common declarations to header file * Use custom partiton table to fix builds where bin is too large * Update M5StickC - fixs esp32-m5stick-c-ble build * Revert to Arduino core 2.x for builds with incompatible libs * Remove "Z" from file names and rename omg_common to TheengsCommon * Fix gateway name when using MAC with new Arduino core * Update IDF config to reduce loop task stack use * Update esp-nimble-cpp version, corrects BLE uppercase ID's * Update wifi manager to fix watchdog timeout error
106 lines
3.8 KiB
C++
106 lines
3.8 KiB
C++
/*
|
|
Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
|
|
|
|
Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
|
|
Send and receiving command by MQTT
|
|
|
|
Analog GPIO reading Addon
|
|
|
|
Copyright: (c)Florian ROBERT
|
|
|
|
Contributors:
|
|
- 1technophile
|
|
|
|
This file is part of OpenMQTTGateway.
|
|
|
|
OpenMQTTGateway is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OpenMQTTGateway is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include "User_config.h"
|
|
|
|
#ifdef ZsensorADC
|
|
# include "TheengsCommon.h"
|
|
# include "config_ADC.h"
|
|
|
|
# if defined(ESP8266)
|
|
ADC_MODE(ADC_TOUT);
|
|
# endif
|
|
|
|
static int persistedadc = -1024; // so that the first reading will always be published
|
|
|
|
//Time used to wait for an interval before resending adc value
|
|
unsigned long timeadc = 0;
|
|
unsigned long timeadcpub = 0;
|
|
void setupADC() {
|
|
Log.notice(F("ADC_GPIO: %d" CR), ADC_GPIO);
|
|
}
|
|
|
|
void MeasureADC() {
|
|
if (millis() - timeadc > TimeBetweenReadingADC) { //retrieving value of temperature and humidity of the box from DHT every xUL
|
|
# if defined(ESP8266)
|
|
yield();
|
|
analogRead(ADC_GPIO); //the reliability of the readings can be significantly improved by discarding an initial reading and then averaging the results
|
|
# endif
|
|
timeadc = millis();
|
|
int val = analogRead(ADC_GPIO);
|
|
int sum_val = val;
|
|
if (NumberOfReadingsADC > 1) { // add extra measurement for accuracy
|
|
for (int i = 1; i < NumberOfReadingsADC; i++) {
|
|
sum_val += analogRead(ADC_GPIO);
|
|
}
|
|
val = sum_val / NumberOfReadingsADC;
|
|
}
|
|
if (isnan(val)) {
|
|
Log.error(F("Failed to read from ADC !" CR));
|
|
} else {
|
|
if (val >= persistedadc + ThresholdReadingADC || val <= persistedadc - ThresholdReadingADC || (MinTimeInSecBetweenPublishingADC > 0 && millis() - timeadcpub > (MinTimeInSecBetweenPublishingADC * 1000UL))) {
|
|
timeadcpub = millis();
|
|
Log.trace(F("Creating ADC buffer" CR));
|
|
StaticJsonDocument<JSON_MSG_BUFFER> ADCdataBuffer;
|
|
JsonObject ADCdata = ADCdataBuffer.to<JsonObject>();
|
|
ADCdata["adc"] = (int)val;
|
|
if (NumberOfReadingsADC > 1) {
|
|
ADCdata["adc_reads"] = NumberOfReadingsADC;
|
|
}
|
|
# if defined(ADC_DIVIDER)
|
|
float volt = 0;
|
|
# if defined(ESP32)
|
|
// Convert the analog reading (which goes from 0 - 4095) to a voltage (0 - 3.3V):
|
|
volt = val * (3.3 / 4096.0);
|
|
# elif defined(ESP8266)
|
|
// Convert the analog reading (which goes from 0 - 1024) to a voltage (0 - 3.3V):
|
|
volt = val * (3.3 / 1024.0);
|
|
# else
|
|
// Asume 5V and 10bits ADC
|
|
volt = val * (5.0 / 1024.0);
|
|
# endif
|
|
volt *= ADC_DIVIDER;
|
|
// let's give 2 decimal point
|
|
int v = (volt * 100);
|
|
volt = (float)v / 100.0;
|
|
ADCdata["volt"] = (float)volt;
|
|
# endif
|
|
# if defined(ADC_CALIBRATED_SCALE_FACTOR) // calibration: scale factor = ref-Vcal-mV / sum-of-cal-readings @see https://skillbank.co.uk/arduino/calibrate.htm
|
|
float voltage = sum_val * ADC_CALIBRATED_SCALE_FACTOR; // convert to voltage in millivolts
|
|
ADCdata["adc_sum"] = (int)sum_val;
|
|
ADCdata["mvolt_scaled"] = (int)voltage; // real scaled/calibrated value in mV
|
|
# endif
|
|
ADCdata["origin"] = ADCTOPIC;
|
|
enqueueJsonObject(ADCdata);
|
|
persistedadc = val;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
#endif
|