mirror of https://github.com/arendst/Tasmota.git
Adding support for ME007-ULS narrow FoV ultrasonic distance sensor (#17376)
* Squashed commit of the following: commit 1441459a47cff0a43aa61ce47510585ee03649f3 Merge: a9fcbd3427e27945e5Author: Mathias Buder <mathias_buder@bose.com> Date: Tue Dec 13 09:00:06 2022 +0100 Merge branch 'development' into me007-narrow-fov-ultrasonic-sensor commit a9fcbd3428445eb914816f608e064568d16b41e9 Merge: 7bb1049f5d83119897Author: Mathias Buder <mathias.buder@gmail.com> Date: Mon Dec 12 10:33:06 2022 +0100 Merge branch 'development' into me007-narrow-fov-ultrasonic-sensor commit 7bb1049f51da8d064462b9499ed479a7675b368e Merge: 83a5afa7aeee86f01aAuthor: Mathias Buder <mathias.buder@gmail.com> Date: Fri Dec 9 09:30:29 2022 +0100 Merge remote-tracking branch 'github/development' into me007-narrow-fov-ultrasonic-sensor commit 83a5afa7ad27fcde1e67008e41a9bfd9c680cccd Author: Mathias Buder <mathias.buder@gmail.com> Date: Thu Dec 8 14:47:13 2022 +0100 [ME007] Added driver version number to MQTT message, small delay between consecutive measurement commit 9b8667843154f02a23020e655d806ed76ae2e530 Merge: 39180f345de408921eAuthor: Mathias Buder <mathias.buder@gmail.com> Date: Thu Dec 8 10:12:45 2022 +0100 Merge branch 'development' into me007-narrow-fov-ultrasonic-sensor commit 39180f3451fce5f06504195faea0124d73dac1ee Author: Mathias Buder <mathias.buder@gmail.com> Date: Wed Dec 7 16:41:26 2022 +0100 [ME007] Added median filter commit 01b68e0e6ca147ac03b63b8c71d035563e3bf13b Author: Mathias Buder <mathias.buder@gmail.com> Date: Mon Dec 5 23:08:57 2022 +0100 [ME007] Simplified state maschine within me007_measure() commit 1c74c6ed3e4097f09792a48420b2016c92e10353 Author: Mathias Buder <mathias.buder@gmail.com> Date: Mon Dec 5 22:21:16 2022 +0100 [ME007] Fixed issues from previous pull-request commit 25b667120fd8d70fcfed36de44f1b7a17d0686be Merge: 01e0b1809e7d40b8d1Author: Mathias Buder <mathias.buder@gmail.com> Date: Mon Dec 5 10:46:25 2022 +0100 Merge branch 'development' into me007-narrow-fov-ultrasonic-sensor # Conflicts: # tasmota/include/tasmota_template.h commit 01e0b18096bfffc67673e25152114694caaf110a Author: Mathias Buder <mathias.buder@gmail.com> Date: Sun Dec 4 20:53:39 2022 +0100 [ME007] Minor changes commit ec00c9b85d223b78586c464bb92d1c7894357a40 Author: Mathias Buder <mathias.buder@gmail.com> Date: Fri Dec 2 13:08:06 2022 +0100 [ME007] Added some measurement error statistics commit c5cf65f82c42195752a88fd1553c74ab68c39cb2 Author: Mathias Buder <mathias.buder@gmail.com> Date: Thu Dec 1 22:38:07 2022 +0100 [ME007] Fixed MQTT message commit ae07d8dd77db47e20578f655ec057a63b30e65ce Author: Mathias Buder <mathias.buder@gmail.com> Date: Thu Dec 1 21:56:20 2022 +0100 [ME007] Minor code refactoring commit d2b43ca70c716e1b637b9efd3b536506233e5365 Merge: 292f5f6c8816fd78fbAuthor: Mathias Buder <mathias.buder@gmail.com> Date: Thu Dec 1 16:48:38 2022 +0100 Merge branch 'development' into me007-narrow-fov-ultrasonic-sensor commit 292f5f6c81f1659eb225271cdd025eb77da02c6f Author: Mathias Buder <mathias.buder@gmail.com> Date: Thu Dec 1 16:47:03 2022 +0100 [ME007] Added logic to detect sensor at boot and during runtime commit f17af404fee76bf63b30ed3c9d2175c4e01c03ca Author: Mathias Buder <mathias.buder@gmail.com> Date: Thu Dec 1 12:32:19 2022 +0100 [ME007] Added missing define into language files commit 7a271abeca36139a43ef96bd461d46ba0c662901 Author: Mathias Buder <mathias.buder@gmail.com> Date: Thu Dec 1 12:19:23 2022 +0100 [ME007] Improved snesor measuremnt function commit fe42ebd1124e2246e4d7afd63c905c251e084b27 Author: Mathias Buder <mathias.buder@gmail.com> Date: Thu Dec 1 00:43:13 2022 +0100 [ME007] Updated state maschine to trigger and receive sensor measurements commit d137e6dec5104b4716428849d99c68bbf407ab42 Author: Mathias Buder <mathias.buder@gmail.com> Date: Wed Nov 30 20:35:31 2022 +0100 [ME007] Added initial state maschine to trigger and receive sensor measurements commit fc3da7b36849df162d9d5496a763ab2beb096aff Author: Mathias Buder <mathias.buder@gmail.com> Date: Tue Nov 29 21:28:28 2022 +0100 [ME007] Updated pin name commit e9fa9fb771cf15dcd9ed8b63b9194154543ef10e Author: Mathias Buder <mathias.buder@gmail.com> Date: Mon Nov 28 22:02:34 2022 +0100 [ME007] Fixed issue that sensor GPIOs not shown in drop-down list commit a13e42660183eb4ab91007ca0ea6bf1544687556 Author: Mathias Buder <mathias.buder@gmail.com> Date: Mon Nov 28 15:06:34 2022 +0100 [ME007] Added sensor into supported feature list commit dec17b59ce2905124386f8c90d81656bf104c844 Author: Mathias Buder <mathias.buder@gmail.com> Date: Mon Nov 28 15:01:58 2022 +0100 [ME007] Removed log message in Xsns23() commit 11f479d2ec9d3f4e7552c2f78cdc83914c5b8b94 Author: Mathias Buder <mathias.buder@gmail.com> Date: Mon Nov 28 10:47:55 2022 +0100 [ME007] Added GPIOs to tasmota_template_legacy.h and berry commit 23aec8e5ff4e9fb8ef7d3b01a707641accc1e01e Author: Mathias Buder <mathias.buder@gmail.com> Date: Sun Nov 27 20:10:53 2022 +0100 [ME007] Initial ME007 driver API setup * [ME007] Reverted change in .gitignore and platform.ini * [ME007] Removed dependency to stdlib.h * [ME007] Adjusted unit to cm * [ME007] Reverted change in tasmota_template_legacy.h * [ME007] Changed sensor message tag to three characters * [ME007] Disabled sensor in my_user_config.h * [ME007] Added driver code size into commente Co-authored-by: Mathias Buder <mathias_buder@bose.com>
This commit is contained in:
Mathias
GitHub
parent
f6d385250e
commit
fc8039d960
|
|
@ -149,6 +149,8 @@ const be_const_member_t lv_gpio_constants[] = {
|
|||
{ "MCP39F5_RST", (int32_t) GPIO_MCP39F5_RST },
|
||||
{ "MCP39F5_RX", (int32_t) GPIO_MCP39F5_RX },
|
||||
{ "MCP39F5_TX", (int32_t) GPIO_MCP39F5_TX },
|
||||
{ "ME007_RX", (int32_t) GPIO_ME007_RX },
|
||||
{ "ME007_TRIG", (int32_t) GPIO_ME007_TRIG },
|
||||
{ "MGC3130_RESET", (int32_t) GPIO_MGC3130_RESET },
|
||||
{ "MGC3130_XFER", (int32_t) GPIO_MGC3130_XFER },
|
||||
{ "MHZ_RXD", (int32_t) GPIO_MHZ_RXD },
|
||||
|
|
|
|||
|
|
@ -202,7 +202,8 @@ enum UserSelectablePins {
|
|||
GPIO_BP1658CJ_CLK, GPIO_BP1658CJ_DAT,// BP1658CJ
|
||||
GPIO_DINGTIAN_CLK, GPIO_DINGTIAN_SDI, GPIO_DINGTIAN_Q7, GPIO_DINGTIAN_PL, GPIO_DINGTIAN_RCK, // Dingtian relay board - 595's & 165's pins
|
||||
GPIO_LD2410_TX, GPIO_LD2410_RX, // HLK-LD2410
|
||||
GPIO_MBR_TX_ENA, GPIO_NRG_MBS_TX_ENA, // Modbus Bridge Serial Transmit Enable
|
||||
GPIO_MBR_TX_ENA, GPIO_NRG_MBS_TX_ENA, // Modbus Bridge Serial Transmit Enable
|
||||
GPIO_ME007_TRIG, GPIO_ME007_RX, // ME007 Serial/Trigger interface
|
||||
GPIO_SENSOR_END };
|
||||
|
||||
// Error as warning to rethink GPIO usage with max 2045
|
||||
|
|
@ -453,6 +454,7 @@ const char kSensorNames[] PROGMEM =
|
|||
D_GPIO_DINGTIAN_CLK "|" D_GPIO_DINGTIAN_SDI "|" D_GPIO_DINGTIAN_Q7 "|" D_GPIO_DINGTIAN_PL "|" D_GPIO_DINGTIAN_RCK "|"
|
||||
D_SENSOR_LD2410_TX "|" D_SENSOR_LD2410_RX "|"
|
||||
D_SENSOR_MBR_TX_ENA "|" D_SENSOR_NRG_MBS_TX_ENA "|"
|
||||
D_SENSOR_ME007_TRIG "|" D_SENSOR_ME007_RX "|"
|
||||
;
|
||||
|
||||
const char kSensorNamesFixed[] PROGMEM =
|
||||
|
|
@ -773,6 +775,10 @@ const uint16_t kGpioNiceList[] PROGMEM = {
|
|||
AGPIO(GPIO_SR04_TRIG), // SR04 Tri/TXgger pin
|
||||
AGPIO(GPIO_SR04_ECHO), // SR04 Ech/RXo pin
|
||||
#endif
|
||||
#ifdef USE_ME007
|
||||
AGPIO(GPIO_ME007_TRIG), // ME007 Trigger pin (xsns_23_me007.ino)
|
||||
AGPIO(GPIO_ME007_RX), // ME007 Rx pin (xsns_23_me007.ino)
|
||||
#endif
|
||||
#ifdef USE_TM1638
|
||||
AGPIO(GPIO_TM1638CLK), // TM1638 Clock
|
||||
AGPIO(GPIO_TM1638DIO), // TM1638 Data I/O
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Дебитомер"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Cabal"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x - TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x - RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Portata"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "А"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "А"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "A"
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@
|
|||
#define D_SENSOR_CM11_TX "CM110x TX"
|
||||
#define D_SENSOR_CM11_RX "CM110x RX"
|
||||
#define D_SENSOR_FLOWRATEMETER "Flowrate"
|
||||
#define D_SENSOR_ME007_TRIG "ME007 Tri"
|
||||
#define D_SENSOR_ME007_RX "ME007 Rx"
|
||||
|
||||
// Units
|
||||
#define D_UNIT_AMPERE "安培"
|
||||
|
|
|
|||
|
|
@ -782,8 +782,11 @@
|
|||
//#define USE_NOVA_SDS // Add support for SDS011 and SDS021 particle concentration sensor (+1k5 code)
|
||||
#define STARTING_OFFSET 30 // Turn on NovaSDS XX-seconds before tele_period is reached
|
||||
//#define USE_HPMA // Add support for Honeywell HPMA115S0 particle concentration sensor (+1k4)
|
||||
//#define USE_SR04 // Add support for HC-SR04 ultrasonic devices (+1k code)
|
||||
#define SR04_MAX_SENSOR_DISTANCE 500 // Set sensor max detection distance
|
||||
// #define USE_SR04 // Add support for HC-SR04 ultrasonic devices (+1k code)
|
||||
// #define SR04_MAX_SENSOR_DISTANCE 500 // Set sensor max detection distance
|
||||
// #define USE_ME007 // Add support for ME007 ultrasonic devices (+1k5 code)
|
||||
// #define ME007_MAX_SENSOR_DISTANCE 800 // Set sensor max detection distance
|
||||
// #define ME007_ENABLE_MEDIAN_FILTER // Enables that distance measurements are filtered with an median filter of length 5
|
||||
//#define USE_DYP // Add support for DYP ME-007 ultrasonic distance sensor, serial port version (+0k5 code)
|
||||
#define USE_SERIAL_BRIDGE // Add support for software Serial Bridge (+2k code)
|
||||
// #define SERIAL_BRIDGE_BUFFER_SIZE 256 // Serial Bridge receive buffer size (Default ESP8266 = 256, ESP32 = 800)
|
||||
|
|
|
|||
|
|
@ -858,7 +858,9 @@ void ResponseAppendFeatures(void)
|
|||
#ifdef USE_LD2410
|
||||
feature9 |= 0x00000400; // xsns_102_ld2410.ino
|
||||
#endif
|
||||
// feature9 |= 0x00000800;
|
||||
#ifdef USE_ME007
|
||||
feature9 |= 0x00000800; // xsns_23_me007.ino
|
||||
#endif
|
||||
|
||||
// feature9 |= 0x00001000;
|
||||
// feature9 |= 0x00002000;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,535 @@
|
|||
/*
|
||||
xsns_23_me007ula.ino - ME007 ultrasonic sensor support for Tasmota
|
||||
|
||||
Copyright (C) 2022 Mathias Buder
|
||||
|
||||
This program 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.
|
||||
|
||||
This program 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/>.
|
||||
*/
|
||||
|
||||
#ifdef USE_ME007
|
||||
/*********************************************************************************************\
|
||||
* ME007 - Ultrasonic distance sensor
|
||||
*
|
||||
* Code for ME007 family of ultrasonic distance sensors
|
||||
* References:
|
||||
* - https://wiki.dfrobot.com/Water-proof%20Ultrasonic%20Sensor%20(ULS)%20%20SKU:%20SEN0300
|
||||
\*********************************************************************************************/
|
||||
|
||||
/*********************************************************************************************/
|
||||
/* Includes*/
|
||||
/*********************************************************************************************/
|
||||
#include <TasmotaSerial.h>
|
||||
|
||||
/*********************************************************************************************/
|
||||
/* Defines */
|
||||
/*********************************************************************************************/
|
||||
#define XSNS_23 23
|
||||
|
||||
#define ME007_VERSION "1.0.0" /**< Driver version X.Y.Z: X:Major, Y: Minor, Z: Patch */
|
||||
|
||||
#define ME007_DEBUG_MSG_TAG "ME7: "
|
||||
#define ME007_WS_MQTT_MSG_TAG "ME7"
|
||||
#define ME007_SENSOR_ERROR_CNT_CURRENT_TAG "ErrorCounterCurrent"
|
||||
#define ME007_SENSOR_ERROR_CNT_TOTAL_TAG "ErrorCounterTotal"
|
||||
#define ME007_SENSOR_VERSION_TAG "DriverVersion"
|
||||
|
||||
#define ME007_MIN_SENSOR_DISTANCE 30U /**< Minimum measurement distance @unit cm */
|
||||
#ifndef ME007_MAX_SENSOR_DISTANCE
|
||||
#define ME007_MAX_SENSOR_DISTANCE 800U /**< Maximum measurement distance @unit cm */
|
||||
#endif
|
||||
#define ME007_SERIAL_IF_BAUD_RATE 9600U /**< Serial interface baud rate @unit Baud */
|
||||
#define ME007_SERIAL_SOF 0xFF /**< Start of frame indicator (header) */
|
||||
#define ME007_SERIAL_FRAME_SIZE 6U /**< Total frame size: Header (1Byte) + Distance (2 byte) + Temperature (2 byte) + Checksum (1 byte) = 6 byte */
|
||||
#define ME007_SERIAL_MAX_WAIT_TIME 120U /**< Max. wait time for data after trigger signal @unit ms */
|
||||
#define ME007_SERIAL_MAX_DATA_RECEIVE_TIME 500U /**< Max. time to receive entire data frame @unit ms */
|
||||
#define ME007_TRIG_SIG_DURATION_MS 1U /**< Time duration of trigger low-pulse @unit ms */
|
||||
#define ME007_MEDIAN_FILTER_SIZE 5U /**< Median filter samples, must be an odd number @unit sample */
|
||||
#define ME007_MEDIAN_FILTER_MEDIAN_IDX ( ( uint8_t )( ME007_MEDIAN_FILTER_SIZE - 1U) / 2U ) /**< Median filter samples @unit sample */
|
||||
#define ME007_MEDIAN_FILTER_MEASURE_DELAY 30U /**< Small delay between consecutive measurements @unit ms */
|
||||
#define ME007_SENSOR_NUM_ERROR 10U /**< Number of tries to detect sensor */
|
||||
|
||||
/*********************************************************************************************/
|
||||
/* Enums */
|
||||
/*********************************************************************************************/
|
||||
/**
|
||||
* @details Sensor readings type
|
||||
*/
|
||||
enum ME007_SHOW_TYPE
|
||||
{
|
||||
ME007_SHOW_TYPE_JS = 0U, /**< @details Domain log message tag string */
|
||||
ME007_SHOW_TYPE_WS
|
||||
};
|
||||
|
||||
/**
|
||||
* @details Sensor serial interface mode type
|
||||
*/
|
||||
typedef enum ME007_SERIAL_RECEIVE_TYPE_TAG
|
||||
{
|
||||
ME007_SERIAL_RECEIVE_TYPE_SOF = 0U, /**< @details Receive Start-Of-Frame character */
|
||||
ME007_SERIAL_RECEIVE_TYPE_DATA /**< @details Receive data (distance + temperature + checksum) */
|
||||
} ME007_SERIAL_RECEIVE_TYPE;
|
||||
|
||||
/**
|
||||
* @details Sensor serial interface byte type
|
||||
*/
|
||||
enum ME007_SERIAL_BYTE_TYPE
|
||||
{
|
||||
ME007_SERIAL_BYTE_TYPE_SOF = 0U, /**< @details Receive Start-Of-Frame character */
|
||||
ME007_SERIAL_BYTE_TYPE_DIST_H, /**< @details Distance MSB */
|
||||
ME007_SERIAL_BYTE_TYPE_DIST_L, /**< @details Distance LSB */
|
||||
ME007_SERIAL_BYTE_TYPE_TEMP_H, /**< @details Temperature MSB */
|
||||
ME007_SERIAL_BYTE_TYPE_TEMP_L, /**< @details Temperature LSB */
|
||||
ME007_SERIAL_BYTE_TYPE_CHECKSUM /**< @details Frame checksum */
|
||||
};
|
||||
|
||||
/**
|
||||
* @details Global sensor error type
|
||||
*/
|
||||
typedef enum ME007_ERROR_TYPE_TAG
|
||||
{
|
||||
ME007_ERROR_TYPE_NONE = 0U, /**< @details No error present */
|
||||
ME007_ERROR_TYPE_TIMEOUT, /**< @details Serial frame not receive in time */
|
||||
ME007_ERROR_TYPE_CRC /**< @details Checksum calculate/compare failed */
|
||||
} ME007_ERROR_TYPE;
|
||||
|
||||
/**
|
||||
* @details Global sensor state type
|
||||
*/
|
||||
typedef enum ME007_STATE_TYPE_TAG
|
||||
{
|
||||
ME007_STATE_NOT_DETECTED = 0U, /**< @details Sensor not detected */
|
||||
ME007_STATE_DETECTED /**< @details Sensor detected */
|
||||
} ME007_STATE_TYPE;
|
||||
|
||||
/*********************************************************************************************/
|
||||
/* Structures */
|
||||
/*********************************************************************************************/
|
||||
|
||||
/**
|
||||
* @details Global sensor data structure
|
||||
*/
|
||||
struct
|
||||
{
|
||||
uint8_t pin_rx_u8; /**< @details Serial interface receive pin */
|
||||
uint8_t pin_trig_u8; /**< @details Sensor trigger pin */
|
||||
ME007_STATE_TYPE state_e; /**< @details Global sensor state */
|
||||
float distance_cm_f32; /**< @details Output distance measurement @unit cm */
|
||||
float temperature_deg_f32; /**< @details Output temperature measurement @unit °C */
|
||||
uint8_t error_cnt_current_u8; /**< @details Measurement error counter (current) */
|
||||
uint16_t error_cnt_total_u16; /**< @details Measurement error counter (total) */
|
||||
} me007_data_s;
|
||||
|
||||
/*********************************************************************************************/
|
||||
/* Global Variables */
|
||||
/*********************************************************************************************/
|
||||
TasmotaSerial* gp_serial_if = nullptr; /**< @details Pointer to serial interface object */
|
||||
|
||||
/*********************************************************************************************/
|
||||
/* Function Prototypes */
|
||||
/*********************************************************************************************/
|
||||
|
||||
/**
|
||||
* @details This function initializes the sensor driver and its underlying serial interface.
|
||||
*/
|
||||
void me007_init( void );
|
||||
|
||||
/**
|
||||
* @details This function performs a single distance/temperature measurement.
|
||||
* @param[out] float* p_distance_cm_f32 Pointer to variable supposed to store the current distance reading.
|
||||
* @param[out] float* p_temperature_f32 Pointer to variable supposed to store the current temperature reading.
|
||||
* @return ME007_ERROR_TYPE Status of current measurement.
|
||||
*/
|
||||
ME007_ERROR_TYPE me007_measure( float* const p_distance_cm_f32, float* const p_temperature_f32 );
|
||||
|
||||
/**
|
||||
* @details This function sorts a list if float values in ascending order.
|
||||
* @param[in] const void* p_list Pointer to list to be sorted
|
||||
* @param[in] const uint8_t size_u8 Size of list to be sorted.
|
||||
*/
|
||||
#ifdef ME007_ENABLE_MEDIAN_FILTER
|
||||
void me007_sort_asc( float* const p_list, const uint8_t size_u8 );
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @details This function performs multiple sensor measurements and filters the output if enables.
|
||||
*/
|
||||
void me007_read_value( void );
|
||||
|
||||
/**
|
||||
* @details This function sends the current distance/temperature measurements to the web-interface / MQTT / Domoticz.
|
||||
* @param[in] ME007_SHOW_TYPE type_e Variable to decide where to output the sensor measurements.
|
||||
*/
|
||||
void me007_show( const ME007_SHOW_TYPE type_e );
|
||||
|
||||
/*********************************************************************************************/
|
||||
/* Function Definitions */
|
||||
/*********************************************************************************************/
|
||||
void me007_init( void )
|
||||
{
|
||||
AddLog( LOG_LEVEL_INFO, PSTR( ME007_DEBUG_MSG_TAG "Initializing ..." ) );
|
||||
|
||||
/* Check if sensor pins are selected/used in web-interface */
|
||||
if ( ( false == PinUsed( GPIO_ME007_TRIG ) )
|
||||
|| ( false == PinUsed( GPIO_ME007_RX ) ) )
|
||||
{
|
||||
AddLog( LOG_LEVEL_ERROR, PSTR( ME007_DEBUG_MSG_TAG "Serial/Trigger interface not configured" ) );
|
||||
return;
|
||||
}
|
||||
|
||||
/* Init some global sensor data structure elements */
|
||||
me007_data_s.state_e = ME007_STATE_NOT_DETECTED;
|
||||
me007_data_s.error_cnt_current_u8 = 0U;
|
||||
me007_data_s.error_cnt_total_u16 = 0U;
|
||||
|
||||
/* Store real pin number */
|
||||
me007_data_s.pin_rx_u8 = Pin( GPIO_ME007_RX );
|
||||
me007_data_s.pin_trig_u8 = Pin( GPIO_ME007_TRIG );
|
||||
|
||||
DEBUG_SENSOR_LOG( PSTR( ME007_DEBUG_MSG_TAG "Using GPIOs: Trigger: %i / Rx: %i)" ),
|
||||
me007_data_s.pin_trig_u8,
|
||||
me007_data_s.pin_rx_u8 );
|
||||
|
||||
/* Configure serial interface */
|
||||
/* Only Rx pin is required as ME007 is controlled using its trigger pin. Therefore, passing value "-1" as transmit_pin argument */
|
||||
gp_serial_if = new TasmotaSerial( me007_data_s.pin_rx_u8, -1, 2U );
|
||||
|
||||
if ( ( nullptr != gp_serial_if )
|
||||
&& ( true == gp_serial_if->begin( ME007_SERIAL_IF_BAUD_RATE ) ) )
|
||||
{
|
||||
if ( true == gp_serial_if->hardwareSerial() )
|
||||
{
|
||||
ClaimSerial();
|
||||
}
|
||||
|
||||
pinMode( me007_data_s.pin_trig_u8, OUTPUT ); /**< @details Configure trigger pin as output */
|
||||
digitalWrite( me007_data_s.pin_trig_u8, HIGH ); /**< @details Set trigger pin to high-level as it ME007 requires a falling edge to initiate measurement */
|
||||
|
||||
/* Detect sensor */
|
||||
AddLog( LOG_LEVEL_INFO, PSTR( ME007_DEBUG_MSG_TAG "Detecting ..." ) );
|
||||
for ( uint8_t idx_u8 = 0U; idx_u8 < ME007_SENSOR_NUM_ERROR; ++idx_u8 )
|
||||
{
|
||||
ME007_ERROR_TYPE detected_e = me007_measure( &me007_data_s.distance_cm_f32,
|
||||
&me007_data_s.temperature_deg_f32 );
|
||||
if ( ME007_ERROR_TYPE_NONE == detected_e )
|
||||
{
|
||||
me007_data_s.state_e = ME007_STATE_DETECTED;
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_SENSOR_LOG( PSTR( ME007_DEBUG_MSG_TAG "Measurement error: %i" ), idx_u8 );
|
||||
}
|
||||
}
|
||||
AddLog( LOG_LEVEL_INFO, PSTR( ME007_DEBUG_MSG_TAG "%s" ), me007_data_s.state_e == ME007_STATE_DETECTED ? "Detected" : "Not detected, Sensor deactivated" );
|
||||
}
|
||||
else
|
||||
{
|
||||
AddLog( LOG_LEVEL_ERROR, PSTR( ME007_DEBUG_MSG_TAG "Serial interface unavailable" ) );
|
||||
}
|
||||
}
|
||||
|
||||
ME007_ERROR_TYPE me007_measure( float* const p_distance_cm_f32, float* const p_temperature_f32 )
|
||||
{
|
||||
ME007_SERIAL_RECEIVE_TYPE state_e = ME007_SERIAL_RECEIVE_TYPE_SOF; /**< @details Always start trying to receive SOF */
|
||||
uint8_t buffer_vu8[ME007_SERIAL_FRAME_SIZE] = {0U};
|
||||
uint8_t buffer_idx_u8 = 0U;
|
||||
uint8_t data_byte_u8 = 0U;
|
||||
uint32_t timestamp_ms_u32 = 0U;
|
||||
|
||||
if ( ( nullptr != p_distance_cm_f32 )
|
||||
&& ( nullptr != p_temperature_f32 )
|
||||
&& ( nullptr != gp_serial_if ) )
|
||||
{
|
||||
/* Trigger new sensor measurement */
|
||||
digitalWrite( me007_data_s.pin_trig_u8, LOW );
|
||||
timestamp_ms_u32 = millis(); /**< @details Store trigger time */
|
||||
DEBUG_SENSOR_LOG( PSTR( ME007_DEBUG_MSG_TAG "Sensor reading triggered" ) );
|
||||
delay( ME007_TRIG_SIG_DURATION_MS ); /**< @details Wait 1ms to give the oin time to go low */
|
||||
digitalWrite( me007_data_s.pin_trig_u8, HIGH );
|
||||
|
||||
/* Give sensor some time to take a measurement and send the result */
|
||||
/* Max. wait time should be T2max + T3max = 61 ms (see https://wiki.dfrobot.com/Water-proof%20Ultrasonic%20Sensor%20(ULS)%20%20SKU:%20SEN0300, section "Serial Output" for details) */
|
||||
while ( ( timestamp_ms_u32 + ME007_SERIAL_MAX_WAIT_TIME ) >= millis() )
|
||||
{
|
||||
if ( 0U < gp_serial_if->available() )
|
||||
{
|
||||
/* Read 1 byte of data */
|
||||
data_byte_u8 = gp_serial_if->read();
|
||||
|
||||
DEBUG_SENSOR_LOG( PSTR( ME007_DEBUG_MSG_TAG "Serial: Byte received: 0x%x" ), data_byte_u8 );
|
||||
|
||||
/* Serial Data Frame Layout
|
||||
+──────────────────+─────────────────────+────────────────────+────────────────────────+───────────────────────+────────────+
|
||||
| Frame Header ID | Distance Data High | Distance Data Low | Temperature Data High | Temperature Data Low | Checksum |
|
||||
+──────────────────+─────────────────────+────────────────────+────────────────────────+───────────────────────+────────────+
|
||||
| 0xFF | Data_H | Data_L | Temp_H | Temp_L | SUM |
|
||||
+──────────────────+─────────────────────+────────────────────+────────────────────────+───────────────────────+────────────+ */
|
||||
|
||||
switch ( state_e )
|
||||
{
|
||||
case ME007_SERIAL_RECEIVE_TYPE_SOF:
|
||||
if ( ME007_SERIAL_SOF == data_byte_u8 )
|
||||
{
|
||||
buffer_vu8[buffer_idx_u8++] = data_byte_u8;
|
||||
state_e = ME007_SERIAL_RECEIVE_TYPE_DATA;
|
||||
DEBUG_SENSOR_LOG( PSTR( ME007_DEBUG_MSG_TAG "(Idx: %i) Serial: SOF detected" ), buffer_idx_u8 );
|
||||
}
|
||||
break;
|
||||
|
||||
case ME007_SERIAL_RECEIVE_TYPE_DATA:
|
||||
buffer_vu8[buffer_idx_u8++] = data_byte_u8;
|
||||
DEBUG_SENSOR_LOG( PSTR( ME007_DEBUG_MSG_TAG "(Idx: %i) Receiving data: 0x%x" ), buffer_idx_u8, data_byte_u8 );
|
||||
|
||||
/* If all bytes have been received: calculate checksum and assembly date */
|
||||
if ( ME007_SERIAL_FRAME_SIZE <= buffer_idx_u8 )
|
||||
{
|
||||
/* Calculate expected checksum (only lower 8 bit shall be used) */
|
||||
uint8_t checksum_u8 = ( buffer_vu8[ME007_SERIAL_BYTE_TYPE_SOF]
|
||||
+ buffer_vu8[ME007_SERIAL_BYTE_TYPE_DIST_H]
|
||||
+ buffer_vu8[ME007_SERIAL_BYTE_TYPE_DIST_L]
|
||||
+ buffer_vu8[ME007_SERIAL_BYTE_TYPE_TEMP_H]
|
||||
+ buffer_vu8[ME007_SERIAL_BYTE_TYPE_TEMP_L] ) & 0x00FF;
|
||||
|
||||
DEBUG_SENSOR_LOG( PSTR( ME007_DEBUG_MSG_TAG "Comparing expected sum %i to checksum %i" ), checksum_u8, buffer_vu8[ME007_SERIAL_BYTE_TYPE_CHECKSUM] );
|
||||
|
||||
/* Compare expected and receive checksum */
|
||||
if ( checksum_u8 == buffer_vu8[ME007_SERIAL_BYTE_TYPE_CHECKSUM] )
|
||||
{
|
||||
/* Assemble and scale distance to cm */
|
||||
*p_distance_cm_f32 = ( ( buffer_vu8[ME007_SERIAL_BYTE_TYPE_DIST_H] << 8U ) + buffer_vu8[ME007_SERIAL_BYTE_TYPE_DIST_L] ) / 10.0F;
|
||||
|
||||
/* Apply physical sensor measurement limits */
|
||||
if ( ME007_MIN_SENSOR_DISTANCE > *p_distance_cm_f32 )
|
||||
{
|
||||
*p_distance_cm_f32 = 0.0F;
|
||||
}
|
||||
else if ( ME007_MAX_SENSOR_DISTANCE < *p_distance_cm_f32 )
|
||||
{
|
||||
*p_distance_cm_f32 = ME007_MAX_SENSOR_DISTANCE;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Ok: Measurement is within the physical sensor measurement limits */
|
||||
}
|
||||
|
||||
/* Assemble and scale temperature °C */
|
||||
/* Check sign-bit (MSB) */
|
||||
if ( 0x80 == ( buffer_vu8[ME007_SERIAL_BYTE_TYPE_TEMP_H] & 0x80 ) )
|
||||
{
|
||||
buffer_vu8[2U] ^= 0x80;
|
||||
}
|
||||
|
||||
*p_temperature_f32 = ( ( buffer_vu8[ME007_SERIAL_BYTE_TYPE_TEMP_H] << 8U ) + buffer_vu8[ME007_SERIAL_BYTE_TYPE_TEMP_L] ) / 10.0F;
|
||||
|
||||
DEBUG_SENSOR_LOG( PSTR( ME007_DEBUG_MSG_TAG "Distance: %s cm, Temperature: %s °C" ),
|
||||
String( *p_distance_cm_f32, 1U ).c_str(),
|
||||
String( *p_temperature_f32, 1U ).c_str() );
|
||||
|
||||
/* All ok: Measurement valid */
|
||||
DEBUG_SENSOR_LOG( PSTR( ME007_DEBUG_MSG_TAG "Measurement valid" ) );
|
||||
return ME007_ERROR_TYPE_NONE;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Checksum nok: Measurement invalid */
|
||||
DEBUG_SENSOR_LOG( PSTR( ME007_DEBUG_MSG_TAG "Checksum nok: Measurement invalid" ) );
|
||||
return ME007_ERROR_TYPE_CRC;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default: /* Should never happen */
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Timeout: Measurement invalid */
|
||||
DEBUG_SENSOR_LOG( PSTR( ME007_DEBUG_MSG_TAG "Timeout: Measurement invalid" ) );
|
||||
return ME007_ERROR_TYPE_TIMEOUT;
|
||||
}
|
||||
|
||||
#ifdef ME007_ENABLE_MEDIAN_FILTER
|
||||
void me007_sort_asc( float* const p_list, const uint8_t size_u8 )
|
||||
{
|
||||
if( NULL != p_list )
|
||||
{
|
||||
for( uint8_t idx_u8 = 0U; idx_u8 < size_u8; ++idx_u8 )
|
||||
{
|
||||
for( uint8_t idy_u8 = ( idx_u8 + 1U ); idy_u8 < size_u8; ++idy_u8 )
|
||||
{
|
||||
if( p_list[idx_u8] > p_list[idy_u8] )
|
||||
{
|
||||
float tmp_f32 = p_list[idx_u8];
|
||||
p_list[idx_u8] = p_list[idy_u8];
|
||||
p_list[idy_u8] = tmp_f32;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void me007_read_value( void )
|
||||
{
|
||||
float distance_cm_f32 = 0.0F;
|
||||
#ifdef ME007_ENABLE_MEDIAN_FILTER
|
||||
float distance_buffer_vf32[ME007_MEDIAN_FILTER_SIZE] = {0.0F};
|
||||
#endif
|
||||
|
||||
/* Record some sensor measurements */
|
||||
#ifdef ME007_ENABLE_MEDIAN_FILTER
|
||||
for ( uint8_t idx_u8 = 0U; idx_u8 < ME007_MEDIAN_FILTER_SIZE; ++idx_u8 )
|
||||
{
|
||||
#endif
|
||||
ME007_ERROR_TYPE status_e = me007_measure( &distance_cm_f32,
|
||||
&me007_data_s.temperature_deg_f32 );
|
||||
|
||||
switch ( status_e )
|
||||
{
|
||||
case ME007_ERROR_TYPE_NONE:
|
||||
|
||||
#ifdef ME007_ENABLE_MEDIAN_FILTER
|
||||
/* Store valid distance measurement into histogram buffer */
|
||||
distance_buffer_vf32[idx_u8] = distance_cm_f32;
|
||||
#else
|
||||
me007_data_s.distance_cm_f32 = distance_cm_f32;
|
||||
#endif
|
||||
|
||||
if ( 0U < me007_data_s.error_cnt_current_u8 )
|
||||
{
|
||||
me007_data_s.error_cnt_current_u8--; /* Decrease current measurement errors by one */
|
||||
}
|
||||
break;
|
||||
|
||||
case ME007_ERROR_TYPE_CRC:
|
||||
case ME007_ERROR_TYPE_TIMEOUT:
|
||||
me007_data_s.error_cnt_current_u8++; /* Increase current measurement errors by one */
|
||||
me007_data_s.error_cnt_total_u16++; /* Store total number of measurement errors */
|
||||
break;
|
||||
|
||||
default: /* Should never happen */
|
||||
break;
|
||||
}
|
||||
|
||||
/* Check error counter and only print message to error log (for now)
|
||||
in case error was present for at least ME007_SENSOR_NUM_ERROR cycles.
|
||||
For some reason, the checksum check fails quite ofter and because
|
||||
of that it wouldn't make sense to deactivate ME007 in case
|
||||
ME007_SENSOR_NUM_ERROR is exceeded. */
|
||||
if ( ME007_SENSOR_NUM_ERROR <= me007_data_s.error_cnt_current_u8 )
|
||||
{
|
||||
AddLog( LOG_LEVEL_ERROR, PSTR( ME007_DEBUG_MSG_TAG "Error @ counter: %i" ), me007_data_s.error_cnt_current_u8 );
|
||||
}
|
||||
|
||||
DEBUG_SENSOR_LOG( PSTR( ME007_DEBUG_MSG_TAG "Error counter: Current: %i, Total: %i" ),
|
||||
me007_data_s.error_cnt_current_u8,
|
||||
me007_data_s.error_cnt_total_u16 );
|
||||
|
||||
/* Add small delay between measurement */
|
||||
if ( ( ME007_MEDIAN_FILTER_SIZE - 1U ) > idx_u8 )
|
||||
{
|
||||
delay( ME007_MEDIAN_FILTER_MEASURE_DELAY );
|
||||
}
|
||||
#ifdef ME007_ENABLE_MEDIAN_FILTER
|
||||
}
|
||||
|
||||
/* Sort median filter buffer and assign median value to current distance measurement */
|
||||
me007_sort_asc( distance_buffer_vf32, ME007_MEDIAN_FILTER_SIZE );
|
||||
|
||||
/* Update distance measurement */
|
||||
me007_data_s.distance_cm_f32 = distance_buffer_vf32[ME007_MEDIAN_FILTER_MEDIAN_IDX];
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
void me007_show( const ME007_SHOW_TYPE type_e )
|
||||
{
|
||||
switch ( type_e )
|
||||
{
|
||||
case ME007_SHOW_TYPE_JS:
|
||||
ResponseAppend_P( PSTR( ",\"" ME007_WS_MQTT_MSG_TAG "\":{\"" D_JSON_DISTANCE "\":%1_f,\"" D_JSON_TEMPERATURE "\":%1_f,\"" ME007_SENSOR_ERROR_CNT_CURRENT_TAG "\":%i,\"" ME007_SENSOR_ERROR_CNT_TOTAL_TAG "\":%i,\"" ME007_SENSOR_VERSION_TAG "\":\"" ME007_VERSION "\"}" ),
|
||||
&me007_data_s.distance_cm_f32,
|
||||
&me007_data_s.temperature_deg_f32,
|
||||
me007_data_s.error_cnt_current_u8,
|
||||
me007_data_s.error_cnt_total_u16 );
|
||||
#ifdef USE_DOMOTICZ
|
||||
if ( 0U == TasmotaGlobal.tele_period )
|
||||
{
|
||||
DomoticzFloatSensor( DZ_COUNT, me007_data_s.distance_cm_f32 ); /**< @details Send distance as Domoticz counter value */
|
||||
DomoticzFloatSensor( DZ_TEMP, me007_data_s.temperature_deg_f32 ); /**< @details Send distance as Domoticz temperature value */
|
||||
}
|
||||
#endif /* USE_DOMOTICZ */
|
||||
break;
|
||||
#ifdef USE_WEBSERVER
|
||||
case ME007_SHOW_TYPE_WS:
|
||||
WSContentSend_PD( HTTP_SNS_F_DISTANCE_CM,
|
||||
ME007_WS_MQTT_MSG_TAG,
|
||||
&me007_data_s.distance_cm_f32 );
|
||||
|
||||
WSContentSend_PD( HTTP_SNS_F_TEMP,
|
||||
ME007_WS_MQTT_MSG_TAG,
|
||||
Settings->flag2.temperature_resolution,
|
||||
&me007_data_s.temperature_deg_f32 );
|
||||
break;
|
||||
#endif /* USE_WEBSERVER */
|
||||
|
||||
default: /* Should never happen */
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*********************************************************************************************\
|
||||
* Interface
|
||||
\*********************************************************************************************/
|
||||
|
||||
bool Xsns23( uint32_t function )
|
||||
{
|
||||
bool result_b = false;
|
||||
|
||||
switch ( function )
|
||||
{
|
||||
case FUNC_INIT:
|
||||
me007_init();
|
||||
break;
|
||||
|
||||
case FUNC_EVERY_SECOND:
|
||||
if ( ME007_STATE_DETECTED == me007_data_s.state_e )
|
||||
{
|
||||
me007_read_value();
|
||||
result_b = true;
|
||||
}
|
||||
break;
|
||||
|
||||
case FUNC_JSON_APPEND:
|
||||
if ( ME007_STATE_DETECTED == me007_data_s.state_e )
|
||||
{
|
||||
me007_show( ME007_SHOW_TYPE_JS );
|
||||
}
|
||||
break;
|
||||
|
||||
#ifdef USE_WEBSERVER
|
||||
case FUNC_WEB_SENSOR:
|
||||
if ( ME007_STATE_DETECTED == me007_data_s.state_e )
|
||||
{
|
||||
me007_show( ME007_SHOW_TYPE_WS );
|
||||
}
|
||||
break;
|
||||
#endif // USE_WEBSERVER
|
||||
}
|
||||
return result_b;
|
||||
}
|
||||
|
||||
#endif // USE_ME007
|
||||
|
|
@ -288,7 +288,7 @@ a_features = [[
|
|||
],[
|
||||
"USE_SGP40","USE_LUXV30B","USE_CANSNIFFER","USE_QMC5883L",
|
||||
"USE_MODBUS_ENERGY","USE_SHELLY_PRO","USE_DALI","USE_BP1658CJ",
|
||||
"USE_DINGTIAN_RELAY","USE_HMC5883L","USE_LD2410","",
|
||||
"USE_DINGTIAN_RELAY","USE_HMC5883L","USE_LD2410","USE_ME007",
|
||||
"","","","",
|
||||
"","","","",
|
||||
"","","","",
|
||||
|
|
|
|||
|
|
@ -82,6 +82,8 @@ SBR_TX = GPIO_SBR_TX
|
|||
SBR_RX = GPIO_SBR_RX
|
||||
SR04_TRIG = GPIO_SR04_TRIG
|
||||
SR04_ECHO = GPIO_SR04_ECHO
|
||||
ME007_TRIG = GPIO_ME007_TRIG
|
||||
ME007_RX = GPIO_ME007_RX
|
||||
SDM120_TX = GPIO_SDM120_TX
|
||||
SDM120_RX = GPIO_SDM120_RX
|
||||
SDM630_TX = GPIO_SDM630_TX
|
||||
|
|
|
|||
Loading…
Reference in New Issue