| ┆ %s"), device.getPower() ? PSTR(D_ON) : PSTR(D_OFF));
if (device.validDimmer() && (channels >= 1)) {
WSContentSend_P(PSTR(" 🔅 %d%%"), changeUIntScale(device.dimmer,0,254,0,100));
}
@@ -1460,6 +1524,7 @@ void ZigbeeShow(bool json)
WSContentSend_P(PSTR(" %dW"), device.mains_power);
}
}
+ WSContentSend_P(PSTR("{e}"));
}
}
From e452f85e391d5e46cdea4a7a28d50b88717dc9d7 Mon Sep 17 00:00:00 2001
From: gemu2015
Date: Thu, 17 Sep 2020 09:11:24 +0200
Subject: [PATCH 061/148] bug fixes and enhancements
---
tasmota/xdrv_10_scripter.ino | 159 ++++++++++++++++++++++++++++++-----
1 file changed, 139 insertions(+), 20 deletions(-)
diff --git a/tasmota/xdrv_10_scripter.ino b/tasmota/xdrv_10_scripter.ino
index ea8223233..32a8c2a3e 100755
--- a/tasmota/xdrv_10_scripter.ino
+++ b/tasmota/xdrv_10_scripter.ino
@@ -79,6 +79,7 @@ uint32_t DecodeLightId(uint32_t hue_id);
#undef LITTLEFS_SCRIPT_SIZE
#undef EEP_SCRIPT_SIZE
#undef USE_SCRIPT_COMPRESSION
+
#if USE_SCRIPT_FATFS==-1
#ifdef ESP32
@@ -250,9 +251,9 @@ SDClass *fsp;
#define FAT_SCRIPT_NAME "script.txt"
#endif
-#if USE_STANDARD_SPI_LIBRARY==0
-#warning ("FATFS standard spi should be used");
-#endif
+//#if USE_STANDARD_SPI_LIBRARY==0
+//#warning ("FATFS standard spi should be used");
+//#endif
#endif // USE_SCRIPT_FATFS
@@ -377,7 +378,11 @@ struct SCRIPT_MEM {
struct T_INDEX *type; // type and index pointer
struct M_FILT *mfilt;
char *glob_vnp; // var name pointer
+#ifdef SCRIPT_LARGE_VNBUFF
+ uint16_t *vnp_offset;
+#else
uint8_t *vnp_offset;
+#endif
char *glob_snp; // string vars pointer
char *scriptptr;
char *section_ptr;
@@ -511,7 +516,7 @@ char *script;
char **snp_p = snp;
uint8_t numperm = 0;
uint8_t numflt = 0;
- uint8_t count;
+ uint16_t count;
glob_script_mem.max_ssize = SCRIPT_SVARSIZE;
glob_script_mem.scriptptr = 0;
@@ -592,7 +597,7 @@ char *script;
} else {
vtypes[vars].bits.is_filter = 0;
}
- *vnp_p ++= vnames_p;
+ *vnp_p++ = vnames_p;
while (lp255) {
+ if (index > MAXVNSIZ) {
free(glob_script_mem.script_mem);
return -5;
}
@@ -760,7 +785,7 @@ char *script;
// copy string variables
char *cp1 = glob_script_mem.glob_snp;
char *sp = strings;
- for (count = 0; count=0
+ if (sel == 0) {
+ result = SD.totalBytes()/1000;
+ } else if (sel == 1) {
+ result = (SD.totalBytes() - SD.usedBytes())/1000;
+ }
+#else
+ if (sel == 0) {
+ result = FFat.totalBytes()/1000;
+ } else if (sel == 1) {
+ result = FFat.freeBytes()/1000;
+ }
+#endif // USE_SCRIPT_FATFS>=0
+#else
+ // ESP8266
+ FSInfo64 fsinfo;
+ fsp->info64(fsinfo);
+ if (sel == 0) {
+ result = fsinfo.totalBytes/1000;
+ } else if (sel == 1) {
+ result = (fsinfo.totalBytes - fsinfo.usedBytes)/1000;
+ }
+#endif // ESP32
+ return result;
+}
+
+// format number with thousand marker
+void form1000(uint32_t number, char *dp, char sc) {
+ char str[32];
+ sprintf(str, "%d", number);
+ char *sp = str;
+ uint32_t inum = strlen(sp)/3;
+ uint32_t fnum = strlen(sp)%3;
+ if (!fnum) inum--;
+ for (uint32_t count=0; count<=inum; count++) {
+ if (fnum){
+ memcpy(dp,sp,fnum);
+ dp+=fnum;
+ sp+=fnum;
+ fnum=0;
+ } else {
+ memcpy(dp,sp,3);
+ dp+=3;
+ sp+=3;
+ }
+ if (count!=inum) {
+ *dp++=sc;
+ }
+ }
+ *dp=0;
+}
+
+#endif //USE_SCRIPT_FATFS
+
#ifdef USE_SCRIPT_GLOBVARS
#define SCRIPT_UDP_BUFFER_SIZE 128
#define SCRIPT_UDP_PORT 1999
IPAddress script_udp_remote_ip;
void Script_Stop_UDP(void) {
- Script_PortUdp.flush();
- Script_PortUdp.stop();
- glob_script_mem.udp_flags.udp_connected = 0;
+ if (!glob_script_mem.udp_flags.udp_used) return;
+ if (glob_script_mem.udp_flags.udp_connected) {
+ Script_PortUdp.flush();
+ Script_PortUdp.stop();
+ glob_script_mem.udp_flags.udp_connected = 0;
+ }
}
void Script_Init_UDP() {
if (global_state.network_down) return;
+ if (!glob_script_mem.udp_flags.udp_used) return;
if (glob_script_mem.udp_flags.udp_connected) return;
if (Script_PortUdp.beginMulticast(WiFi.localIP(), IPAddress(239,255,255,250), SCRIPT_UDP_PORT)) {
@@ -898,6 +985,7 @@ void Script_Init_UDP() {
glob_script_mem.udp_flags.udp_connected = 0;
}
}
+
void Script_PollUdp(void) {
if (global_state.network_down) return;
if (!glob_script_mem.udp_flags.udp_used) return;
@@ -1546,11 +1634,18 @@ chknext:
case 'a':
#ifdef USE_ANGLE_FUNC
if (!strncmp(vname, "acos(", 5)) {
- lp=GetNumericArgument(lp + 5, OPER_EQU, &fvar, 0);
- fvar = acosf(fvar);
- lp++;
- len = 0;
- goto exit;
+ lp=GetNumericArgument(lp + 5, OPER_EQU, &fvar, 0);
+ fvar = acosf(fvar);
+ lp++;
+ len = 0;
+ goto exit;
+ }
+ if (!strncmp(vname, "abs(", 4)) {
+ lp=GetNumericArgument(lp + 4, OPER_EQU, &fvar, 0);
+ fvar = fabs(fvar);
+ lp++;
+ len = 0;
+ goto exit;
}
#endif
if (!strncmp(vname, "asc(", 4)) {
@@ -1982,6 +2077,14 @@ chknext:
len = 0;
goto exit;
}
+
+ if (!strncmp(vname, "fsi(", 4)) {
+ lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, 0);
+ fvar = get_fsinfo(fvar);
+ lp++;
+ len = 0;
+ goto exit;
+ }
#endif // USE_SCRIPT_FATFS_EXT
if (!strncmp(vname, "fl1(", 4) || !strncmp(vname, "fl2(", 4) ) {
uint8_t lknum = *(lp+2)&3;
@@ -4358,8 +4461,8 @@ const char HTTP_FORM_FILE_UPLOAD[] PROGMEM =
" "
" "
"" D_UPLOAD_STARTED " ... ";
+const char HTTP_FORM_FILE_UPGc[] PROGMEM =
+"total size: %s kB - free: %s kB ";
+
const char HTTP_FORM_SDC_DIRa[] PROGMEM =
"";
const char HTTP_FORM_SDC_DIRb[] PROGMEM =
@@ -4573,6 +4679,11 @@ void Script_FileUploadConfiguration(void) {
WSContentSend_P(HTTP_FORM_FILE_UPLOAD,D_SDCARD_DIR);
WSContentSend_P(HTTP_FORM_FILE_UPG, D_SCRIPT_UPLOAD);
#ifdef SDCARD_DIR
+ char ts[16];
+ char fs[16];
+ form1000(get_fsinfo(0), ts, '.');
+ form1000(get_fsinfo(1), fs, '.');
+ WSContentSend_P(HTTP_FORM_FILE_UPGc, ts, fs);
WSContentSend_P(HTTP_FORM_SDC_DIRa);
if (glob_script_mem.script_sd_found) {
ListDir(path, depth);
@@ -4837,6 +4948,11 @@ void ScriptSaveSettings(void) {
}
void SaveScriptEnd(void) {
+
+#ifdef USE_SCRIPT_GLOBVARS
+ Script_Stop_UDP();
+#endif //USE_SCRIPT_GLOBVARS
+
if (glob_script_mem.script_mem) {
Scripter_save_pvars();
free(glob_script_mem.script_mem);
@@ -4856,6 +4972,9 @@ void SaveScriptEnd(void) {
#endif // USE_SCRIPT_COMPRESSION
if (bitRead(Settings.rule_enabled, 0)) {
+
+
+
int16_t res = Init_Scripter();
if (res) {
AddLog_P2(LOG_LEVEL_INFO, PSTR("script init error: %d"), res);
@@ -7110,8 +7229,8 @@ bool Xdrv10(uint8_t function)
Webserver->on("/exs", HTTP_GET, ScriptExecuteUploadSuccess);
#ifdef USE_SCRIPT_FATFS
- Webserver->on("/u3", HTTP_POST,[]() { Webserver->sendHeader("Location","/u3");Webserver->send(303);}, script_upload);
- Webserver->on("/u3", HTTP_GET, ScriptFileUploadSuccess);
+ Webserver->on("/u13", HTTP_POST,[]() { Webserver->sendHeader("Location","/u13");Webserver->send(303);}, script_upload);
+ Webserver->on("/u13", HTTP_GET, ScriptFileUploadSuccess);
Webserver->on("/upl", HTTP_GET, Script_FileUploadConfiguration);
#endif //USE_SCRIPT_FATFS
break;
From 8038c2446029a3e31ab15b2e60224abfb322d798 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 17 Sep 2020 18:17:26 +0200
Subject: [PATCH 062/148] Use Tasmota stage, core 2.7.4.2
core 2.7.4.2 includes some backports from arduino / master
https://github.com/esp8266/Arduino/pull/7547
https://github.com/esp8266/Arduino/pull/7586
https://github.com/esp8266/Arduino/pull/7585
https://github.com/esp8266/Arduino/pull/7595
---
platformio_override_sample.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index ddd74a60d..188e05e7e 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -88,7 +88,7 @@ extra_scripts = ${scripts_defaults.extra_scripts}
[tasmota_stage]
; *** Esp8266 core for Arduino version Tasmota stage
platform = espressif8266@2.6.2
-platform_packages = jason2866/framework-arduinoespressif8266
+platform_packages = framework-arduinoespressif8266@https://github.com/Jason2866/Arduino.git#2.7.4.2
build_unflags = ${esp_defaults.build_unflags}
build_flags = ${esp82xx_defaults.build_flags}
From ecf9e4ea65cb1ee053ac307cc4290d0bc8a4b7a0 Mon Sep 17 00:00:00 2001
From: stefanbode
Date: Fri, 18 Sep 2020 08:31:05 +0200
Subject: [PATCH 063/148] Fix int16 overflow on large open times
---
tasmota/xdrv_27_shutter.ino | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 19e89f113..a1625c786 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -560,7 +560,7 @@ int32_t ShutterCalculatePosition(uint32_t i)
if (Shutter[i].direction != 0) {
switch (ShutterGlobal.position_mode) {
case SHT_COUNTER:
- return ((int32_t)RtcSettings.pulse_counter[i]*Shutter[i].direction*STEPS_PER_SECOND*RESOLUTION / ShutterGlobal.open_velocity_max)+Shutter[i].start_position;
+ return ((int32_t)RtcSettings.pulse_counter[i]*Shutter[i].direction*STEPS_PER_SECOND / ShutterGlobal.open_velocity_max * RESOLUTION)+Shutter[i].start_position;
break;
case SHT_TIME:
case SHT_TIME_UP_DOWN:
From aafa31ff8c2991ef99ee3898d8a1a8b4f0503435 Mon Sep 17 00:00:00 2001
From: Staars
Date: Fri, 18 Sep 2020 17:46:58 +0200
Subject: [PATCH 064/148] NRF24: add MHOC and ATC
---
tasmota/xsns_61_MI_NRF24.ino | 196 +++++++++++++++++++++--------------
1 file changed, 120 insertions(+), 76 deletions(-)
diff --git a/tasmota/xsns_61_MI_NRF24.ino b/tasmota/xsns_61_MI_NRF24.ino
index 44456a6a7..bc945ef2a 100644
--- a/tasmota/xsns_61_MI_NRF24.ino
+++ b/tasmota/xsns_61_MI_NRF24.ino
@@ -20,7 +20,8 @@
--------------------------------------------------------------------------------------------
Version yyyymmdd Action Description
--------------------------------------------------------------------------------------------
-
+ 0.9.8.0 20200918 integrate - add MHOC303, ATC-custom FW, allow lower case commands
+ ---
0.9.8.0 20200705 integrate - add YEE-RC, NLIGHT and MJYD2S, add NRFUSE
---
0.9.7.0 20200624 integrate - fix BEARSSL-decryption, remove MBEDTLS, prepare night light sensors
@@ -84,8 +85,10 @@
#define MJYD2S 8
#define YEERC 9
#define MHOC401 10
+#define MHOC303 11
+#define ATC 12
-#define MI_TYPES 10 //count this manually
+#define MI_TYPES 12 //count this manually
#define D_CMND_NRF "NRF"
@@ -121,7 +124,9 @@ const uint16_t kMINRFDeviceID[MI_TYPES]={ 0x0098, // Flora
0x03dd, // NLIGHT
0x07f6, // MJYD2S
0x0153, // yee-rc
- 0x0387 // MHO-C401
+ 0x0387, // MHO-C401
+ 0x06d3, // MHO-C303
+ 0x0a1c // ATC -> this is a fake ID
};
const char kMINRFDeviceType1[] PROGMEM = "Flora";
@@ -134,7 +139,9 @@ const char kMINRFDeviceType7[] PROGMEM = "NLIGHT";
const char kMINRFDeviceType8[] PROGMEM = "MJYD2S";
const char kMINRFDeviceType9[] PROGMEM = "YEERC";
const char kMINRFDeviceType10[] PROGMEM = "MHOC401";
-const char * kMINRFDeviceType[] PROGMEM = {kMINRFDeviceType1,kMINRFDeviceType2,kMINRFDeviceType3,kMINRFDeviceType4,kMINRFDeviceType5,kMINRFDeviceType6,kMINRFDeviceType7,kMINRFDeviceType8,kMINRFDeviceType9,kMINRFDeviceType10};
+const char kMINRFDeviceType11[] PROGMEM = "MHOC303";
+const char kMINRFDeviceType12[] PROGMEM = "ATC";
+const char * kMINRFDeviceType[] PROGMEM = {kMINRFDeviceType1,kMINRFDeviceType2,kMINRFDeviceType3,kMINRFDeviceType4,kMINRFDeviceType5,kMINRFDeviceType6,kMINRFDeviceType7,kMINRFDeviceType8,kMINRFDeviceType9,kMINRFDeviceType10,kMINRFDeviceType11,kMINRFDeviceType12};
// PDU's or different channels 37-39
const uint32_t kMINRFFloPDU[3] = {0x3eaa857d,0xef3b8730,0x71da7b46};
@@ -146,11 +153,13 @@ const uint32_t kMINRFCGGPDU[3] = {0x4760cd6e,0xdbcc0cdb,0x33048dfd};
const uint32_t kMINRFCGDPDU[3] = {0x5da0d752,0xc10c16e7,0x29c497c1};
// const uint32_t kMINRFNLIPDU[3] = {0x4760C56E,0xDBCC04DB,0x0330485FD}; //NLIGHT
const uint32_t kMINRFYRCPDU[3] = {0x216D63E2,0x5C3DD47E,0x0A5D0E96}; //yee-rc - 50 30
+const uint32_t kMINRFATCPDU[3] = {0xA6E4D00A,0xD0CDAD5A,0x8B03FB3A}; //ATC
// start-LSFR for different channels 37-39
const uint8_t kMINRFlsfrList_A[3] = {0x4b,0x17,0x23}; // Flora, LYWSD02
const uint8_t kMINRFlsfrList_B[3] = {0x21,0x72,0x43}; // MJ_HT_V1, LYWSD03, CGx
const uint8_t kMINRFlsfrList_C[3] = {0x38,0x25,0x2e}; // yee-rc
+const uint8_t kMINRFlsfrList_D[3] = {0x26,0x23,0x20}; // ATC
#pragma pack(1) // important!!
@@ -224,6 +233,15 @@ struct mjysd02_Packet_t{
uint8_t data[18];
};
+struct ATCPacket_t{
+ uint8_t MAC[6];
+ int16_t temp; //sadly this is in wrong endianess
+ uint8_t hum;
+ uint8_t batPer;
+ uint16_t batMV;
+ uint8_t frameCnt;
+};
+
union mi_bindKey_t{
struct{
uint8_t key[16];
@@ -363,7 +381,7 @@ bool MINRFinitBLE(uint8_t _mode)
MINRFchangePacketModeTo(_mode);
return true;
}
- // DEBUG_SENSOR_LOG(PSTR("MINRF chip NOT !!!! connected"));
+ // AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF chip NOT !!!! connected"));
return false;
}
@@ -406,35 +424,38 @@ bool MINRFreceivePacket(void)
MINRFswapbuf((uint8_t*)&MINRF.buffer, sizeof(MINRF.buffer) );
// MINRF_LOG_BUFFER();
- // AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: _lsfrlist: %x, chan: %u, mode: %u"),_lsfrlist[MINRF.currentChan],MINRF.currentChan, MINRF.packetMode);
+ // AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF: _lsfrlist: %x, chan: %u, mode: %u"),_lsfrlist[MINRF.currentChan],MINRF.currentChan, MINRF.packetMode);
switch (MINRF.packetMode) {
- case 0: case 7: case 8:
+ case 0: case NLIGHT: case MJYD2S:
MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), MINRF.channel[MINRF.currentChan] | 0x40); // "BEACON" mode, "NLIGHT" mode, "MJYD2S" mode
break;
- case 1: case 3:
+ case FLORA: case LYWSD02: case MHOC303:
MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_A[MINRF.currentChan]); // "flora" mode, "LYWSD02" mode
break;
- case 2: case 4: case 5: case 6: case MHOC401:
+ case MJ_HT_V1: case LYWSD03: case CGG1: case CGD1: case MHOC401:
MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_B[MINRF.currentChan]); // "MJ_HT_V1" mode, LYWSD03" mode, "CGG1" mode, "CGD1" mode
break;
- case 9:
+ case YEERC:
MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_C[MINRF.currentChan]); // "YEE-RC" mode
break;
+ case ATC:
+ MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_D[MINRF.currentChan]); // ATC
+ break;
}
- // DEBUG_SENSOR_LOG(PSTR("MINRF: LSFR:%x"),_lsfr);
+ // DEBUG_SENSOR_LOG(PSTR("NRF: LSFR:%x"),_lsfr);
// if (_lsfr>254) _lsfr=0;
}
- // DEBUG_SENSOR_LOG(PSTR("MINRF: did read FIFO"));
+ // DEBUG_SENSOR_LOG(PSTR("NRF: did read FIFO"));
return true;
}
// #ifdef DEBUG_TASMOTA_SENSOR
void MINRFshowBuffer(uint8_t (&buf)[32]){ // we use this only for the 32-byte-FIFO-buffer, so 32 is hardcoded
- // DEBUG_SENSOR_LOG(PSTR("MINRF: Buffer: %c %c %c %c %c %c %c %c"
+ // DEBUG_SENSOR_LOG(PSTR("NRF: Buffer: %c %c %c %c %c %c %c %c"
// " %c %c %c %c %c %c %c %c"
// " %c %c %c %c %c %c %c %c"
// " %c %c %c %c %c %c %c %c")
- DEBUG_SENSOR_LOG(PSTR("MINRF: Buffer: %02x %02x %02x %02x %02x %02x %02x %02x "
+ DEBUG_SENSOR_LOG(PSTR("NRF: Buffer: %02x %02x %02x %02x %02x %02x %02x %02x "
"%02x %02x %02x %02x %02x %02x %02x %02x "
"%02x %02x %02x %02x %02x %02x %02x %02x "
"%02x %02x %02x %02x %02x %02x %02x %02x ")
@@ -511,7 +532,7 @@ void MINRFhandleScan(void){
MINRFscanResult.erase(std::remove_if(MINRFscanResult.begin(),
MINRFscanResult.end(),
[&i](scan_entry_t e) {
- if(e.showedUp>2) AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: Beacon %02u: %02X%02X%02X%02X%02X%02X Cid: %04X Svc: %04X UUID: %04X"),i,e.MAC[0],e.MAC[1],e.MAC[2],e.MAC[3],e.MAC[4],e.MAC[5],e.cid,e.svc,e.uuid);
+ if(e.showedUp>2) AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF: Beacon %02u: %02X%02X%02X%02X%02X%02X Cid: %04X Svc: %04X UUID: %04X"),i,e.MAC[0],e.MAC[1],e.MAC[2],e.MAC[3],e.MAC[4],e.MAC[5],e.cid,e.svc,e.uuid);
i++;
return ((e.showedUp < 3));
}),
@@ -524,7 +545,7 @@ void MINRFhandleScan(void){
for(uint32_t i=0; i30) break;
uint32_t ADtype = _buf[i+1];
- // AddLog_P2(LOG_LEVEL_DEBUG,PSTR("MINRF: Size: %u AD: %x i:%u"), size, ADtype,i);
+ // AddLog_P2(LOG_LEVEL_DEBUG,PSTR("NRF: Size: %u AD: %x i:%u"), size, ADtype,i);
if (size+i>32+offset) size=32-i+offset-2;
if (size>30) break;
char _stemp[(size*2)];
uint32_t backupSize;
switch(ADtype){
case 0x01:
- AddLog_P2(LOG_LEVEL_DEBUG,PSTR("MINRF: Flags: %02x"), _buf[i+2]);
+ AddLog_P2(LOG_LEVEL_DEBUG,PSTR("NRF: Flags: %02x"), _buf[i+2]);
break;
case 0x02: case 0x03:
entry->uuid = _buf[i+3]*256 + _buf[i+2];
- AddLog_P2(LOG_LEVEL_DEBUG,PSTR("MINRF: UUID: %04x"), entry->uuid);
+ AddLog_P2(LOG_LEVEL_DEBUG,PSTR("NRF: UUID: %04x"), entry->uuid);
success = true;
break;
case 0x08: case 0x09:
backupSize = _buf[i+size+1];
_buf[i+size+1] = 0;
- AddLog_P2(LOG_LEVEL_DEBUG,PSTR("MINRF: Name: %s"), (char*)&_buf[i+2]);
+ AddLog_P2(LOG_LEVEL_DEBUG,PSTR("NRF: Name: %s"), (char*)&_buf[i+2]);
success = true;
_buf[i+size+1] = backupSize;
break;
case 0x0a:
- AddLog_P2(LOG_LEVEL_DEBUG,PSTR("MINRF: TxPow: %02u"), _buf[i+2]);
+ AddLog_P2(LOG_LEVEL_DEBUG,PSTR("NRF: TxPow: %02u"), _buf[i+2]);
break;
case 0xff:
entry->cid = _buf[i+3]*256 + _buf[i+2];
- AddLog_P2(LOG_LEVEL_DEBUG,PSTR("MINRF: Cid: %04x"), entry->cid);
+ AddLog_P2(LOG_LEVEL_DEBUG,PSTR("NRF: Cid: %04x"), entry->cid);
ToHex_P((unsigned char*)&_buf+i+4,size-3,_stemp,(size*2));
AddLog_P2(LOG_LEVEL_DEBUG,PSTR("%s"),_stemp);
success = true;
break;
case 0x16:
entry->svc = _buf[i+3]*256 + _buf[i+2];
- AddLog_P2(LOG_LEVEL_DEBUG,PSTR("MINRF: Svc: %04x"), entry->svc);
+ AddLog_P2(LOG_LEVEL_DEBUG,PSTR("NRF: Svc: %04x"), entry->svc);
ToHex_P((unsigned char*)&_buf+i+4,size-3,_stemp,(size*2));
AddLog_P2(LOG_LEVEL_DEBUG,PSTR("%s"),_stemp);
success = true;
@@ -712,7 +733,7 @@ int MINRFdecryptPacket(char *_buf){
br_ccm_run(&ctx, 0, output, sizeof(packet->payload.cipher));
ret = br_ccm_check_tag(&ctx, packet->payload.tag);
- AddLog_P2(LOG_LEVEL_DEBUG,PSTR("BEARSSL: Err:%i, Decrypted : %02x %02x %02x %02x %02x "), ret, output[0],output[1],output[2],output[3],output[4]);
+ AddLog_P2(LOG_LEVEL_DEBUG,PSTR("NRF: Err:%i, Decrypted : %02x %02x %02x %02x %02x "), ret, output[0],output[1],output[2],output[3],output[4]);
memcpy((uint8_t*)(packet->payload.cipher)+1,output,sizeof(packet->payload.cipher));
return ret;
}
@@ -833,6 +854,7 @@ void MINRFAddKey(char* payload){
*/
void MINRFKeyMACStringToBytes(char* _string,uint8_t _keyMAC[]) { //uppercase
uint32_t index = 0;
+ UpperCase(_string,_string);
while (index < 44) {
char c = _string[index];
uint8_t value = 0;
@@ -843,9 +865,9 @@ void MINRFKeyMACStringToBytes(char* _string,uint8_t _keyMAC[]) { //uppercase
_keyMAC[(index/2)] += value << (((index + 1) % 2) * 4);
index++;
}
- DEBUG_SENSOR_LOG(PSTR("MINRF: %s to:"),_string);
- DEBUG_SENSOR_LOG(PSTR("MINRF: key-array: %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X"),_keyMAC[0],_keyMAC[1],_keyMAC[2],_keyMAC[3],_keyMAC[4],_keyMAC[5],_keyMAC[6],_keyMAC[7],_keyMAC[8],_keyMAC[9],_keyMAC[10],_keyMAC[11],_keyMAC[12],_keyMAC[13],_keyMAC[14],_keyMAC[15]);
- DEBUG_SENSOR_LOG(PSTR("MINRF: MAC-array: %02X%02X%02X%02X%02X%02X"),_keyMAC[16],_keyMAC[17],_keyMAC[18],_keyMAC[19],_keyMAC[20],_keyMAC[21]);
+ DEBUG_SENSOR_LOG(PSTR("NRF: %s to:"),_string);
+ DEBUG_SENSOR_LOG(PSTR("NRF: key-array: %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X"),_keyMAC[0],_keyMAC[1],_keyMAC[2],_keyMAC[3],_keyMAC[4],_keyMAC[5],_keyMAC[6],_keyMAC[7],_keyMAC[8],_keyMAC[9],_keyMAC[10],_keyMAC[11],_keyMAC[12],_keyMAC[13],_keyMAC[14],_keyMAC[15]);
+ DEBUG_SENSOR_LOG(PSTR("NRF: MAC-array: %02X%02X%02X%02X%02X%02X"),_keyMAC[16],_keyMAC[17],_keyMAC[18],_keyMAC[19],_keyMAC[20],_keyMAC[21]);
}
#endif //USE_MI_DECRYPTION
/**
@@ -856,6 +878,7 @@ void MINRFKeyMACStringToBytes(char* _string,uint8_t _keyMAC[]) { //uppercase
*/
void MINRFMACStringToBytes(char* _string, uint8_t _MAC[]) { //uppercase
uint32_t index = 0;
+ UpperCase(_string,_string);
while (index < 12) {
char c = _string[index];
uint8_t value = 0;
@@ -866,7 +889,7 @@ void MINRFMACStringToBytes(char* _string, uint8_t _MAC[]) { //uppercase
_MAC[(index/2)] += value << (((index + 1) % 2) * 4);
index++;
}
- // DEBUG_SENSOR_LOG(PSTR("MINRF: %s to MAC-array: %02X%02X%02X%02X%02X%02X"),_string,_MAC[0],_MAC[1],_MAC[2],_MAC[3],_MAC[4],_MAC[5]);
+ // DEBUG_SENSOR_LOG(PSTR("NRF: %s to MAC-array: %02X%02X%02X%02X%02X%02X"),_string,_MAC[0],_MAC[1],_MAC[2],_MAC[3],_MAC[4],_MAC[5]);
}
/**
@@ -876,7 +899,7 @@ void MINRFMACStringToBytes(char* _string, uint8_t _MAC[]) { //uppercase
void MINRFcomputefirstUsedPacketMode(void){
for (uint32_t i = 0; iMI_TYPES) MINRF.firstUsedPacketMode=0;
break;
@@ -913,34 +936,37 @@ void MINRFchangePacketModeTo(uint8_t _mode) {
case 0: // normal BLE advertisement
NRF24radio.openReadingPipe(0,0x6B7D9171); // advertisement address: 0x8E89BED6 (bit-reversed -> 0x6B7D9171)
break;
- case 1: // special flora packet
+ case FLORA: // special flora packet
NRF24radio.openReadingPipe(0,kMINRFFloPDU[_nextchannel]); // 95 fe 71 20 -> flora
break;
- case 2: // special MJ_HT_V1 packet
+ case MJ_HT_V1: // special MJ_HT_V1 packet
NRF24radio.openReadingPipe(0,kMINRFMJPDU[_nextchannel]); // 95 fe 50 20 -> MJ_HT_V1
break;
- case 3: // special LYWSD02 packet
+ case LYWSD02: case MHOC303: // special LYWSD02 packet
NRF24radio.openReadingPipe(0,kMINRFL2PDU[_nextchannel]);// 95 fe 70 20 -> LYWSD02
break;
- case 4: case MHOC401: // special LYWSD03 packet, MHOC401 has the same
+ case LYWSD03: case MHOC401: // special LYWSD03 packet, MHOC401 has the same
NRF24radio.openReadingPipe(0,kMINRFL3PDU[_nextchannel]);// 95 fe 58 58 -> LYWSD03 (= encrypted data message)
break;
- case 5: // special CGG1 packet
+ case CGG1: // special CGG1 packet
NRF24radio.openReadingPipe(0,kMINRFCGGPDU[_nextchannel]); // 95 fe 50 30 -> CGG1
break;
- case 6: // special CGD1 packet
+ case CGD1: // special CGD1 packet
NRF24radio.openReadingPipe(0,kMINRFCGDPDU[_nextchannel]); // cd fd 08 0c -> CGD1
break;
- case 7: case 8:// MAC based LIGHT packet
+ case NLIGHT: case MJYD2S:// MAC based LIGHT packet
if (MIBLElights.size()==0) break;
NRF24radio.openReadingPipe(0,MIBLElights[MINRF.activeLight].PDU[_nextchannel]); // computed from MAC -> NLIGHT and MJYSD2S
MINRF.activeLight++;
break;
- case 9: // YEE-RC packet
+ case YEERC: // YEE-RC packet
NRF24radio.openReadingPipe(0,kMINRFYRCPDU[_nextchannel]);// 95 fe 50 30 -> YEE-RC
break;
+ case ATC:
+ NRF24radio.openReadingPipe(0,kMINRFATCPDU[_nextchannel]);// 10 16 1a 18 -> ATC
+ break;
}
- // DEBUG_SENSOR_LOG(PSTR("MINRF: Change Mode to %u"),_mode);
+ // DEBUG_SENSOR_LOG(PSTR("NRF: Change Mode to %u"),_mode);
MINRF.packetMode = _mode;
}
@@ -953,27 +979,27 @@ void MINRFchangePacketModeTo(uint8_t _mode) {
*/
uint32_t MINRFgetSensorSlot(uint8_t (&_MAC)[6], uint16_t _type){
- DEBUG_SENSOR_LOG(PSTR("MINRF: will test ID-type: %x"), _type);
+ DEBUG_SENSOR_LOG(PSTR("NRF: will test ID-type: %x"), _type);
bool _success = false;
for (uint32_t i=0;itype,MINRF.buffer.miBeacon.type);
+ DEBUG_SENSOR_LOG(PSTR("NRF: %u %u %u"),_slot,_sensorVec->type,MINRF.buffer.miBeacon.type);
float _tempFloat;
int decryptRet;
@@ -1082,7 +1108,7 @@ void MINRFhandleMiBeaconPacket(void){
switch(MINRF.buffer.miBeacon.type){
case 0x1:
if(MINRF.buffer.miBeacon.counter==_sensorVec->lastCnt) break;
- // AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: YEE-RC button: %u Long: %u"), MINRF.buffer.miBeacon.Btn.num, MINRF.buffer.miBeacon.Btn.longPress);
+ // AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF: YEE-RC button: %u Long: %u"), MINRF.buffer.miBeacon.Btn.num, MINRF.buffer.miBeacon.Btn.longPress);
_sensorVec->lastCnt=MINRF.buffer.miBeacon.counter;
_sensorVec->btn=MINRF.buffer.miBeacon.Btn.num + (MINRF.buffer.miBeacon.Btn.longPress/2)*6;
_sensorVec->shallSendMQTT = 1;
@@ -1154,7 +1180,7 @@ void MINRFhandleMiBeaconPacket(void){
void MINRFhandleCGD1Packet(void){ // no MiBeacon
MINRFreverseMAC(MINRF.buffer.CGDPacket.MAC);
uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.CGDPacket.MAC, 0x0576); // This must be hard-coded, no object-id in Cleargrass-packet
- DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+ DEBUG_SENSOR_LOG(PSTR("NRF: Sensor slot: %u"), _slot);
if(_slot==0xff) return;
switch (MINRF.buffer.CGDPacket.mode){
@@ -1179,7 +1205,7 @@ void MINRFhandleCGD1Packet(void){ // no MiBeacon
}
break;
default:
- DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected CGD1-packet"));
+ DEBUG_SENSOR_LOG(PSTR("NRF: unexpected CGD1-packet"));
MINRF_LOG_BUFFER(MINRF.buffer.raw);
}
}
@@ -1188,10 +1214,10 @@ void MINRFhandleNlightPacket(void){ // no MiBeacon
uint32_t offset = 6;
uint8_t _buf[32+offset];
MINRFrecalcBuffer((uint8_t*)&_buf,offset);
- // AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: NLIGHT: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6],_buf[7],_buf[8],_buf[9],_buf[10],_buf[11],_buf[12],_buf[13],_buf[14],_buf[15],_buf[16],_buf[17],_buf[18]);
+ // AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF: NLIGHT: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6],_buf[7],_buf[8],_buf[9],_buf[10],_buf[11],_buf[12],_buf[13],_buf[14],_buf[15],_buf[16],_buf[17],_buf[18]);
uint32_t _frame_PID = _buf[15]<<24 | _buf[16]<<16 | _buf[17]<<8 | _buf[18];
if(_frame_PID!=0x4030dd03) return; // invalid packet
- // AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: NLIGHT:%x"),_frame_PID);
+ // AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF: NLIGHT:%x"),_frame_PID);
uint32_t _idx = MINRF.activeLight-1;
if((millis() - MIBLElights[_idx].lastTime)<1500) return;
if(_buf[19]!=MIBLElights[_idx].lastCnt){
@@ -1199,7 +1225,7 @@ void MINRFhandleNlightPacket(void){ // no MiBeacon
MIBLElights[_idx].events++;
MIBLElights[_idx].shallSendMQTT = 1;
MIBLElights[_idx].lastTime = millis();
- AddLog_P2(LOG_LEVEL_DEBUG,PSTR("MINRF: NLIGHT %u: events: %u, Cnt:%u"), _idx,MIBLElights[_idx].events, MIBLElights[_idx].lastCnt);
+ AddLog_P2(LOG_LEVEL_DEBUG,PSTR("NRF: NLIGHT %u: events: %u, Cnt:%u"), _idx,MIBLElights[_idx].events, MIBLElights[_idx].lastCnt);
}
}
@@ -1209,20 +1235,20 @@ void MINRFhandleMJYD2SPacket(void){ // no MiBeacon
MINRFrecalcBuffer((uint8_t*)&_buf,offset);
mjysd02_Packet_t *_packet = (mjysd02_Packet_t*)&_buf;
if(_packet->PID!=0x07f6) return; // invalid packet
- // AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: MJYD2S: %02u %04x %04x %04x %02x"),_packet->payloadSize,_packet->UUID,_packet->frameCtrl,_packet->PID,_packet->frameCnt);
- // AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: PAYLOAD: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x"),_packet->data[0],_packet->data[1],_packet->data[2],_packet->data[3],_packet->data[4],_packet->data[5],_packet->data[6],_packet->data[7],_packet->data[8],_packet->data[9],_packet->data[10],_packet->data[11],_packet->data[12],_packet->data[13],_packet->data[14],_packet->data[15],_packet->data[16],_packet->data[17]);
+ // AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF: MJYD2S: %02u %04x %04x %04x %02x"),_packet->payloadSize,_packet->UUID,_packet->frameCtrl,_packet->PID,_packet->frameCnt);
+ // AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF: PAYLOAD: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x"),_packet->data[0],_packet->data[1],_packet->data[2],_packet->data[3],_packet->data[4],_packet->data[5],_packet->data[6],_packet->data[7],_packet->data[8],_packet->data[9],_packet->data[10],_packet->data[11],_packet->data[12],_packet->data[13],_packet->data[14],_packet->data[15],_packet->data[16],_packet->data[17]);
uint32_t _idx = MINRF.activeLight-1;
switch(_packet->frameCtrl){
case 0x5910:
if(_packet->frameCnt!=MIBLElights[_idx].lastCnt){
- // AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: MJYD2S after motion:%x"),_packet->frameCnt);
+ // AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF: MJYD2S after motion:%x"),_packet->frameCnt);
MIBLElights[_idx].lastCnt = _packet->frameCnt;
if(millis()-MIBLElights[_idx].lastTime>120000){
MIBLElights[_idx].eventType = 1;
MIBLElights[_idx].events++;
MIBLElights[_idx].shallSendMQTT = 1;
MIBLElights[_idx].lastTime = millis();
- AddLog_P2(LOG_LEVEL_DEBUG,PSTR("MINRF: MJYD2S secondary PIR"));
+ AddLog_P2(LOG_LEVEL_DEBUG,PSTR("NRF: MJYD2S secondary PIR"));
}
}
break;
@@ -1238,7 +1264,7 @@ void MINRFhandleMJYD2SPacket(void){ // no MiBeacon
if(millis()-MIBLElights[_idx].lastTime>1000){
MIBLElights[_idx].eventType = 1; //PIR
MIBLElights[_idx].shallSendMQTT = 1;
- AddLog_P2(LOG_LEVEL_DEBUG,PSTR("MINRF: MJYD2S primary PIR"));
+ AddLog_P2(LOG_LEVEL_DEBUG,PSTR("NRF: MJYD2S primary PIR"));
MIBLElights[_idx].events++;
}
MIBLElights[_idx].lastTime = millis();
@@ -1259,23 +1285,23 @@ void MINRFhandleMJYD2SPacket(void){ // no MiBeacon
MIBLElights[_idx].NMT = output[6]<<24 | output[5]<<16 | output[4]<<8 | output[3];
MIBLElights[_idx].eventType = 3; // NMT 0, 120, 300, 600, 1800, ... seconds
MIBLElights[_idx].shallSendMQTT = 1;
- // AddLog_P2(LOG_LEVEL_DEBUG,PSTR("MINRF: MJYD2S NMT: %u"), MIBLElights[_idx].NMT );
+ // AddLog_P2(LOG_LEVEL_DEBUG,PSTR("NRF: MJYD2S NMT: %u"), MIBLElights[_idx].NMT );
break;
}
}
}
- // AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: NLIGHT:%x"),_frame_PID);
+ // AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF: NLIGHT:%x"),_frame_PID);
}
void MINRFhandleLightPacket(void){
switch(MIBLElights[MINRF.activeLight-1].type){
case NLIGHT:
- // AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: NLIGHT!!"));
+ // AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF: NLIGHT!!"));
MINRFhandleNlightPacket();
break;
case MJYD2S:
- // AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: MJYD2S !!"));
+ // AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF: MJYD2S !!"));
MINRFhandleMJYD2SPacket();
break;
}
@@ -1285,7 +1311,7 @@ void MINRFhandleLightPacket(void){
void MINRFaddLight(uint8_t _MAC[], uint8_t _type){ // no MiBeacon
for(uint32_t i=0; iMAC, 0x0a1c); // This must be a hard-coded fake ID
+ // AddLog_P2(LOG_LEVEL_DEBUG,PSTR("known %s at slot %u"), kMINRFDeviceType[MIBLEsensors[_slot].type-1],_slot);
+ // AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF: ATC: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x"),MINRF.buffer.raw[0],MINRF.buffer.raw[1],MINRF.buffer.raw[2],MINRF.buffer.raw[3],MINRF.buffer.raw[4],MINRF.buffer.raw[5],MINRF.buffer.raw[6],MINRF.buffer.raw[7],MINRF.buffer.raw[8],MINRF.buffer.raw[9],MINRF.buffer.raw[10],MINRF.buffer.raw[11]);
+ if(_slot==0xff) return;
+
+ MIBLEsensors.at(_slot).temp = (float)(__builtin_bswap16(_packet->temp))/10.0f;
+ MIBLEsensors.at(_slot).hum = (float)_packet->hum;
+ MIBLEsensors.at(_slot).bat = _packet->batPer;
+
+ MIBLEsensors[_slot].shallSendMQTT = 1;
}
/*********************************************************************************************\
@@ -1309,14 +1349,15 @@ void MINRFaddLight(uint8_t _MAC[], uint8_t _type){ // no MiBeacon
void MINRF_EVERY_50_MSECOND() { // Every 50mseconds
if(MINRF.timer>6000){ // happens every 6000/20 = 300 seconds
- DEBUG_SENSOR_LOG(PSTR("MINRF: check for FAKE sensors"));
+ DEBUG_SENSOR_LOG(PSTR("NRF: check for FAKE sensors"));
MINRFpurgeFakeSensors();
MINRF.timer=0;
}
MINRF.timer++;
if (!MINRFreceivePacket()){
- // DEBUG_SENSOR_LOG(PSTR("MINRF: nothing received"));
+ // DEBUG_SENSOR_LOG(PSTR("NRF: nothing received"));
+ // if (MINRF.packetMode==ATC) AddLog_P2(LOG_LEVEL_INFO,PSTR("no ATC.."));
}
else {
@@ -1327,7 +1368,7 @@ void MINRF_EVERY_50_MSECOND() { // Every 50mseconds
}
else MINRFhandleScan();
break;
- case FLORA: case MJ_HT_V1: case LYWSD02: case CGG1: case LYWSD03: case YEERC: case MHOC401:
+ case FLORA: case MJ_HT_V1: case LYWSD02: case CGG1: case LYWSD03: case YEERC: case MHOC401: case MHOC303:
MINRFhandleMiBeaconPacket();
break;
case CGD1:
@@ -1336,6 +1377,9 @@ void MINRF_EVERY_50_MSECOND() { // Every 50mseconds
case NLIGHT: //case MJYD2S:
MINRFhandleLightPacket();
break;
+ case ATC:
+ MINRFhandleATCPacket();
+ break;
default:
break;
}
@@ -1534,7 +1578,7 @@ void MINRFShow(bool json)
if (json) {
for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
if(MIBLEsensors[i].showedUp < 3){
- DEBUG_SENSOR_LOG(PSTR("MINRF: sensor not fully registered yet"));
+ DEBUG_SENSOR_LOG(PSTR("NRF: sensor not fully registered yet"));
if(MIBLEsensors[i].type != YEERC) break; // send every RC code, even if there is a potentially false MAC
}
switch(MIBLEsensors[i].type){
@@ -1647,7 +1691,7 @@ void MINRFShow(bool json)
WSContentSend_PD(HTTP_NRF24NEW, NRF24type, NRF24.chipType, i+1,stemp,MINRF.confirmedSensors);
for (i ; i
Date: Fri, 18 Sep 2020 17:51:20 +0200
Subject: [PATCH 065/148] version correction
---
tasmota/xsns_61_MI_NRF24.ino | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tasmota/xsns_61_MI_NRF24.ino b/tasmota/xsns_61_MI_NRF24.ino
index bc945ef2a..e9d2841ea 100644
--- a/tasmota/xsns_61_MI_NRF24.ino
+++ b/tasmota/xsns_61_MI_NRF24.ino
@@ -20,7 +20,7 @@
--------------------------------------------------------------------------------------------
Version yyyymmdd Action Description
--------------------------------------------------------------------------------------------
- 0.9.8.0 20200918 integrate - add MHOC303, ATC-custom FW, allow lower case commands
+ 0.9.8.1 20200918 integrate - add MHOC303, ATC-custom FW, allow lower case commands
---
0.9.8.0 20200705 integrate - add YEE-RC, NLIGHT and MJYD2S, add NRFUSE
---
From f6705d6a1a91c4417ef83b1d4287ee5bbb7da2ae Mon Sep 17 00:00:00 2001
From: Federico Leoni
Date: Fri, 18 Sep 2020 18:45:20 -0300
Subject: [PATCH 066/148] Prep for official Hass Discovery
---
tasmota/xdrv_12_home_assistant.ino | 145 +++++++++++++++++++++++++----
1 file changed, 129 insertions(+), 16 deletions(-)
diff --git a/tasmota/xdrv_12_home_assistant.ino b/tasmota/xdrv_12_home_assistant.ino
index ef9d25be9..a9673eb38 100644
--- a/tasmota/xdrv_12_home_assistant.ino
+++ b/tasmota/xdrv_12_home_assistant.ino
@@ -174,6 +174,110 @@ uint8_t hass_init_step = 0;
uint8_t hass_mode = 0;
int hass_tele_period = 0;
+// NEW DISCOVERY
+
+const char HASS_DISCOVER_DEVICE[] PROGMEM = // Basic parameters for Discovery
+ "{\"ip\":\"%s\"," // IP Address
+ "\"dn\":\"%s\"," // Device Name
+ "\"fn\":[%s]," // Friendly Names
+ "\"hn\":\"%s\"," // Host Name
+ "\"mac\":\"%s\"," // Full MAC as Device id
+ "\"md\":\"%s\"," // Module Name
+ "\"ofln\":\"" D_OFFLINE "\"," // Payload Offline
+ "\"onln\":\"" D_ONLINE "\"," // Payload Online
+ "\"state\":[\"%s\",\"%s\",\"%s\",\"%s\"]," // State text for "OFF","ON","TOGGLE","HOLD"
+ "\"sw\":\"%s\"," // Software Version
+ "\"t\":\"%s\"," // Topic
+ "\"ft\":\"%s\"," // Ful Topic
+ "\"tp\":[\"%s\",\"%s\",\"%s\"]," // Topics for command, stat and tele
+ "\"rl\":[%s],\"swc\":[%s],\"btn\":[%s]," // Inputs / Outputs
+ "\"so\":{\"11\":%d,\"13\":%d,\"17\":%d,\"20\":%d," // SetOptions
+ "\"30\":%d,\"37\":%d,\"68\":%d,\"73\":%d,\"80\":%d},"
+ "\"lt_st\":%d,\"ver\":1}"; // Light SubType, and Discovery version
+
+#define D_CMND_HADIS "HaDis"
+
+const char kHAssCommand[] PROGMEM = "|" // No prefix
+ D_CMND_HADIS;
+
+void (* const HAssCommand[])(void) PROGMEM = { &CmndHaDis };
+
+void CmndHaDis(void) { // New discovery manager. Stored on E98 in settings.h
+
+ uint8_t index = XdrvMailbox.index;
+ uint8_t payload1 = XdrvMailbox.payload;
+ if (XdrvMailbox.data_len > 0 && (XdrvMailbox.payload > 0 || XdrvMailbox.payload <= 2)) {
+ if (2 == XdrvMailbox.payload) { payload1 = 0; }
+ char scmnd[20];
+ if (Settings.flag.hass_discovery != payload1) {
+ snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_SETOPTION "19 %d"), payload1);
+ ExecuteCommand(scmnd, SRC_IGNORE);
+ }
+ Settings.hass_new_discovery = XdrvMailbox.payload;
+
+ }
+ Response_P(PSTR("{\"" D_CMND_HADIS "\":\"%d\"}"), Settings.hass_new_discovery);
+}
+
+void NewHAssDiscovery(void)
+{
+ char stopic[TOPSZ];
+ char stemp1[TOPSZ];
+ char stemp2[200];
+ char stemp3[TOPSZ];
+ char stemp4[TOPSZ];
+ char stemp5[TOPSZ];
+ char unique_id[30];
+ char *state_topic = stemp1;
+
+ stemp2[0] = '\0';
+ uint32_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!devices_present) ? 1 : devices_present;
+ for (uint32_t i = 0; i < MAX_FRIENDLYNAMES; i++) {
+ char fname[TOPSZ];
+ snprintf_P(fname, sizeof(fname), PSTR("\"%s\""), EscapeJSONString(SettingsText(SET_FRIENDLYNAME1 +i)).c_str());
+ snprintf_P(stemp2, sizeof(stemp2), PSTR("%s%s%s"), stemp2, (i > 0 ? "," : ""), (i < maxfn) ? fname : "null");
+ }
+
+ stemp3[0] = '\0';
+
+ uint32_t maxrl = (devices_present > MAX_RELAYS) ? MAX_RELAYS : (!devices_present) ? 1 : devices_present;
+
+ for (uint32_t i = 0; i < MAX_RELAYS; i++) {
+ snprintf_P(stemp3, sizeof(stemp3), PSTR("%s%s%d"), stemp3, (i > 0 ? "," : ""), (i < maxfn) ? (Settings.flag.hass_light ? 2 : 1) : 0);
+ }
+
+ stemp4[0] = '\0';
+ //stemp6[0] = '\0';
+ for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+ snprintf_P(stemp4, sizeof(stemp4), PSTR("%s%s%d"), stemp4, (i > 0 ? "," : ""), PinUsed(GPIO_SWT1, i) ? Settings.switchmode[i] : -1);
+ }
+ stemp5[0] = '\0';
+ for (uint32_t i = 0; i < MAX_KEYS; i++) {
+ snprintf_P(stemp5, sizeof(stemp5), PSTR("%s%s%d"), stemp5, (i > 0 ? "," : ""), PinUsed(GPIO_KEY1, i));
+ }
+
+ mqtt_data[0] = '\0'; // Clear retained message
+
+ // Full 12 chars MAC address as ID
+ String mac_address = WiFi.macAddress();
+ mac_address.replace(":", "");
+ String mac_part = mac_address.substring(0);
+ snprintf_P(unique_id, sizeof(unique_id), PSTR("%s"), mac_address.c_str());
+
+ snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/discovery/%s/config"), unique_id);
+ GetTopic_P(state_topic, TELE, mqtt_topic, PSTR(D_RSLT_HASS_STATE));
+
+ Response_P(HASS_DISCOVER_DEVICE, WiFi.localIP().toString().c_str(), SettingsText(SET_DEVICENAME),
+ stemp2, my_hostname, unique_id, ModuleName().c_str(), GetStateText(0), GetStateText(1), GetStateText(2), GetStateText(3),
+ my_version, mqtt_topic, MQTT_FULLTOPIC, SUB_PREFIX, PUB_PREFIX, PUB_PREFIX2, stemp3, stemp4, stemp5, Settings.flag.button_swap,
+ Settings.flag.button_single, Settings.flag.decimal_text, Settings.flag.not_power_linked, Settings.flag.hass_light,
+ light_controller.isCTRGBLinked(), Settings.flag3.pwm_multi_channels, Settings.flag3.mqtt_buttons, Settings.flag3.shutter_mode, Light.subtype);
+ MqttPublish(stopic, true);
+
+}
+
+// NEW DISCOVERY
+
void TryResponseAppend_P(const char *format, ...)
{
va_list args;
@@ -364,7 +468,7 @@ void HAssAnnounceRelayLight(void)
}
}
MqttPublish(stopic, true);
- masterlog_level = 4;
+ masterlog_level = 4; // Restore WebLog state
}
}
@@ -421,7 +525,7 @@ void HAssAnnouncerTriggers(uint8_t device, uint8_t present, uint8_t key, uint8_t
}
}
MqttPublish(stopic, true);
- masterlog_level = 4;
+ masterlog_level = 4; // Restore WebLog state
}
}
@@ -472,7 +576,7 @@ void HAssAnnouncerBinSensors(uint8_t device, uint8_t present, uint8_t dual, uint
}
}
MqttPublish(stopic, true);
- masterlog_level = 4;
+ masterlog_level = 4; // Restore WebLog state
}
void HAssAnnounceSwitches(void)
@@ -784,7 +888,7 @@ void HAssAnnounceShutters(void)
}
MqttPublish(stopic, true);
- masterlog_level = 4;
+ masterlog_level = 4; // Restore WebLog state
}
#endif
}
@@ -823,7 +927,7 @@ void HAssAnnounceDeviceInfoAndStatusSensor(void)
MqttPublish(stopic, true);
if (!Settings.flag.hass_discovery) {
masterlog_level = 0;
- AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_LOG "Home Assistant Discovery disabled. "));
+ AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_LOG "Home Assistant Classic Discovery disabled."));
}
}
@@ -842,19 +946,21 @@ void HAssPublishStatus(void)
void HAssDiscovery(void)
{
// Configure Tasmota for default Home Assistant parameters to keep discovery message as short as possible
- if (Settings.flag.hass_discovery)
- { // SetOption19 - Control Home Assistant automatic discovery (See SetOption59)
- Settings.flag.mqtt_response = 0; // SetOption4 - Switch between MQTT RESULT or COMMAND - Response always as RESULT and not as uppercase command
- Settings.flag.decimal_text = 1; // SetOption17 - Switch between decimal or hexadecimal output - Respond with decimal color values
- Settings.flag3.hass_tele_on_power = 1; // SetOption59 - Send tele/%topic%/STATE in addition to stat/%topic%/RESULT - send tele/STATE message as stat/RESULT
- // the purpose of that is so that if HA is restarted, state in HA will be correct within one teleperiod otherwise state
- // will not be correct until the device state is changed this is why in the patterns for switch and light, we tell HA to trigger on STATE, not RESULT.
- //Settings.light_scheme = 0; // To just control color it needs to be Scheme 0 (on hold due to new light configuration)
+ if (Settings.flag.hass_discovery || Settings.hass_new_discovery > 0)
+ { // SetOption19 - Control Home Assistant automatic discovery (See SetOption59)
+ Settings.flag.mqtt_response = 0; // SetOption4 - Switch between MQTT RESULT or COMMAND - Response always as RESULT and not as uppercase command
+ Settings.flag.decimal_text = 1; // SetOption17 - Switch between decimal or hexadecimal output - Respond with decimal color values
+ if (Settings.hass_new_discovery == 1) { // Official Home Assistant Discovery doesn't need the /STATE topic.
+ Settings.flag3.hass_tele_on_power = 1; // SetOption59 - Send tele/%topic%/STATE in addition to stat/%topic%/RESULT - send tele/STATE message as stat/RESULT
+ // the purpose of that is so that if HA is restarted, state in HA will be correct within one teleperiod otherwise state
+ // will not be correct until the device state is changed this is why in the patterns for switch and light, we tell HA to trigger on STATE, not RESULT.
+ }
+ //Settings.light_scheme = 0; // To just control color it needs to be Scheme 0 (on hold due to new light configuration)
}
if (Settings.flag.hass_discovery || (1 == hass_mode))
{ // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
- masterlog_level = 4;
+ masterlog_level = 4; // Restore WebLog state
// Send info about buttons
HAssAnnounceButtons();
@@ -881,11 +987,12 @@ void HAssDiscover(void)
{
hass_mode = 1; // Force discovery
hass_init_step = 1; // Delayed discovery
+ Settings.hass_new_discovery = Settings.flag.hass_discovery;
}
void HAssAnyKey(void)
{
- if (!Settings.flag.hass_discovery)
+ if (!Settings.flag.hass_discovery || Settings.hass_new_discovery == 0)
{
return;
} // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
@@ -940,7 +1047,7 @@ void HassLwtSubscribe(bool hasslwt)
{
char htopic[TOPSZ];
snprintf_P(htopic, sizeof(htopic), PSTR(HOME_ASSISTANT_LWT_TOPIC));
- if (hasslwt && Settings.flag.hass_discovery) {
+ if (hasslwt && (Settings.flag.hass_discovery || Settings.hass_new_discovery == 2)) {
MqttSubscribe(htopic);
} else { MqttUnsubscribe(htopic); }
}
@@ -983,6 +1090,9 @@ bool Xdrv12(uint8_t function)
case FUNC_MQTT_INIT:
hass_mode = 0; // Discovery only if Settings.flag.hass_discovery is set
hass_init_step = 2; // Delayed discovery
+ if (!Settings.flag.hass_discovery && Settings.hass_new_discovery == 0) {
+ NewHAssDiscovery();
+ }
break;
case FUNC_MQTT_SUBSCRIBE:
@@ -991,6 +1101,9 @@ bool Xdrv12(uint8_t function)
case FUNC_MQTT_DATA:
result = HAssMqttLWT();
break;
+ case FUNC_COMMAND:
+ result = DecodeCommand(kHAssCommand, HAssCommand);
+ break;
}
}
return result;
From 4e84e331039c646ef973d8cf168da1bc69617abe Mon Sep 17 00:00:00 2001
From: Federico Leoni
Date: Fri, 18 Sep 2020 18:45:58 -0300
Subject: [PATCH 067/148] Prep for new Hass Discovery
---
tasmota/settings.h | 5 +++--
tasmota/settings.ino | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/tasmota/settings.h b/tasmota/settings.h
index 0803bcca2..0ce6b9f57 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -557,7 +557,7 @@ struct {
uint16_t dimmer_hw_min; // E90
uint16_t dimmer_hw_max; // E92
uint32_t deepsleep; // E94
- uint16_t ex2_energy_power_delta; // E98 - Free since 8.4.0.3
+ uint16_t hass_new_discovery; // E98 - ex2_energy_power_delta on 8.4.0.3, replaced on 8.5.0.1
uint8_t shutter_motordelay[MAX_SHUTTERS]; // E9A
int8_t temp_comp; // E9E
uint8_t weight_change; // E9F
@@ -613,7 +613,8 @@ struct {
uint16_t energy_power_delta[3]; // F44
uint16_t shutter_pwmrange[2][MAX_SHUTTERS]; // F4A
- uint8_t free_f5a[90]; // F5A - Decrement if adding new Setting variables just above and below
+
+ uint8_t free_f5a[89]; // F5A - Decrement if adding new Setting variables just above and below
// Only 32 bit boundary variables below
SysBitfield5 flag5; // FB4
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index 2c17cbad2..ddc5dfc2d 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -1356,7 +1356,7 @@ void SettingsDelta(void)
Settings.ex_sbaudrate = 0;
*/
Settings.flag3.fast_power_cycle_disable = 0;
- Settings.ex2_energy_power_delta = Settings.tuyamcu_topic;
+ Settings.hass_new_discovery = Settings.tuyamcu_topic; // replaced ex2_energy_power_delta on 8.5.0.1
Settings.tuyamcu_topic = 0; // replaced ex_energy_power_delta on 8.5.0.1
}
if (Settings.version < 0x06060015) {
@@ -1514,7 +1514,7 @@ void SettingsDelta(void)
Settings.fallback_module = FALLBACK_MODULE;
}
if (Settings.version < 0x08040003) {
- Settings.energy_power_delta[0] = Settings.ex2_energy_power_delta;
+ Settings.energy_power_delta[0] = Settings.hass_new_discovery; // replaced ex2_energy_power_delta on 8.5.0.1
Settings.energy_power_delta[1] = 0;
Settings.energy_power_delta[2] = 0;
}
From ee475e833a2ed02d60e734e0c40743140692663b Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 19 Sep 2020 12:30:03 +0200
Subject: [PATCH 068/148] Remove not needed, add stage core32
---
platformio_override_sample.ini | 25 +++++++++++++++----------
platformio_tasmota32.ini | 6 +++++-
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 188e05e7e..dde700a23 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -36,7 +36,6 @@ default_envs =
[common]
-platform = ${core.platform}
platform_packages = ${core.platform_packages}
build_unflags = ${core.build_unflags}
build_flags = ${core.build_flags}
@@ -74,20 +73,17 @@ extra_scripts = ${scripts_defaults.extra_scripts}
[core]
; Activate only (one set) if you want to override the standard core defined in platformio.ini !!!
-;platform = ${tasmota_stage.platform}
;platform_packages = ${tasmota_stage.platform_packages}
;build_unflags = ${tasmota_stage.build_unflags}
;build_flags = ${tasmota_stage.build_flags}
-;platform = ${core_stage.platform}
-;platform_packages = ${core_stage.platform_packages}
-;build_unflags = ${core_stage.build_unflags}
-;build_flags = ${core_stage.build_flags}
+platform_packages = ${core_stage.platform_packages}
+build_unflags = ${core_stage.build_unflags}
+build_flags = ${core_stage.build_flags}
[tasmota_stage]
; *** Esp8266 core for Arduino version Tasmota stage
-platform = espressif8266@2.6.2
platform_packages = framework-arduinoespressif8266@https://github.com/Jason2866/Arduino.git#2.7.4.2
build_unflags = ${esp_defaults.build_unflags}
build_flags = ${esp82xx_defaults.build_flags}
@@ -123,9 +119,8 @@ build_flags = ${esp82xx_defaults.build_flags}
[core_stage]
; *** Esp8266 core version. Tasmota stage or Arduino stage version. Built with GCC 10.1 toolchain
-platform = espressif8266@2.6.2
-platform_packages = framework-arduinoespressif8266 @ https://github.com/Jason2866/platform-espressif8266/releases/download/2.9.0/framework-arduinoespressif8266-3.20900.0.tar.gz
- ;framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
+platform_packages = ;framework-arduinoespressif8266 @ https://github.com/Jason2866/platform-espressif8266/releases/download/2.9.0/framework-arduinoespressif8266-3.20900.0.tar.gz
+ framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
toolchain-xtensa @ ~2.100100.0
build_unflags = ${esp_defaults.build_unflags}
-Wswitch-unreachable
@@ -160,6 +155,16 @@ build_flags = ${esp82xx_defaults.build_flags}
; -lstdc++-exc
+[core32]
+; Activate Stage Core32 by removing ";" in next line, if you want to override the standard core32
+;platform_packages = ${core32_stage.platform_packages}
+
+
+[core32_stage]
+platform_packages = tool-esptoolpy@1.20800.0
+ arduino-esp32@https://github.com/espressif/arduino-esp32.git#esp32s2
+
+
; *** Debug version used for PlatformIO Home Project Inspection
[env:tasmota-debug]
build_type = debug
diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index 739ec2338..bdd07be81 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -39,9 +39,13 @@ default_envs = ${build_envs.default_envs}
; tasmota32-UK
-[common32]
+[core32]
platform = espressif32@2.0.0
platform_packages = tool-esptoolpy@1.20800.0
+
+[common32]
+platform = ${core32.platform}
+platform_packages = ${core32.platform_packages}
board = esp32dev
board_build.ldscript = esp32_out.ld
board_build.partitions = esp32_partition_app1984k_spiffs64k.csv
From ae2e54d97b90430df19dacaf4cb627db6f7edbfe Mon Sep 17 00:00:00 2001
From: Federico Leoni
Date: Sat, 19 Sep 2020 08:26:29 -0300
Subject: [PATCH 069/148] TuyaMCU update
---
tasmota/xdrv_16_tuyamcu.ino | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tasmota/xdrv_16_tuyamcu.ino b/tasmota/xdrv_16_tuyamcu.ino
index 2c4b9e0d6..c58dc2130 100644
--- a/tasmota/xdrv_16_tuyamcu.ino
+++ b/tasmota/xdrv_16_tuyamcu.ino
@@ -444,7 +444,6 @@ bool TuyaSetChannels(void)
if (LT_RGB != light_type) {
for (uint8_t i = 0; i <= idx; i++) {
-
if (Tuya.Snapshot[i] != Tuya.Levels[i]) {
if (i == 0 && LightMode && Tuya.ModeSet ) { noupd = true;}
if (!noupd) {
@@ -457,6 +456,7 @@ bool TuyaSetChannels(void)
}
if (light_type >= LT_RGB) {
+
light_state.getHSB(&hue, &sat, &bri);
sat = changeUIntScale(sat, 0, 255, 0, 100);
bri = changeUIntScale(bri, 0, 255, 0, 100);
@@ -1114,6 +1114,7 @@ bool Xdrv16(uint8_t function)
result = TuyaButtonPressed();
break;
case FUNC_EVERY_SECOND:
+ TuyaSetChannels();
if (TuyaSerial && Tuya.wifi_state != TuyaGetTuyaWifiState()) { TuyaSetWifiLed(); }
if (!Tuya.low_power_mode) {
Tuya.heartbeat_timer++;
@@ -1131,9 +1132,9 @@ bool Xdrv16(uint8_t function)
}
if (Tuya.ignore_topic_timeout < millis()) { Tuya.SuspendTopic = false; }
break;
- case FUNC_SET_CHANNELS:
- result = TuyaSetChannels();
- break;
+ // case FUNC_SET_CHANNELS:
+ // result = TuyaSetChannels();
+ // break;
case FUNC_COMMAND:
result = DecodeCommand(kTuyaCommand, TuyaCommand);
break;
From a9af3baea0c927a5131d332688f0c41338469e09 Mon Sep 17 00:00:00 2001
From: nicandris
Date: Sat, 19 Sep 2020 13:43:14 +0200
Subject: [PATCH 070/148] Added SetOption112 - Use friendly name in zigbee
topic (use with SetOption89)
---
tasmota/settings.h | 2 +-
tasmota/xdrv_23_zigbee_2_devices.ino | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/tasmota/settings.h b/tasmota/settings.h
index 0ce6b9f57..83f6a1a17 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -131,7 +131,7 @@ typedef union { // Restricted by MISRA-C Rule 18.4 bu
uint32_t alexa_gen_1 : 1; // bit 27 (v8.4.0.3) - SetOption109 - Alexa gen1 mode - if you only have Echo Dot 2nd gen devices
uint32_t zb_disable_autobind : 1; // bit 28 (v8.5.0.1) - SetOption110 - disable Zigbee auto-config when pairing new devices
uint32_t buzzer_freq_mode : 1; // bit 29 (v8.5.0.1) - SetOption111 - Use frequency output for buzzer pin instead of on/off signal
- uint32_t spare30 : 1; // bit 30
+ uint32_t zb_topic_fname : 1; // bit 30 (v8.5.0.1) - SetOption112 - Use friendly name in zigbee topic (use with SetOption89)
uint32_t spare31 : 1; // bit 31
};
} SysBitfield4;
diff --git a/tasmota/xdrv_23_zigbee_2_devices.ino b/tasmota/xdrv_23_zigbee_2_devices.ino
index 82000b2e1..a5a3ab2f9 100644
--- a/tasmota/xdrv_23_zigbee_2_devices.ino
+++ b/tasmota/xdrv_23_zigbee_2_devices.ino
@@ -896,9 +896,15 @@ void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
attr_list.reset(); // clear the attributes
if (Settings.flag4.zigbee_distinct_topics) {
- char subtopic[16];
- snprintf_P(subtopic, sizeof(subtopic), PSTR("%04X/" D_RSLT_SENSOR), shortaddr);
- MqttPublishPrefixTopic_P(TELE, subtopic, Settings.flag.mqtt_sensor_retain);
+ if (Settings.flag4.zb_topic_fname && fname) {
+ char frtopic[13];
+ snprintf_P(frtopic, sizeof(frtopic) + strlen(fname), PSTR("tele/%s/" D_RSLT_SENSOR), fname);
+ MqttPublish(frtopic, Settings.flag.mqtt_sensor_retain);
+ } else {
+ char subtopic[16];
+ snprintf_P(subtopic, sizeof(subtopic), PSTR("%04X/" D_RSLT_SENSOR), shortaddr);
+ MqttPublishPrefixTopic_P(TELE, subtopic, Settings.flag.mqtt_sensor_retain);
+ }
} else {
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
}
From 7adab74ed57c9bc847f16b82652325b7a775c3a6 Mon Sep 17 00:00:00 2001
From: nicandris
Date: Sat, 19 Sep 2020 14:02:15 +0200
Subject: [PATCH 071/148] Fix possible buffer overflow
---
tasmota/xdrv_23_zigbee_2_devices.ino | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tasmota/xdrv_23_zigbee_2_devices.ino b/tasmota/xdrv_23_zigbee_2_devices.ino
index a5a3ab2f9..26667786a 100644
--- a/tasmota/xdrv_23_zigbee_2_devices.ino
+++ b/tasmota/xdrv_23_zigbee_2_devices.ino
@@ -897,8 +897,8 @@ void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
if (Settings.flag4.zigbee_distinct_topics) {
if (Settings.flag4.zb_topic_fname && fname) {
- char frtopic[13];
- snprintf_P(frtopic, sizeof(frtopic) + strlen(fname), PSTR("tele/%s/" D_RSLT_SENSOR), fname);
+ char frtopic[13 + strlen(fname)];
+ snprintf_P(frtopic, sizeof(frtopic), PSTR("tele/%s/" D_RSLT_SENSOR), fname);
MqttPublish(frtopic, Settings.flag.mqtt_sensor_retain);
} else {
char subtopic[16];
From 0fce283532fefd1860f438ac4ac16c4e2dfef416 Mon Sep 17 00:00:00 2001
From: nicandris
Date: Sat, 19 Sep 2020 14:34:16 +0200
Subject: [PATCH 072/148] included prefix3 in topic
---
tasmota/xdrv_23_zigbee_2_devices.ino | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tasmota/xdrv_23_zigbee_2_devices.ino b/tasmota/xdrv_23_zigbee_2_devices.ino
index 26667786a..6951f626b 100644
--- a/tasmota/xdrv_23_zigbee_2_devices.ino
+++ b/tasmota/xdrv_23_zigbee_2_devices.ino
@@ -898,7 +898,7 @@ void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
if (Settings.flag4.zigbee_distinct_topics) {
if (Settings.flag4.zb_topic_fname && fname) {
char frtopic[13 + strlen(fname)];
- snprintf_P(frtopic, sizeof(frtopic), PSTR("tele/%s/" D_RSLT_SENSOR), fname);
+ snprintf_P(frtopic, sizeof(frtopic), PSTR("%s/%s/" D_RSLT_SENSOR), SettingsText(SET_MQTTPREFIX3), fname);
MqttPublish(frtopic, Settings.flag.mqtt_sensor_retain);
} else {
char subtopic[16];
From 03da44b2b4ea346b845f15e6516fdcc2b7981038 Mon Sep 17 00:00:00 2001
From: nicandris
Date: Sat, 19 Sep 2020 15:20:17 +0200
Subject: [PATCH 073/148] Clean up of friendly name before setting it to topic
---
tasmota/xdrv_23_zigbee_2_devices.ino | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tasmota/xdrv_23_zigbee_2_devices.ino b/tasmota/xdrv_23_zigbee_2_devices.ino
index 6951f626b..f8467afd9 100644
--- a/tasmota/xdrv_23_zigbee_2_devices.ino
+++ b/tasmota/xdrv_23_zigbee_2_devices.ino
@@ -897,8 +897,13 @@ void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
if (Settings.flag4.zigbee_distinct_topics) {
if (Settings.flag4.zb_topic_fname && fname) {
- char frtopic[13 + strlen(fname)];
- snprintf_P(frtopic, sizeof(frtopic), PSTR("%s/%s/" D_RSLT_SENSOR), SettingsText(SET_MQTTPREFIX3), fname);
+ //Clean special characters and check size of friendly name
+ char stemp[TOPSZ];
+ strlcpy(stemp, (!strlen(fname)) ? MQTT_TOPIC : fname, sizeof(stemp));
+ MakeValidMqtt(0, stemp);
+ //Create topic with Prefix3 and cleaned up friendly name
+ char frtopic[13 + strlen(stemp)];
+ snprintf_P(frtopic, sizeof(frtopic), PSTR("%s/%s/" D_RSLT_SENSOR), SettingsText(SET_MQTTPREFIX3), stemp);
MqttPublish(frtopic, Settings.flag.mqtt_sensor_retain);
} else {
char subtopic[16];
From 8a3f3b271a079ac071f0bba2f9a29502f3364d6e Mon Sep 17 00:00:00 2001
From: nicandris
Date: Sat, 19 Sep 2020 16:02:19 +0200
Subject: [PATCH 074/148] use TOPSZ for size of topic
---
tasmota/xdrv_23_zigbee_2_devices.ino | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tasmota/xdrv_23_zigbee_2_devices.ino b/tasmota/xdrv_23_zigbee_2_devices.ino
index f8467afd9..fa7775d03 100644
--- a/tasmota/xdrv_23_zigbee_2_devices.ino
+++ b/tasmota/xdrv_23_zigbee_2_devices.ino
@@ -902,7 +902,7 @@ void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
strlcpy(stemp, (!strlen(fname)) ? MQTT_TOPIC : fname, sizeof(stemp));
MakeValidMqtt(0, stemp);
//Create topic with Prefix3 and cleaned up friendly name
- char frtopic[13 + strlen(stemp)];
+ char frtopic[TOPSZ];
snprintf_P(frtopic, sizeof(frtopic), PSTR("%s/%s/" D_RSLT_SENSOR), SettingsText(SET_MQTTPREFIX3), stemp);
MqttPublish(frtopic, Settings.flag.mqtt_sensor_retain);
} else {
From f6ef721e814e1579f0a242b2918e57f55357915e Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 20 Sep 2020 18:01:14 +0200
Subject: [PATCH 075/148] Use specific commit for ESP32 stage
because with later ones Tasmota32 does not compile.
---
platformio_override_sample.ini | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index dde700a23..444a5097c 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -162,7 +162,8 @@ build_flags = ${esp82xx_defaults.build_flags}
[core32_stage]
platform_packages = tool-esptoolpy@1.20800.0
- arduino-esp32@https://github.com/espressif/arduino-esp32.git#esp32s2
+ ; latest working commit
+ framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#c09ec5bd3d35ba7dfc135755ab300e2b45416def
; *** Debug version used for PlatformIO Home Project Inspection
From 20e8a4cfc542ae7fa7ace47c13b25faa92d41715 Mon Sep 17 00:00:00 2001
From: Federico Leoni |