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

Merge pull request #9014 from Staars/mi32 

MI32: add support for MHO-C303
This commit is contained in:
Theo Arends 2020-08-03 10:39:43 +02:00 committed by GitHub
parent 8a22cd7d23 ccdfff33dd
commit ff37beac6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tasmota/xsns_62_MI_ESP32.ino
View File

@ -20,6 +20,8 @@
-------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------
Version yyyymmdd Action Description Version yyyymmdd Action Description
-------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------
0.9.1.2 20200802 changed - add MHO-C303
-------
0.9.1.1 20200715 changed - add MHO-C401, refactoring 0.9.1.1 20200715 changed - add MHO-C401, refactoring
------- -------
0.9.1.0 20200712 changed - add lights and yeerc, add pure passive mode with decryption, 0.9.1.0 20200712 changed - add lights and yeerc, add pure passive mode with decryption,
@ -250,10 +252,11 @@ const char kMI32_Commands[] PROGMEM = "Period|Time|Page|Battery|Unit
#define MJYD2S 8 #define MJYD2S 8
#define YEERC 9 #define YEERC 9
#define MHOC401 10 #define MHOC401 10
#define MHOC303 11
#define MI_TYPES 10 //count this manually #define MI32_TYPES 11 //count this manually
const uint16_t kMI32DeviceID[MI_TYPES]={ 0x0098, // Flora const uint16_t kMI32DeviceID[MI32_TYPES]={ 0x0098, // Flora
0x01aa, // MJ_HT_V1 0x01aa, // MJ_HT_V1
0x045b, // LYWSD02 0x045b, // LYWSD02
0x055b, // LYWSD03 0x055b, // LYWSD03
@ -262,7 +265,8 @@ const uint16_t kMI32DeviceID[MI_TYPES]={ 0x0098, // Flora
0x03dd, // NLIGHT 0x03dd, // NLIGHT
0x07f6, // MJYD2S 0x07f6, // MJYD2S
0x0153, // yee-rc 0x0153, // yee-rc
0x0387 // MHO-C401 0x0387, // MHO-C401
0x06d3 // MHO-C303
}; };
const char kMI32DeviceType1[] PROGMEM = "Flora"; const char kMI32DeviceType1[] PROGMEM = "Flora";
@ -275,7 +279,8 @@ const char kMI32DeviceType7[] PROGMEM = "NLIGHT";
const char kMI32DeviceType8[] PROGMEM = "MJYD2S"; const char kMI32DeviceType8[] PROGMEM = "MJYD2S";
const char kMI32DeviceType9[] PROGMEM = "YEERC"; const char kMI32DeviceType9[] PROGMEM = "YEERC";
const char kMI32DeviceType10[] PROGMEM ="MHOC401"; const char kMI32DeviceType10[] PROGMEM ="MHOC401";
const char * kMI32DeviceType[] PROGMEM = {kMI32DeviceType1,kMI32DeviceType2,kMI32DeviceType3,kMI32DeviceType4,kMI32DeviceType5,kMI32DeviceType6,kMI32DeviceType7,kMI32DeviceType8,kMI32DeviceType9,kMI32DeviceType10}; const char kMI32DeviceType11[] PROGMEM ="MHOC303";
const char * kMI32DeviceType[] PROGMEM = {kMI32DeviceType1,kMI32DeviceType2,kMI32DeviceType3,kMI32DeviceType4,kMI32DeviceType5,kMI32DeviceType6,kMI32DeviceType7,kMI32DeviceType8,kMI32DeviceType9,kMI32DeviceType10,kMI32DeviceType11};
/*********************************************************************************************\ /*********************************************************************************************\
* enumerations * enumerations
@ -530,7 +535,7 @@ uint32_t MIBLEgetSensorSlot(uint8_t (&_MAC)[6], uint16_t _type, uint8_t counter)
DEBUG_SENSOR_LOG(PSTR("%s: will test ID-type: %x"),D_CMND_MI32, _type); DEBUG_SENSOR_LOG(PSTR("%s: will test ID-type: %x"),D_CMND_MI32, _type);
bool _success = false; bool _success = false;
for (uint32_t i=0;i<MI_TYPES;i++){ // i < sizeof(kMI32DeviceID) gives compiler warning for (uint32_t i=0;i<MI32_TYPES;i++){ // i < sizeof(kMI32DeviceID) gives compiler warning
if(_type == kMI32DeviceID[i]){ if(_type == kMI32DeviceID[i]){
DEBUG_SENSOR_LOG(PSTR("MI32: ID is type %u"), i); DEBUG_SENSOR_LOG(PSTR("MI32: ID is type %u"), i);
_type = i+1; _type = i+1;
@ -859,12 +864,11 @@ void MI32StartTimeTask(){
} }
void MI32TimeTask(void *pvParameters){ void MI32TimeTask(void *pvParameters){
if (MIBLEsensors[MI32.state.sensor].type != LYWSD02) { if (MIBLEsensors[MI32.state.sensor].type != LYWSD02 && MIBLEsensors[MI32.state.sensor].type != MHOC303) {
MI32.mode.shallSetTime = 0; MI32.mode.shallSetTime = 0;
vTaskDelete( NULL ); vTaskDelete( NULL );
} }
if(MI32ConnectActiveSensor()){
if(MI32ConnectActiveSensor()){
uint32_t timer = 0; uint32_t timer = 0;
while (MI32.mode.connected == 0){ while (MI32.mode.connected == 0){
if (timer>1000){ if (timer>1000){
@ -925,7 +929,7 @@ void MI32StartUnitTask(){
} }
void MI32UnitTask(void *pvParameters){ void MI32UnitTask(void *pvParameters){
if (MIBLEsensors[MI32.state.sensor].type != LYWSD02) { if (MIBLEsensors[MI32.state.sensor].type != LYWSD02 && MIBLEsensors[MI32.state.sensor].type != MHOC303) {
MI32.mode.shallSetUnit = 0; MI32.mode.shallSetUnit = 0;
vTaskDelete( NULL ); vTaskDelete( NULL );
} }
@ -1497,7 +1501,7 @@ bool MI32Cmd(void) {
case CMND_MI32_TIME: case CMND_MI32_TIME:
if (XdrvMailbox.data_len > 0) { if (XdrvMailbox.data_len > 0) {
if(MIBLEsensors.size()>XdrvMailbox.payload){ if(MIBLEsensors.size()>XdrvMailbox.payload){
if(MIBLEsensors[XdrvMailbox.payload].type == LYWSD02){ if(MIBLEsensors[XdrvMailbox.payload].type == LYWSD02 || MIBLEsensors[XdrvMailbox.payload].type == MHOC303){
AddLog_P2(LOG_LEVEL_DEBUG,PSTR("%s: will set Time"),D_CMND_MI32); AddLog_P2(LOG_LEVEL_DEBUG,PSTR("%s: will set Time"),D_CMND_MI32);
MI32.state.sensor = XdrvMailbox.payload; MI32.state.sensor = XdrvMailbox.payload;
MI32.mode.canScan = 0; MI32.mode.canScan = 0;
@ -1512,7 +1516,7 @@ bool MI32Cmd(void) {
case CMND_MI32_UNIT: case CMND_MI32_UNIT:
if (XdrvMailbox.data_len > 0) { if (XdrvMailbox.data_len > 0) {
if(MIBLEsensors.size()>XdrvMailbox.payload){ if(MIBLEsensors.size()>XdrvMailbox.payload){
if(MIBLEsensors[XdrvMailbox.payload].type == LYWSD02){ if(MIBLEsensors[XdrvMailbox.payload].type == LYWSD02 || MIBLEsensors[XdrvMailbox.payload].type == MHOC303){
AddLog_P2(LOG_LEVEL_DEBUG,PSTR("%s: will set Unit"),D_CMND_MI32); AddLog_P2(LOG_LEVEL_DEBUG,PSTR("%s: will set Unit"),D_CMND_MI32);
MI32.state.sensor = XdrvMailbox.payload; MI32.state.sensor = XdrvMailbox.payload;
MI32.mode.canScan = 0; MI32.mode.canScan = 0;