From d4f444a85af216ffc0cc1cb8c22fc92685a0b265 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Wed, 25 Aug 2021 17:25:11 +0200 Subject: [PATCH] Add support for Hydreon RG-15 Solid State Rain sensor Add support for Hydreon RG-15 Solid State Rain sensor (#12974) --- CHANGELOG.md | 1 + RELEASENOTES.md | 1 + tasmota/language/af_AF.h | 4 ++-- tasmota/language/bg_BG.h | 4 ++-- tasmota/language/cs_CZ.h | 4 ++-- tasmota/language/de_DE.h | 4 ++-- tasmota/language/el_GR.h | 4 ++-- tasmota/language/en_GB.h | 4 ++-- tasmota/language/es_ES.h | 4 ++-- tasmota/language/fr_FR.h | 4 ++-- tasmota/language/fy_NL.h | 4 ++-- tasmota/language/he_HE.h | 4 ++-- tasmota/language/hu_HU.h | 4 ++-- tasmota/language/it_IT.h | 4 ++-- tasmota/language/ko_KO.h | 4 ++-- tasmota/language/nl_NL.h | 4 ++-- tasmota/language/pl_PL.h | 4 ++-- tasmota/language/pt_BR.h | 4 ++-- tasmota/language/pt_PT.h | 4 ++-- tasmota/language/ro_RO.h | 4 ++-- tasmota/language/ru_RU.h | 4 ++-- tasmota/language/sk_SK.h | 4 ++-- tasmota/language/sv_SE.h | 4 ++-- tasmota/language/tr_TR.h | 4 ++-- tasmota/language/uk_UA.h | 4 ++-- tasmota/language/vi_VN.h | 4 ++-- tasmota/language/zh_CN.h | 4 ++-- tasmota/language/zh_TW.h | 4 ++-- tasmota/my_user_config.h | 1 + tasmota/support_features.ino | 5 +++-- tasmota/tasmota_configurations.h | 1 + tasmota/tasmota_configurations_ESP32.h | 1 + tasmota/tasmota_template.h | 6 +++--- tasmota/xsns_90_hrg15.ino | 6 +++--- tools/decode-status.py | 4 ++-- 35 files changed, 68 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6317047c5..a6c34906a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. - Support for IEM3155 Wattmeter (#12940) - Berry support for vararg - Command ``Subscribe2 ...`` to subscribe to a MQTT topic without appended "/#" (#12858) +- Support for Hydreon RG-15 Solid State Rain sensor (#12974) ### Changed - Shelly EM template needs to use GPIO ADE7953_IRQ_2 diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 73091dd66..4af686e81 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -122,6 +122,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo - Inital support for Wi-Fi extender [#12784](https://github.com/arendst/Tasmota/issues/12784) - Command ``Subscribe2 ...`` to subscribe to a MQTT topic without appended "/#" [#12858](https://github.com/arendst/Tasmota/issues/12858) - Support for IEM3155 Wattmeter [#12940](https://github.com/arendst/Tasmota/issues/12940) +- Support for Hydreon RG-15 Solid State Rain sensor [#12974](https://github.com/arendst/Tasmota/issues/12974) ### Changed - Move firmware binaries to https://github.com/arendst/Tasmota-firmware/tree/main/release-firmware diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h index 3de656a31..18d3fd4b8 100644 --- a/tasmota/language/af_AF.h +++ b/tasmota/language/af_AF.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h index a48eb1002..6b256c80c 100644 --- a/tasmota/language/bg_BG.h +++ b/tasmota/language/bg_BG.h @@ -835,8 +835,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h index 132db487a..c37b21952 100644 --- a/tasmota/language/cs_CZ.h +++ b/tasmota/language/cs_CZ.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h index 625354541..29ab0818d 100644 --- a/tasmota/language/de_DE.h +++ b/tasmota/language/de_DE.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h index 9ce804712..e49a964ea 100644 --- a/tasmota/language/el_GR.h +++ b/tasmota/language/el_GR.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h index daa138c52..ba6b11cd0 100644 --- a/tasmota/language/en_GB.h +++ b/tasmota/language/en_GB.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h index 4c62fdb4b..d41a70ac1 100644 --- a/tasmota/language/es_ES.h +++ b/tasmota/language/es_ES.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h index 2a6ee9205..ec04ab26b 100644 --- a/tasmota/language/fr_FR.h +++ b/tasmota/language/fr_FR.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h index 466f5d019..7b2e0b366 100644 --- a/tasmota/language/fy_NL.h +++ b/tasmota/language/fy_NL.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h index ef070a454..68f324a8c 100644 --- a/tasmota/language/he_HE.h +++ b/tasmota/language/he_HE.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h index 40dd559c3..7455ee7f6 100644 --- a/tasmota/language/hu_HU.h +++ b/tasmota/language/hu_HU.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h index 1dcb99651..7fe20f02d 100644 --- a/tasmota/language/it_IT.h +++ b/tasmota/language/it_IT.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "Effetto hall" #define D_SENSOR_EPD_DATA "EPD - Dati" #define D_SENSOR_MCP2515_CS "MCP2515 - CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h index 0e0ba113e..86f9c0ea3 100644 --- a/tasmota/language/ko_KO.h +++ b/tasmota/language/ko_KO.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h index ca755b4aa..46243e5e7 100644 --- a/tasmota/language/nl_NL.h +++ b/tasmota/language/nl_NL.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h index af637038c..7d2ccf154 100644 --- a/tasmota/language/pl_PL.h +++ b/tasmota/language/pl_PL.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "Efekt Halla" #define D_SENSOR_EPD_DATA "EPD Dane" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h index e1054caf0..ed2812cc8 100644 --- a/tasmota/language/pt_BR.h +++ b/tasmota/language/pt_BR.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "Efeito Hall" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h index 6cc66ce12..4853fdd0a 100644 --- a/tasmota/language/pt_PT.h +++ b/tasmota/language/pt_PT.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "Efeito Hall" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h index 8b7bc46cd..88f9a99f9 100644 --- a/tasmota/language/ro_RO.h +++ b/tasmota/language/ro_RO.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h index b4167028e..6642506b1 100644 --- a/tasmota/language/ru_RU.h +++ b/tasmota/language/ru_RU.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "А" diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h index 50b299796..7cbb51d2f 100644 --- a/tasmota/language/sk_SK.h +++ b/tasmota/language/sk_SK.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h index 03d2537b5..9de80ed08 100644 --- a/tasmota/language/sv_SE.h +++ b/tasmota/language/sv_SE.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h index 6d53258de..6f236ed7f 100644 --- a/tasmota/language/tr_TR.h +++ b/tasmota/language/tr_TR.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h index 5a21b20a9..68181966b 100644 --- a/tasmota/language/uk_UA.h +++ b/tasmota/language/uk_UA.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "А" diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h index c36fb29b1..11a35daea 100644 --- a/tasmota/language/vi_VN.h +++ b/tasmota/language/vi_VN.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h index 97533a1c2..3d6475d37 100644 --- a/tasmota/language/zh_CN.h +++ b/tasmota/language/zh_CN.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h index f7b4437f7..08ac66206 100644 --- a/tasmota/language/zh_TW.h +++ b/tasmota/language/zh_TW.h @@ -836,8 +836,8 @@ #define D_SENSOR_HALLEFFECT "HallEffect" #define D_SENSOR_EPD_DATA "EPD Data" #define D_SENSOR_MCP2515_CS "MCP2515 CS" -#define D_SENSOR_HRG15_RX "HRG15 RX" -#define D_SENSOR_HRG15_TX "HRG15 TX" +#define D_SENSOR_HRG15_RX "HRG15 Rx" +#define D_SENSOR_HRG15_TX "HRG15 Tx" // Units #define D_UNIT_AMPERE "安培" diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 1dbb347cb..bb6a5a45d 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -743,6 +743,7 @@ //#define USE_AS608 // Add support for AS608 optical and R503 capacitive fingerprint sensor (+3k code) // #define USE_AS608_MESSAGES // Add verbose error messages (+0k4 code) //#define USE_TFMINIPLUS // Add support for TFmini Plus (TFmini, TFmini-S) LiDAR modules via UART interface (+0k8) +//#define USE_HRG15 // Add support for Hydreon RG-15 Solid State Rain sensor (+1k5 code) // -- Power monitoring sensors -------------------- #define USE_ENERGY_SENSOR // Add support for Energy Monitors (+14k code) diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino index ec5bc7bdd..68008637c 100644 --- a/tasmota/support_features.ino +++ b/tasmota/support_features.ino @@ -762,8 +762,9 @@ void ResponseAppendFeatures(void) #ifdef USE_INFLUXDB feature8 |= 0x00000800; // xdrv_59_influxdb.ino #endif - -// feature8 |= 0x00001000; +#ifdef USE_HRG15 + feature8 |= 0x00001000; // xsns_90_hrg15.ino +#endif // feature8 |= 0x00002000; // feature8 |= 0x00004000; // feature8 |= 0x00008000; diff --git a/tasmota/tasmota_configurations.h b/tasmota/tasmota_configurations.h index 6530cdbc3..bdcb005cc 100644 --- a/tasmota/tasmota_configurations.h +++ b/tasmota/tasmota_configurations.h @@ -188,6 +188,7 @@ // #define USE_PROJECTOR_CTRL_OPTOMA // Use codes for OPTOMA //#define USE_AS608 // Add support for AS608 optical and R503 capacitive fingerprint sensor (+3k4 code) //#define USE_TFMINIPLUS // Add suppoer for TFmini Plus (TFmini, TFmini-S) LiDAR modules via UART interface +//#define USE_HRG15 // Add support for Hydreon RG-15 Solid State Rain sensor (+1k5 code) #define USE_ENERGY_SENSOR // Add energy sensors (-14k code) #define USE_PZEM004T // Add support for PZEM004T Energy monitor (+2k code) diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h index 5f944082d..c25f42de9 100644 --- a/tasmota/tasmota_configurations_ESP32.h +++ b/tasmota/tasmota_configurations_ESP32.h @@ -476,6 +476,7 @@ // #define USE_PROJECTOR_CTRL_OPTOMA // Use codes for OPTOMA //#define USE_AS608 // Add support for AS608 optical and R503 capacitive fingerprint sensor (+3k4 code) //#define USE_TFMINIPLUS // Add support for TFmini Plus (TFmini, TFmini-S) LiDAR modules via UART interface +//#define USE_HRG15 // Add support for Hydreon RG-15 Solid State Rain sensor (+1k5 code) #define USE_ENERGY_SENSOR // Add energy sensors (-14k code) #define USE_PZEM004T // Add support for PZEM004T Energy monitor (+2k code) diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h index 94e7f6f2d..acede8653 100644 --- a/tasmota/tasmota_template.h +++ b/tasmota/tasmota_template.h @@ -170,7 +170,7 @@ enum UserSelectablePins { GPIO_I2S_IN_DATA, GPIO_I2S_IN_CLK, GPIO_I2S_IN_SLCT, GPIO_INTERRUPT, GPIO_MCP2515_CS, // MCP2515 Chip Select - GPIO_HRG15_RX, GPIO_HRG15_TX, // Hydreon RG-15 rain sensor serial interface + GPIO_HRG15_TX, GPIO_HRG15_RX, // Hydreon RG-15 rain sensor serial interface GPIO_SENSOR_END }; enum ProgramSelectablePins { @@ -361,7 +361,7 @@ const char kSensorNames[] PROGMEM = D_SENSOR_I2S_IN_DATA "|" D_SENSOR_I2S_IN_CLK "|" D_SENSOR_I2S_IN_SLCT "|" D_SENSOR_INTERRUPT "|" D_SENSOR_MCP2515_CS "|" - D_SENSOR_HRG15_RX "|" D_SENSOR_HRG15_TX + D_SENSOR_HRG15_TX "|" D_SENSOR_HRG15_RX ; const char kSensorNamesFixed[] PROGMEM = @@ -794,8 +794,8 @@ const uint16_t kGpioNiceList[] PROGMEM = { AGPIO(GPIO_AS608_RX), #endif #ifdef USE_HRG15 - AGPIO(GPIO_HRG15_RX), AGPIO(GPIO_HRG15_TX), + AGPIO(GPIO_HRG15_RX), #endif /*-------------------------------------------------------------------------------------------*\ diff --git a/tasmota/xsns_90_hrg15.ino b/tasmota/xsns_90_hrg15.ino index adf7461c0..f7ba63721 100644 --- a/tasmota/xsns_90_hrg15.ino +++ b/tasmota/xsns_90_hrg15.ino @@ -1,7 +1,7 @@ /* xsns_90-hrg15.ino - Hydreon RG-15 support for Tasmota - Copyright (c) 2021 Wouter Breukink + Copyright (c) 2021 Wouter Breukink 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 @@ -93,7 +93,7 @@ bool Rg15Poll(void) { while (HydreonSerial->available()) { Rg15ReadLine(rg15_buffer); AddLog(LOG_LEVEL_DEBUG_MORE,PSTR("%s:" D_JSON_SERIALRECEIVED " = %s"),"HRG", rg15_buffer); - + Rg15Process(rg15_buffer); } @@ -127,7 +127,7 @@ bool Rg15ReadLine(char* buffer) } void Rg15Process(char* buffer) { - + // Process payload, example: Acc 0.01 mm, EventAcc 2.07 mm, TotalAcc 54.85 mm, RInt 2.89 mmph Rg15.received = 1; Rg15.acc = Rg15Parse(buffer, "Acc"); diff --git a/tools/decode-status.py b/tools/decode-status.py index b2f54a711..a7c900ed9 100755 --- a/tools/decode-status.py +++ b/tools/decode-status.py @@ -256,7 +256,7 @@ a_features = [[ "USE_MPU_ACCEL","USE_TFMINIPLUS","USE_CSE7761","USE_BERRY", "USE_BM8563","USE_ENERGY_DUMMY","USE_AM2320","USE_T67XX", "USE_MCP2515","USE_TASMESH","USE_WIFI_RANGE_EXTENDER","USE_INFLUXDB", - "","","","", + "USE_HRG15","","","", "","","","", "","","","", "","","","", @@ -288,7 +288,7 @@ else: obj = json.load(fp) def StartDecode(): - print ("\n*** decode-status.py v20210812 by Theo Arends and Jacek Ziolkowski ***") + print ("\n*** decode-status.py v20210825 by Theo Arends and Jacek Ziolkowski ***") # print("Decoding\n{}".format(obj))