jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 10:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes proposed by Theo on PR.

Browse Source
This commit is contained in:
RaphDaMan 2021-03-21 16:16:11 +01:00 committed by Raphael
parent 3cf5609ad9
commit d8e892a0de
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasmota/i18n.h
View File

@ -211,8 +211,8 @@
#define D_JSON_IMPORT "Import"
#define D_JSON_EXPORT "Export"
#define D_JSON_TOTAL_ACTIVE "TotalActive"
#define D_JSON_SIGNALSTRENGTH "Signal Strength"
#define D_JSON_CHIPTEMPERATURE "Chip Temperature"
#define D_JSON_SIGNALSTRENGTH "SignalStrength"
#define D_JSON_CHIPTEMPERATURE "ChipTemperature"
#define D_RSLT_ENERGY "ENERGY"
#define D_RSLT_HASS_STATE "HASS_STATE"

16
tasmota/xsns_88_tfminiplus.ino
View File

@ -92,12 +92,7 @@ struct xsns_88_tfminiplus
} tfminiplus_sensor;
// Software and hardware serial pointers
#ifdef ESP8266
TasmotaSerial *TfmpSerial = nullptr;
#endif // ESP8266
#ifdef ESP32
HardwareSerial *TfmpSerial = nullptr;
#endif // ESP32
void TfmpInit(void)
{
@ -105,7 +100,6 @@ void TfmpInit(void)
{
if (PinUsed(GPIO_TFMINIPLUS_RX) && PinUsed(GPIO_TFMINIPLUS_TX))
{
#ifdef ESP8266
TfmpSerial = new TasmotaSerial(Pin(GPIO_TFMINIPLUS_RX), Pin(GPIO_TFMINIPLUS_TX), 1);
if (TfmpSerial->begin(BAUDRATE))
{
@ -116,12 +110,6 @@ void TfmpInit(void)
tfminiplus_sensor.ready = true;
TfmpSerial->flush();
}
#endif // ESP8266
#ifdef ESP32
TfmpSerial = new HardwareSerial(2);
TfmpSerial->begin(BAUDRATE, SERIAL_8N1, Pin(GPIO_TFMINIPLUS_RX), Pin(GPIO_TFMINIPLUS_TX));
TfmpSerial->flush();
#endif // ESP32
}
}
}
@ -170,7 +158,7 @@ void TfmpProcessSerialData (void)
while (TfmpSerial->available() > 0)
{
data = TfmpSerial->read();
dataReady = addData((char)data);
dataReady = TfmpAddData((char)data);
if (dataReady)
{
TfmpProcessData();
@ -179,7 +167,7 @@ void TfmpProcessSerialData (void)
}
}
bool addData(char nextChar)
bool TfmpAddData(char nextChar)
{
// Buffer position
static uint8_t currentIndex = 0;