mirror of https://github.com/arendst/Tasmota.git
Merge branch 'arendst:development' into feature/can-bus
This commit is contained in:
commit
7bbc858f09
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
xsns_87_esp32_sensors.ino - ESP32 Temperature and Hall Effect sensor for Tasmota
|
xsns_127_esp32_sensors.ino - ESP32 Temperature and Hall Effect sensor for Tasmota
|
||||||
|
|
||||||
Copyright (C) 2021 Theo Arends
|
Copyright (C) 2021 Theo Arends
|
||||||
|
|
||||||
|
@ -23,13 +23,16 @@
|
||||||
/*********************************************************************************************\
|
/*********************************************************************************************\
|
||||||
* ESP32 CPU Temperature and optional Hall Effect sensor
|
* ESP32 CPU Temperature and optional Hall Effect sensor
|
||||||
*
|
*
|
||||||
|
* To allow for not updating the global temperature by the ESP32 temperature sensor this
|
||||||
|
* driver needs to be the highest numbered driver (currently 127)
|
||||||
|
*
|
||||||
* ESP32 internal Hall Effect sensor connected to both GPIO36 and GPIO39
|
* ESP32 internal Hall Effect sensor connected to both GPIO36 and GPIO39
|
||||||
* To enable set
|
* To enable set
|
||||||
* GPIO36 as HallEffect 1
|
* GPIO36 as HallEffect 1
|
||||||
* GPIO39 as HallEffect 2
|
* GPIO39 as HallEffect 2
|
||||||
\*********************************************************************************************/
|
\*********************************************************************************************/
|
||||||
|
|
||||||
#define XSNS_87 87
|
#define XSNS_127 127
|
||||||
|
|
||||||
#if CONFIG_IDF_TARGET_ESP32
|
#if CONFIG_IDF_TARGET_ESP32
|
||||||
|
|
||||||
|
@ -116,7 +119,7 @@ void Esp32SensorShow(bool json) {
|
||||||
* Interface
|
* Interface
|
||||||
\*********************************************************************************************/
|
\*********************************************************************************************/
|
||||||
|
|
||||||
bool Xsns87(uint8_t function) {
|
bool Xsns127(uint8_t function) {
|
||||||
bool result = false;
|
bool result = false;
|
||||||
|
|
||||||
switch (function) {
|
switch (function) {
|
|
@ -416,7 +416,119 @@ bool (* const xsns_func_ptr[])(uint8_t) = { // Sensor Function Pointers for sim
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XSNS_99
|
#ifdef XSNS_99
|
||||||
&Xsns99
|
&Xsns99,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_100
|
||||||
|
&Xsns100,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_101
|
||||||
|
&Xsns101,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_102
|
||||||
|
&Xsns102,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_103
|
||||||
|
&Xsns103,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_104
|
||||||
|
&Xsns104,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_105
|
||||||
|
&Xsns105,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_106
|
||||||
|
&Xsns106,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_107
|
||||||
|
&Xsns107,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_108
|
||||||
|
&Xsns108,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_109
|
||||||
|
&Xsns109
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_110
|
||||||
|
&Xsns110,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_111
|
||||||
|
&Xsns111,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_112
|
||||||
|
&Xsns112,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_113
|
||||||
|
&Xsns113,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_114
|
||||||
|
&Xsns114,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_115
|
||||||
|
&Xsns115,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_116
|
||||||
|
&Xsns116,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_117
|
||||||
|
&Xsns117,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_118
|
||||||
|
&Xsns118,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_119
|
||||||
|
&Xsns119,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_120
|
||||||
|
&Xsns120,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_121
|
||||||
|
&Xsns121,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_122
|
||||||
|
&Xsns122,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_123
|
||||||
|
&Xsns123,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_124
|
||||||
|
&Xsns124,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_125
|
||||||
|
&Xsns125,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_126
|
||||||
|
&Xsns126,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef XSNS_127
|
||||||
|
&Xsns127
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -937,13 +1049,8 @@ const uint8_t kXsnsList[] = {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XSNS_127
|
#ifdef XSNS_127
|
||||||
XSNS_127,
|
XSNS_127
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XSNS_128
|
|
||||||
XSNS_128
|
|
||||||
#endif
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*********************************************************************************************/
|
/*********************************************************************************************/
|
||||||
|
|
Loading…
Reference in New Issue