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

Merge pull request #10967 from sanchosk/development 

Added Xiaomi Miija door/window bluetooth sensor
This commit is contained in:
Theo Arends 2021-02-17 09:57:02 +01:00 committed by GitHub
parent a506bd7e77 be537285f5
commit 8684657d81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tasmota/xsns_62_esp32_mi_ble.ino
View File

@ -369,8 +369,9 @@ void (*const MI32_Commands[])(void) PROGMEM = {
#define MI_MHOC401 11 #define MI_MHOC401 11
#define MI_MHOC303 12 #define MI_MHOC303 12
#define MI_ATC 13 #define MI_ATC 13
#define MI_DOOR 14
#define MI_MI32_TYPES 13 //count this manually #define MI_MI32_TYPES 14 //count this manually
const uint16_t kMI32DeviceID[MI_MI32_TYPES]={ const uint16_t kMI32DeviceID[MI_MI32_TYPES]={
0x0000, // Unkown 0x0000, // Unkown
@ -385,7 +386,8 @@ const uint16_t kMI32DeviceID[MI_MI32_TYPES]={
0x0153, // yee-rc 0x0153, // yee-rc
0x0387, // MHO-C401 0x0387, // MHO-C401
0x06d3, // MHO-C303 0x06d3, // MHO-C303
0x0a1c // ATC -> this is a fake ID 0x0a1c, // ATC -> this is a fake ID
0x098b // door/window sensor
}; };
const char kMI32DeviceType0[] PROGMEM = "Unknown"; const char kMI32DeviceType0[] PROGMEM = "Unknown";
@ -401,7 +403,8 @@ const char kMI32DeviceType9[] PROGMEM = "YEERC";
const char kMI32DeviceType10[] PROGMEM ="MHOC401"; const char kMI32DeviceType10[] PROGMEM ="MHOC401";
const char kMI32DeviceType11[] PROGMEM ="MHOC303"; const char kMI32DeviceType11[] PROGMEM ="MHOC303";
const char kMI32DeviceType12[] PROGMEM ="ATC"; const char kMI32DeviceType12[] PROGMEM ="ATC";
const char * kMI32DeviceType[] PROGMEM = {kMI32DeviceType0,kMI32DeviceType1,kMI32DeviceType2,kMI32DeviceType3,kMI32DeviceType4,kMI32DeviceType5,kMI32DeviceType6,kMI32DeviceType7,kMI32DeviceType8,kMI32DeviceType9,kMI32DeviceType10,kMI32DeviceType11,kMI32DeviceType12}; const char kMI32DeviceType13[] PROGMEM ="DOOR";
const char * kMI32DeviceType[] PROGMEM = {kMI32DeviceType0,kMI32DeviceType1,kMI32DeviceType2,kMI32DeviceType3,kMI32DeviceType4,kMI32DeviceType5,kMI32DeviceType6,kMI32DeviceType7,kMI32DeviceType8,kMI32DeviceType9,kMI32DeviceType10,kMI32DeviceType11,kMI32DeviceType12,kMI32DeviceType13};
typedef int BATREAD_FUNCTION(int slot); typedef int BATREAD_FUNCTION(int slot);
typedef int UNITWRITE_FUNCTION(int slot, int unit); typedef int UNITWRITE_FUNCTION(int slot, int unit);
@ -1416,6 +1419,7 @@ uint32_t MIBLEgetSensorSlot(const uint8_t *mac, uint16_t _type, uint8_t counter)
_newSensor.feature.bat=1; _newSensor.feature.bat=1;
break; break;
case MI_YEERC: case MI_YEERC:
case MI_DOOR:
_newSensor.feature.Btn=1; _newSensor.feature.Btn=1;
break; break;
default: default:
@ -1761,6 +1765,12 @@ int MI32parseMiPayload(int _slot, struct mi_beacon_data_t *parsed){
// AddLog(LOG_LEVEL_DEBUG,PSTR("M32: Mode 17: NMT: %u seconds"), _beacon.NMT); // AddLog(LOG_LEVEL_DEBUG,PSTR("M32: Mode 17: NMT: %u seconds"), _beacon.NMT);
} break; } break;
case 0x19:{
MIBLEsensors[_slot].Btn = uint8_t(parsed->payload.data[0]); // just an 8 bit value in a union.
MIBLEsensors[_slot].eventType.Btn = 1;
MI32.mode.shallTriggerTele = 1;
} break;
default: { default: {
AddLog(LOG_LEVEL_DEBUG,PSTR("M32: Unknown MI pld")); AddLog(LOG_LEVEL_DEBUG,PSTR("M32: Unknown MI pld"));
res = 0; res = 0;
@ -2891,7 +2901,7 @@ void MI32Show(bool json)
if(p->bat!=0x00){ if(p->bat!=0x00){
WSContentSend_PD(HTTP_BATTERY, typeName, p->bat); WSContentSend_PD(HTTP_BATTERY, typeName, p->bat);
} }
if (p->type==MI_YEERC){ if (p->type==MI_YEERC || p->type==MI_DOOR){
WSContentSend_PD(HTTP_LASTBUTTON, typeName, p->Btn); WSContentSend_PD(HTTP_LASTBUTTON, typeName, p->Btn);
} }
if (p->pairing){ if (p->pairing){