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

Merge branch 'development' of https://github.com/andrethomas/Sonoff-Tasmota into development

This commit is contained in:
andrethomas 2018-07-31 18:44:49 +02:00
parent caf88ddc45 6f455e2c00
commit 6380a5a326
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sonoff/_changelog.ino
View File

@ -1,4 +1,5 @@
/* 6.1.1c /* 6.1.1c
* Fix sonoff-minimal from using default settings
* Add option + to command Rule to concatenate new rule with existing rules (#3365) * Add option + to command Rule to concatenate new rule with existing rules (#3365)
* Add initial support for sensor MPU6050 (#3352) * Add initial support for sensor MPU6050 (#3352)
* Add command SerialSend4 to send binary serial data (#3345) * Add command SerialSend4 to send binary serial data (#3345)

2
sonoff/settings.ino
View File

@ -286,8 +286,10 @@ void SettingsLoad()
snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_CONFIG D_LOADED_FROM_FLASH_AT " %X, " D_COUNT " %d"), settings_location, Settings.save_flag); snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_CONFIG D_LOADED_FROM_FLASH_AT " %X, " D_COUNT " %d"), settings_location, Settings.save_flag);
AddLog(LOG_LEVEL_DEBUG); AddLog(LOG_LEVEL_DEBUG);
#ifndef BE_MINIMAL
if (bad_crc || (Settings.cfg_holder != (uint16_t)CFG_HOLDER)) { SettingsDefault(); } if (bad_crc || (Settings.cfg_holder != (uint16_t)CFG_HOLDER)) { SettingsDefault(); }
settings_crc = GetSettingsCrc(); settings_crc = GetSettingsCrc();
#endif // BE_MINIMAL
RtcSettingsLoad(); RtcSettingsLoad();
} }

13
sonoff/support.ino
View File

@ -919,6 +919,19 @@ void GetFeatures()
/*********************************************************************************************/ /*********************************************************************************************/
feature_sns2 = 0x00000000; feature_sns2 = 0x00000000;
#ifdef USE_MCP230xx
feature_sns2 |= 0x00000001; // xsns_29_mcp230xx.ino
#endif
#ifdef USE_MPR121
feature_sns2 |= 0x00000002; // xsns_30_mpr121.ino
#endif
#ifdef USE_CCS811
feature_sns2 |= 0x00000004; // xsns_31_ccs811.ino
#endif
#ifdef USE_MPU6050
feature_sns2 |= 0x00000008; // xsns_32_mpu6050.ino
#endif
} }
/*********************************************************************************************\ /*********************************************************************************************\

6
tools/decode-status.py
View File

@ -72,7 +72,7 @@ a_setoption = [[
"Do not control Power with Dimmer", "Do not control Power with Dimmer",
"Energy monitoring while powered off", "Energy monitoring while powered off",
"MQTT serial", "MQTT serial",
"Rules until 5.14.0b", "MQTT serial binary",
"Rules once mode until 5.14.0b", "Rules once mode until 5.14.0b",
"KNX enabled", "KNX enabled",
"Use Power device index on single relay devices", "Use Power device index on single relay devices",
@ -121,7 +121,7 @@ a_features = [[
"USE_SGP30","USE_SR04","USE_SDM120","USE_SI1145", "USE_SGP30","USE_SR04","USE_SDM120","USE_SI1145",
"USE_SDM630","USE_LM75AD","USE_APDS9960","USE_TM1638" "USE_SDM630","USE_LM75AD","USE_APDS9960","USE_TM1638"
],[ ],[
"","","","", "USE_MCP230xx","USE_MPR121","USE_CCS811","USE_MPU6050",
"","","","", "","","","",
"","","","", "","","","",
"","","","", "","","","",
@ -155,7 +155,7 @@ else:
fp.close() fp.close()
def StartDecode(): def StartDecode():
print ("\n*** decode-status.py v20180725 by Theo Arends ***") print ("\n*** decode-status.py v20180730 by Theo Arends ***")
# print("Decoding\n{}".format(obj)) # print("Decoding\n{}".format(obj))