[SYS] Update arduino core to 3.1.1 + refactor ino to cpp (#2177)
* 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
This commit is contained in:
Ryan Powell authored and GitHub committed
1 parent
6e77efb11b
commit
585df9a420
83 files changed
+1275
-1293
No files matched your search
@@ -0,0 +1,153 @@
|
||||
/*
|
||||
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
|
||||
|
||||
For esp32, touch sensor reading add-on.
|
||||
|
||||
Copyright: (c) Florian Xhumari
|
||||
|
||||
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 ZsensorTouch
|
||||
# include "TheengsCommon.h"
|
||||
# include "config_Touch.h"
|
||||
# ifndef ESP32
|
||||
# error Only supported on esp32
|
||||
# endif
|
||||
|
||||
//Time used to wait for an interval before resending touch sensor value
|
||||
static unsigned long touchTimeRead = 0;
|
||||
|
||||
// for each touch button
|
||||
struct TouchStatus {
|
||||
uint8_t pin;
|
||||
uint16_t timePublished = 0;
|
||||
uint16_t timeStatusChanged = 0;
|
||||
uint16_t avg = 10 * 256; // starting value; multiplied by 256
|
||||
bool isOn = false;
|
||||
bool wasOn = false;
|
||||
int onCount = 0; // number of consecutive readings that were considered "ON"
|
||||
unsigned long onTime; // time the button was turned on
|
||||
};
|
||||
|
||||
static TouchStatus status[TOUCH_SENSORS];
|
||||
|
||||
void setupTouch() {
|
||||
# if TOUCH_SENSORS > 0
|
||||
status[0].pin = TOUCH_GPIO_0;
|
||||
# endif
|
||||
# if TOUCH_SENSORS > 1
|
||||
status[1].pin = TOUCH_GPIO_1;
|
||||
# endif
|
||||
# if TOUCH_SENSORS > 2
|
||||
status[2].pin = TOUCH_GPIO_2;
|
||||
# endif
|
||||
# if TOUCH_SENSORS > 3
|
||||
status[3].pin = TOUCH_GPIO_3;
|
||||
# endif
|
||||
# if TOUCH_SENSORS > 4
|
||||
status[4].pin = TOUCH_GPIO_4;
|
||||
# endif
|
||||
# if TOUCH_SENSORS > 5
|
||||
status[5].pin = TOUCH_GPIO_5;
|
||||
# endif
|
||||
# if TOUCH_SENSORS > 6
|
||||
status[6].pin = TOUCH_GPIO_6;
|
||||
# endif
|
||||
# if TOUCH_SENSORS > 7
|
||||
status[7].pin = TOUCH_GPIO_7;
|
||||
# endif
|
||||
# if TOUCH_SENSORS > 8
|
||||
status[8].pin = TOUCH_GPIO_8;
|
||||
# endif
|
||||
# if TOUCH_SENSORS > 9
|
||||
status[9].pin = TOUCH_GPIO_9;
|
||||
# endif
|
||||
for (int i = 0; i < TOUCH_SENSORS; i++) {
|
||||
Log.notice(F("TOUCH_GPIO_%d: %d" CR), i, status[i].pin);
|
||||
}
|
||||
touchTimeRead = millis() - TOUCH_TIME_BETWEEN_READINGS; // so we get a first reading at the beginning
|
||||
}
|
||||
|
||||
void MeasureTouch() {
|
||||
unsigned long now = millis();
|
||||
if (now - touchTimeRead < TOUCH_TIME_BETWEEN_READINGS) {
|
||||
return;
|
||||
}
|
||||
touchTimeRead = now;
|
||||
for (int i = 0; i < TOUCH_SENSORS; i++) {
|
||||
TouchStatus* button = &status[i];
|
||||
|
||||
uint16_t val = touchRead(button->pin);
|
||||
if (val == 0) {
|
||||
// just ignore a 0 reading
|
||||
continue;
|
||||
}
|
||||
|
||||
// we'll work in 1/265th of a unit value returned by touchRead(), in order
|
||||
// to have a better precision when performing averages and divisions, while
|
||||
// not using floating point calculations.
|
||||
uint16_t curValue = val * 256;
|
||||
bool isOn = (curValue < button->avg * (TOUCH_THRESHOLD * 256 / 100) / 256); // just so that we divide by 256 and not by 100
|
||||
if (!isOn) {
|
||||
button->avg = (button->avg * 127 + val * 256 * 1) / 128; // exponential averaging, factor = 1/128
|
||||
}
|
||||
int lastOnCount = button->onCount;
|
||||
if (isOn) {
|
||||
++button->onCount;
|
||||
} else {
|
||||
button->onCount = 0;
|
||||
}
|
||||
|
||||
bool isStatusChanged = false;
|
||||
if (((button->wasOn && !isOn) || (!button->wasOn && isOn && button->onCount >= TOUCH_MIN_DURATION / TOUCH_TIME_BETWEEN_READINGS)) && now - button->timeStatusChanged > TOUCH_DEBOUNCE_TIME) { // debounce
|
||||
isStatusChanged = true;
|
||||
button->wasOn = isOn;
|
||||
button->timeStatusChanged = now;
|
||||
if (isOn) {
|
||||
button->onTime = now;
|
||||
}
|
||||
}
|
||||
// keep timeStatusChanged from getting too old, so not to go
|
||||
// beyond timestamp wrapping
|
||||
if (now - button->timeStatusChanged > 100000) {
|
||||
button->timeStatusChanged = now - 100000;
|
||||
}
|
||||
if (isStatusChanged) {
|
||||
const int JSON_MSG_CALC_BUFFER = JSON_OBJECT_SIZE(4);
|
||||
StaticJsonDocument<JSON_MSG_CALC_BUFFER> jsonDoc;
|
||||
JsonObject touchData = jsonDoc.to<JsonObject>();
|
||||
touchData["id"] = i;
|
||||
touchData["on"] = (isOn ? 1 : 0);
|
||||
touchData["value"] = (int)(curValue / 256);
|
||||
if (!isOn) { // when turning off, send the duration the button was on
|
||||
touchData["onDuration"] = now - button->onTime + TOUCH_MIN_DURATION;
|
||||
}
|
||||
touchData["origin"] = subjectTouchtoMQTT;
|
||||
enqueueJsonObject(touchData);
|
||||
button->timePublished = now;
|
||||
}
|
||||
// adjust measure time so that min(avg of all buttons) is around 60 (between 40 and 80)
|
||||
// TODO
|
||||
|
||||
} // loop
|
||||
}
|
||||
#endif
|
||||
Reference in new issue
Block a user