jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-08-01 15:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6648 from Jason2866/patch-2

Browse Source 
Make Sonoff Bridge optional by define
This commit is contained in:
Theo Arends 2019-10-15 14:46:08 +02:00 committed by GitHub
commit 9ced81175d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sonoff/my_user_config.h
View File

@ -531,6 +531,7 @@
#define USE_HX711 // Add support for HX711 load cell (+1k5 code) #define USE_HX711 // Add support for HX711 load cell (+1k5 code)
// #define USE_HX711_GUI // Add optional web GUI to HX711 as scale (+1k8 code) // #define USE_HX711_GUI // Add optional web GUI to HX711 as scale (+1k8 code)
#define USE_RF_BRIDGE // Add support for Rf Bridge
#define USE_RF_FLASH // Add support for flashing the EFM8BB1 chip on the Sonoff RF Bridge. C2CK must be connected to GPIO4, C2D to GPIO5 on the PCB (+3k code) #define USE_RF_FLASH // Add support for flashing the EFM8BB1 chip on the Sonoff RF Bridge. C2CK must be connected to GPIO4, C2D to GPIO5 on the PCB (+3k code)
//#define USE_TX20_WIND_SENSOR // Add support for La Crosse TX20 anemometer (+2k code) //#define USE_TX20_WIND_SENSOR // Add support for La Crosse TX20 anemometer (+2k code)

2
sonoff/sonoff_template.h
View File

@ -775,7 +775,9 @@ const uint8_t kModuleNiceList[] PROGMEM = {
SONOFF_IFAN02, // Sonoff Fan SONOFF_IFAN02, // Sonoff Fan
SONOFF_IFAN03, SONOFF_IFAN03,
#endif #endif
#ifdef USE_RF_BRIDGE
SONOFF_BRIDGE, // Sonoff Bridge SONOFF_BRIDGE, // Sonoff Bridge
#endif
SONOFF_SV, // Sonoff Development Devices SONOFF_SV, // Sonoff Development Devices
SONOFF_DEV, SONOFF_DEV,
CH1, // Relay Devices CH1, // Relay Devices

4
sonoff/support_features.ino
View File

@ -468,7 +468,9 @@ void GetFeatures(void)
#ifdef USE_SONOFF_SC #ifdef USE_SONOFF_SC
feature5 |= 0x00001000; feature5 |= 0x00001000;
#endif #endif
// feature5 |= 0x00002000; #ifdef USE_RF_BRIDGE
feature5 |= 0x00002000;
#endif
// feature5 |= 0x00004000; // feature5 |= 0x00004000;
// feature5 |= 0x00008000; // feature5 |= 0x00008000;

6
sonoff/xdrv_01_webserver.ino
View File

@ -1046,6 +1046,7 @@ void HandleRoot(void)
#endif // USE_SONOFF_IFAN #endif // USE_SONOFF_IFAN
WSContentSend_P(PSTR("</tr></table>")); WSContentSend_P(PSTR("</tr></table>"));
} }
#ifdef USE_RF_BRIDGE
if (SONOFF_BRIDGE == my_module_type) { if (SONOFF_BRIDGE == my_module_type) {
WSContentSend_P(HTTP_TABLE100); WSContentSend_P(HTTP_TABLE100);
WSContentSend_P(PSTR("<tr>")); WSContentSend_P(PSTR("<tr>"));
@ -1059,7 +1060,8 @@ void HandleRoot(void)
} }
WSContentSend_P(PSTR("</tr></table>")); WSContentSend_P(PSTR("</tr></table>"));
} }
#endif // USE_RF_BRIDGE
#ifndef FIRMWARE_MINIMAL #ifndef FIRMWARE_MINIMAL
XdrvCall(FUNC_WEB_ADD_MAIN_BUTTON); XdrvCall(FUNC_WEB_ADD_MAIN_BUTTON);
XsnsCall(FUNC_WEB_ADD_MAIN_BUTTON); XsnsCall(FUNC_WEB_ADD_MAIN_BUTTON);
@ -2100,7 +2102,7 @@ void HandleUploadLoop(void)
Web.config_block_count = 0; Web.config_block_count = 0;
} }
else { else {
#ifdef USE_RF_FLASH #if (defined (USE_RF_FLASH) && defined(USE_RF_BRIDGE))
if ((SONOFF_BRIDGE == my_module_type) && (upload.buf[0] == ':')) { // Check if this is a RF bridge FW file if ((SONOFF_BRIDGE == my_module_type) && (upload.buf[0] == ':')) { // Check if this is a RF bridge FW file
Update.end(); // End esp8266 update session Update.end(); // End esp8266 update session
Web.upload_file_type = UPL_EFM8BB1; Web.upload_file_type = UPL_EFM8BB1;

4
sonoff/xdrv_06_snfbridge.ino
View File

@ -21,6 +21,8 @@
Sonoff RF Bridge 433 Sonoff RF Bridge 433
\*********************************************************************************************/ \*********************************************************************************************/
#ifdef USE_RF_BRIDGE
#define XDRV_06 6 #define XDRV_06 6
const uint32_t SFB_TIME_AVOID_DUPLICATE = 2000; // Milliseconds const uint32_t SFB_TIME_AVOID_DUPLICATE = 2000; // Milliseconds
@ -584,3 +586,5 @@ bool Xdrv06(uint8_t function)
} }
return result; return result;
} }
#endif // USE_RF_BRIDGE

2
tools/decode-status.py
View File

@ -172,7 +172,7 @@ a_features = [[
"USE_BUZZER","USE_RDM6300","USE_IBEACON","USE_SML_M", "USE_BUZZER","USE_RDM6300","USE_IBEACON","USE_SML_M",
"USE_INA226","USE_A4988_Stepper","USE_DDS2382","USE_SM2135", "USE_INA226","USE_A4988_Stepper","USE_DDS2382","USE_SM2135",
"USE_SHUTTER","USE_PCF8574","USE_DDSU666","USE_DEEPSLEEP", "USE_SHUTTER","USE_PCF8574","USE_DDSU666","USE_DEEPSLEEP",
"USE_SONOFF_SC","","","", "USE_SONOFF_SC","USE_RF_BRIDGE","","",
"","","","", "","","","",
"","","","", "","","","",
"","","","", "","","","",