mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8749 from gemu2015/ibeacon-fix 

ibeacon json path
This commit is contained in:
Theo Arends 2020-06-21 21:36:02 +02:00 committed by GitHub
parent ef230340e4 279715c85e
commit 428b6dd4ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tasmota/xsns_52_ibeacon.ino
View File

@ -25,7 +25,7 @@
#include <TasmotaSerial.h> #include <TasmotaSerial.h>
#define TMSBSIZ 256 #define TMSBSIZ 512
#define HM17_BAUDRATE 9600 #define HM17_BAUDRATE 9600
@ -197,15 +197,32 @@ void hm17_sendcmd(uint8_t cmd) {
} }
uint32_t ibeacon_add(struct IBEACON *ib) { uint32_t ibeacon_add(struct IBEACON *ib) {
/* if (!strncmp(ib->MAJOR,"4B1C",4)) {
return 0;
}
*/
if (!strncmp(ib->RSSI,"0",1)) {
return 0;
}
// keyfob starts with ffff, ibeacon has valid facid // keyfob starts with ffff, ibeacon has valid facid
if (!strncmp(ib->MAC,"FFFF",4) || strncmp(ib->FACID,"00000000",8)) { if (!strncmp(ib->MAC,"FFFF",4) || strncmp(ib->FACID,"00000000",8)) {
for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) { for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
if (ibeacons[cnt].FLAGS) { if (ibeacons[cnt].FLAGS) {
if (!strncmp(ibeacons[cnt].MAC,ib->MAC,12)) { if (!strncmp_P(ib->UID,PSTR("00000000000000000000000000000000"),32)) {
// exists if (!strncmp(ibeacons[cnt].MAC,ib->MAC,12)) {
memcpy(ibeacons[cnt].RSSI,ib->RSSI,4); // exists
ibeacons[cnt].TIME=0; memcpy(ibeacons[cnt].RSSI,ib->RSSI,4);
return 1; ibeacons[cnt].TIME=0;
return 1;
}
} else {
if (!strncmp(ibeacons[cnt].UID,ib->UID,32)) {
// exists
memcpy(ibeacons[cnt].RSSI,ib->RSSI,4);
ibeacons[cnt].TIME=0;
return 1;
}
} }
} }
} }
@ -450,12 +467,15 @@ uint32_t difftime=millis()-hm17_lastms;
} }
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER
const char HTTP_IBEACON[] PROGMEM = const char HTTP_IBEACON_mac[] PROGMEM =
"{s}IBEACON-MAC : %s" " - RSSI : %s" "{m}{e}";
const char HTTP_IBEACON_uid[] PROGMEM =
"{s}IBEACON-UID : %s" " - RSSI : %s" "{m}{e}"; "{s}IBEACON-UID : %s" " - RSSI : %s" "{m}{e}";
void IBEACON_Show(void) { void IBEACON_Show(void) {
char mac[14]; char mac[14];
char rssi[6]; char rssi[6];
char uid[34];
for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) { for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
if (ibeacons[cnt].FLAGS) { if (ibeacons[cnt].FLAGS) {
@ -463,7 +483,13 @@ char rssi[6];
mac[12]=0; mac[12]=0;
memcpy(rssi,ibeacons[cnt].RSSI,4); memcpy(rssi,ibeacons[cnt].RSSI,4);
rssi[4]=0; rssi[4]=0;
WSContentSend_PD(HTTP_IBEACON,mac,rssi); memcpy(uid,ibeacons[cnt].UID,32);
uid[32]=0;
if (!strncmp_P(uid,PSTR("00000000000000000000000000000000"),32)) {
WSContentSend_PD(HTTP_IBEACON_mac,mac,rssi);
} else {
WSContentSend_PD(HTTP_IBEACON_uid,uid,rssi);
}
} }
} }
@ -585,9 +611,9 @@ void ibeacon_mqtt(const char *mac,const char *rssi,const char *uid,const char *m
int16_t n_rssi=atoi(s_rssi); int16_t n_rssi=atoi(s_rssi);
// if uid == all zeros, take mac // if uid == all zeros, take mac
if (!strncmp_P(s_uid,PSTR("00000000000000000000000000000000"),32)) { if (!strncmp_P(s_uid,PSTR("00000000000000000000000000000000"),32)) {
ResponseTime_P(PSTR(",\"" D_CMND_IBEACON "_%s\":{\"UID\":\"%s\",\"MAJOR\":\"%s\",\"MINOR\":\"%s\",\"RSSI\":%d}}"),s_mac,s_uid,s_major,s_minor,n_rssi); ResponseTime_P(PSTR(",\"" D_CMND_IBEACON "\":{\"MAC\":\"%s\",\"UID\":\"%s\",\"MAJOR\":\"%s\",\"MINOR\":\"%s\",\"RSSI\":%d}}"),s_mac,s_uid,s_major,s_minor,n_rssi);
} else { } else {
ResponseTime_P(PSTR(",\"" D_CMND_IBEACON "_%s\":{\"MAJOR\":\"%s\",\"MINOR\":\"%s\",\"RSSI\":%d}}"),s_uid,s_major,s_minor,n_rssi); ResponseTime_P(PSTR(",\"" D_CMND_IBEACON "\":{\"UID\":\"%s\",\"MAJOR\":\"%s\",\"MINOR\":\"%s\",\"MAC\":\"%s\",\"RSSI\":%d}}"),s_uid,s_major,s_minor,s_mac,n_rssi);
} }
MqttPublishTeleSensor(); MqttPublishTeleSensor();