jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-24 11:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Included presence check, changed to XSNS_86 and hopefully solved language file conflicts.

Browse Source
This commit is contained in:
RaphDaMan 2021-03-22 21:59:36 +01:00 committed by Raphael
parent f6c50e30fa
commit 04c0b8d1d7
26 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasmota/language/af_AF.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Stroom L1+L2+L3" #define D_StL1L2L3 "Stroom L1+L2+L3"
#define D_SpL1L2L3 "Spanning L1+L2+L3/3" #define D_SpL1L2L3 "Spanning L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/bg_BG.h
View File

@ -584,7 +584,7 @@
#define D_StL1L2L3 "Ток L1+L2+L3" #define D_StL1L2L3 "Ток L1+L2+L3"
#define D_SpL1L2L3 "Напрежение L1+L2+L3/3" #define D_SpL1L2L3 "Напрежение L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/cs_CZ.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Current L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/de_DE.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Ströme L1+L2+L3" #define D_StL1L2L3 "Ströme L1+L2+L3"
#define D_SpL1L2L3 "Spannung L1+L2+L3/3" #define D_SpL1L2L3 "Spannung L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signalstärke" #define D_SIGNALSTRENGTH "Signalstärke"
#define D_CHIPTEMPERATURE "Chip Temperatur" #define D_CHIPTEMPERATURE "Chip Temperatur"

2
tasmota/language/el_GR.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Current L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/en_GB.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Current L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/es_ES.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Corriente L1+L2+L3" #define D_StL1L2L3 "Corriente L1+L2+L3"
#define D_SpL1L2L3 "Voltaje L1+L2+L3/3" #define D_SpL1L2L3 "Voltaje L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/fy_NL.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Streame L1+L2+L3" #define D_StL1L2L3 "Streame L1+L2+L3"
#define D_SpL1L2L3 "Foltaazje L1+L2+L3/3" #define D_SpL1L2L3 "Foltaazje L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/he_HE.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Current L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/hu_HU.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Áramerősség L1+L2+L3" #define D_StL1L2L3 "Áramerősség L1+L2+L3"
#define D_SpL1L2L3 "Feszültség L1+L2+L3/3" #define D_SpL1L2L3 "Feszültség L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/it_IT.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Corrente L1+L2+L3" #define D_StL1L2L3 "Corrente L1+L2+L3"
#define D_SpL1L2L3 "Tensione L1+L2+L3/3" #define D_SpL1L2L3 "Tensione L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/ko_KO.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Current L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/nl_NL.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Stroom L1+L2+L3" #define D_StL1L2L3 "Stroom L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/pl_PL.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Prąd suma" #define D_StL1L2L3 "Prąd suma"
#define D_SpL1L2L3 "Prąd średni" #define D_SpL1L2L3 "Prąd średni"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/pt_BR.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Current L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/pt_PT.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Corrente F1+F2+F3" #define D_StL1L2L3 "Corrente F1+F2+F3"
#define D_SpL1L2L3 "Tensão F1+F2+F3/3" #define D_SpL1L2L3 "Tensão F1+F2+F3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/ro_RO.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Current L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/ru_RU.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Current L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/sk_SK.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Current L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/sv_SE.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Current L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/tr_TR.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Current L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/uk_UA.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Current L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/vi_VN.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Dòng L1+L2+L3" #define D_StL1L2L3 "Dòng L1+L2+L3"
#define D_SpL1L2L3 "Điện áp L1+L2+L3/3" #define D_SpL1L2L3 "Điện áp L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/zh_CN.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Current L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

2
tasmota/language/zh_TW.h
View File

@ -585,7 +585,7 @@
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Current L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
// xsns_88_tfminiplus.ino // xsns_86_tfminiplus.ino
#define D_SIGNALSTRENGTH "Signal Strength" #define D_SIGNALSTRENGTH "Signal Strength"
#define D_CHIPTEMPERATURE "Chip Temperature" #define D_CHIPTEMPERATURE "Chip Temperature"

50
tasmota/xsns_88_tfminiplus.ino → tasmota/xsns_86_tfminiplus.ino
View File

@ -1,5 +1,5 @@
/* /*
xsns_88_tfminiplus.ino - TFmini Plus interface for Tasmota xsns_86_tfminiplus.ino - TFmini Plus interface for Tasmota
Created by Raphael Breiting on 12.11.2020. Created by Raphael Breiting on 12.11.2020.
@ -68,7 +68,7 @@
#include <TasmotaSerial.h> #include <TasmotaSerial.h>
// Define driver ID // Define driver ID
#define XSNS_88 88 #define XSNS_86 86
// Use special no wait serial driver, should be always on // Use special no wait serial driver, should be always on
#ifndef ESP32 #ifndef ESP32
@ -83,7 +83,7 @@
char Tfmp_buffer[TFMP_MAX_DATA_LEN + 1]; char Tfmp_buffer[TFMP_MAX_DATA_LEN + 1];
struct xsns_88_tfminiplus struct xsns_86_tfminiplus
{ {
bool ready = false; bool ready = false;
uint16_t distance = 0; uint16_t distance = 0;
@ -216,30 +216,34 @@ void TfmpShow(bool json)
* Interface * Interface
\*********************************************************************************************/ \*********************************************************************************************/
bool Xsns88(byte callback_id) bool Xsns86(byte callback_id)
{ {
bool result = false; bool result = false;
switch (callback_id) { if (FUNC_INIT == callback_id)
case FUNC_INIT: {
TfmpInit(); TfmpInit();
break; }
case FUNC_EVERY_SECOND: else if (TfmpSerial && tfminiplus_sensor.ready)
TfmpTrigger(); {
TfmpProcessSerialData(); switch (callback_id) {
result = true; case FUNC_EVERY_SECOND:
break; TfmpTrigger();
case FUNC_JSON_APPEND: TfmpProcessSerialData();
TfmpShow(1); result = true;
break; break;
case FUNC_JSON_APPEND:
TfmpShow(1);
break;
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER
case FUNC_WEB_SENSOR: case FUNC_WEB_SENSOR:
TfmpShow(0); TfmpShow(0);
break; break;
#endif // USE_WEBSERVER #endif // USE_WEBSERVER
case FUNC_SAVE_BEFORE_RESTART: case FUNC_SAVE_BEFORE_RESTART:
break; break;
case FUNC_COMMAND: case FUNC_COMMAND:
break; break;
}
} }
return result; return result;
} }