jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 18:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Housekeeping

Browse Source
This commit is contained in:
Theo Arends 2018-09-06 18:08:10 +02:00
parent b441c85776
commit 2fdc91f1b4
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sonoff/support.ino
View File

@ -609,6 +609,10 @@ boolean GetUsedInModule(byte val, uint8_t *arr)
if (GPIO_PZEM_TX == val) { return true; } if (GPIO_PZEM_TX == val) { return true; }
if (GPIO_PZEM_RX == val) { return true; } if (GPIO_PZEM_RX == val) { return true; }
#endif #endif
#ifndef USE_PZEM2
if (GPIO_PZEM2_TX == val) { return true; }
if (GPIO_PZEM2_RX == val) { return true; }
#endif
#ifndef USE_SENSEAIR #ifndef USE_SENSEAIR
if (GPIO_SAIR_TX == val) { return true; } if (GPIO_SAIR_TX == val) { return true; }
if (GPIO_SAIR_RX == val) { return true; } if (GPIO_SAIR_RX == val) { return true; }
@ -965,7 +969,7 @@ void GetFeatures()
feature_sns1 |= 0x00000004; // xdrv_03_energy.ino feature_sns1 |= 0x00000004; // xdrv_03_energy.ino
#endif #endif
#ifdef USE_PZEM004T #ifdef USE_PZEM004T
feature_sns1 |= 0x00000008; // xdrv_03_energy.ino feature_sns1 |= 0x00000008; // xnrg_03_pzem004t.ino
#endif #endif
#ifdef USE_DS18B20 #ifdef USE_DS18B20
feature_sns1 |= 0x00000010; // xsns_05_ds18b20.ino feature_sns1 |= 0x00000010; // xsns_05_ds18b20.ino
@ -1074,6 +1078,19 @@ void GetFeatures()
#ifdef USE_MCP230xx_DISPLAYOUTPUT #ifdef USE_MCP230xx_DISPLAYOUTPUT
feature_sns2 |= 0x00000020; // xsns_29_mcp230xx.ino feature_sns2 |= 0x00000020; // xsns_29_mcp230xx.ino
#endif #endif
#ifdef USE_HLW8012
feature_sns2 |= 0x00000040; // xnrg_01_hlw8012.ino
#endif
#ifdef USE_CSE7766
feature_sns2 |= 0x00000080; // xnrg_02_cse7766.ino
#endif
#ifdef USE_MCP39F501
feature_sns2 |= 0x00000100; // xnrg_04_mcp39f501.ino
#endif
#ifdef USE_PZEM2
feature_sns2 |= 0x00000200; // xnrg_05_pzem2.ino
#endif
} }
/*********************************************************************************************\ /*********************************************************************************************\

2
sonoff/user_config.h
View File

@ -343,7 +343,7 @@
// Power monitoring sensors ----------------------- // Power monitoring sensors -----------------------
#define USE_PZEM004T // Add support for PZEM004T Energy monitor (+2k code) #define USE_PZEM004T // Add support for PZEM004T Energy monitor (+2k code)
#define USE_PZEM2 // Add support for PZEM003,014,016,017 Energy monitor (+2k code) #define USE_PZEM2 // Add support for PZEM003,014,016,017 Energy monitor (+1k1 code)
// -- Low level interface devices ----------------- // -- Low level interface devices -----------------
#define USE_IR_REMOTE // Send IR remote commands using library IRremoteESP8266 and ArduinoJson (+4k code, 0k3 mem, 48 iram) #define USE_IR_REMOTE // Send IR remote commands using library IRremoteESP8266 and ArduinoJson (+4k code, 0k3 mem, 48 iram)

8
tools/decode-status.py
View File

@ -83,7 +83,9 @@ a_setoption = [[
"Do not show Wifi and Mqtt state using Led" "Do not show Wifi and Mqtt state using Led"
],[ ],[
"Timers enabled", "Timers enabled",
"","","", "Generic ESP8285 GPIO enabled",
"Add UTC time offset to JSON message",
"",
"","","","", "","","","",
"","","","", "","","","",
"","","","", "","","","",
@ -122,8 +124,8 @@ a_features = [[
"USE_SDM630","USE_LM75AD","USE_APDS9960","USE_TM1638" "USE_SDM630","USE_LM75AD","USE_APDS9960","USE_TM1638"
],[ ],[
"USE_MCP230xx","USE_MPR121","USE_CCS811","USE_MPU6050", "USE_MCP230xx","USE_MPR121","USE_CCS811","USE_MPU6050",
"USE_MCP230xx_OUTPUT","USE_MCP230xx_DISPLAYOUTPUT","","", "USE_MCP230xx_OUTPUT","USE_MCP230xx_DISPLAYOUTPUT","USE_HLW8012","USE_CSE7766",
"","","","", "USE_MCP39F501","USE_PZEM2","","",
"","","","", "","","","",
"","","","", "","","","",
"","","","", "","","","",