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

Remove support for define USE_DS18x20_LEGACY 

Remove support for define USE_DS18x20_LEGACY and legacy DS18x20 driver (#6486)
This commit is contained in:
Theo Arends 2019-09-25 14:35:37 +02:00
parent 5bd19d54db
commit 3eb219ccaa
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sonoff/_changelog.ino
View File

@ -1,6 +1,7 @@
/*********************************************************************************************\ /*********************************************************************************************\
* 6.6.0.14 20190925 * 6.6.0.14 20190925
* Change command Tariffx to allow time entries like 23 (hours), 1320 (minutes) or 23:00. NOTE: As this is development branch previous tariffs are lost! (#6488) * Change command Tariffx to allow time entries like 23 (hours), 1320 (minutes) or 23:00. NOTE: As this is development branch previous tariffs are lost! (#6488)
* Remove support for define USE_DS18x20_LEGACY and legacy DS18x20 driver (#6486)
* *
* 6.6.0.13 20190922 * 6.6.0.13 20190922
* Add command EnergyReset4 x,x to initialize total usage for two tarrifs * Add command EnergyReset4 x,x to initialize total usage for two tarrifs

3
sonoff/my_user_config.h
View File

@ -321,8 +321,7 @@
//#define USE_ADC_VCC // Display Vcc in Power status. Disable for use as Analog input on selected devices //#define USE_ADC_VCC // Display Vcc in Power status. Disable for use as Analog input on selected devices
// -- One wire sensors ---------------------------- // -- One wire sensors ----------------------------
// WARNING: Select none for default one DS18B20 sensor or enable one of the following two options for multiple sensors // WARNING: Select none for default one DS18B20 sensor or enable the following option for multiple sensors
//#define USE_DS18x20_LEGACY // Optional for more than one DS18x20 sensors with dynamic scan using library OneWire (+1k5 code)
#define USE_DS18x20 // Optional for more than one DS18x20 sensors with id sort, single scan and read retry (+1k3 code) #define USE_DS18x20 // Optional for more than one DS18x20 sensors with id sort, single scan and read retry (+1k3 code)
// #define W1_PARASITE_POWER // If using USE_DS18x20 then optimize for parasite powered sensors // #define W1_PARASITE_POWER // If using USE_DS18x20 then optimize for parasite powered sensors
// #define DS18B20_INTERNAL_PULLUP // Use INPUT_PULLUP internal pullup resistors for single DS18B20 // #define DS18B20_INTERNAL_PULLUP // Use INPUT_PULLUP internal pullup resistors for single DS18B20

5
sonoff/sonoff_post.h
View File

@ -98,7 +98,6 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c
#define USE_COUNTER // Enable counters #define USE_COUNTER // Enable counters
#undef USE_ADC_VCC // Add Analog input on selected devices #undef USE_ADC_VCC // Add Analog input on selected devices
#define USE_DS18x20 // For more than one DS18x20 sensors with id sort, single scan and read retry (+1k3 code) #define USE_DS18x20 // For more than one DS18x20 sensors with id sort, single scan and read retry (+1k3 code)
//#define USE_DS18x20_LEGACY // For more than one DS18x20 sensors with dynamic scan using library OneWire (+1k5 code)
#define USE_I2C // I2C using library wire (+10k code, 0k2 mem, 124 iram) #define USE_I2C // I2C using library wire (+10k code, 0k2 mem, 124 iram)
#define USE_SHT // Add I2C emulating code for SHT1X sensor (+1k4 code) #define USE_SHT // Add I2C emulating code for SHT1X sensor (+1k4 code)
@ -415,7 +414,7 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c
* Mandatory define for DS18x20 if changed by above image selections * Mandatory define for DS18x20 if changed by above image selections
\*********************************************************************************************/ \*********************************************************************************************/
#if defined(USE_DS18x20) || defined(USE_DS18x20_LEGACY) #if defined(USE_DS18x20)
#else #else
#define USE_DS18B20 // Default DS18B20 sensor needs no external library #define USE_DS18B20 // Default DS18B20 sensor needs no external library
#endif #endif
@ -461,7 +460,6 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c
#undef USE_COUNTER // Disable counters #undef USE_COUNTER // Disable counters
#undef USE_DS18x20 // Disable DS18x20 sensor #undef USE_DS18x20 // Disable DS18x20 sensor
#undef USE_DS18x20_LEGACY // Disable DS18x20 sensor
#undef USE_DS18B20 // Disable internal DS18B20 sensor #undef USE_DS18B20 // Disable internal DS18B20 sensor
#undef USE_I2C // Disable all I2C sensors and devices #undef USE_I2C // Disable all I2C sensors and devices
#undef USE_SPI // Disable all SPI devices #undef USE_SPI // Disable all SPI devices
@ -546,7 +544,6 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c
#undef USE_COUNTER // Disable counters #undef USE_COUNTER // Disable counters
#undef USE_DS18x20 // Disable DS18x20 sensor #undef USE_DS18x20 // Disable DS18x20 sensor
#undef USE_DS18x20_LEGACY // Disable DS18x20 sensor
#undef USE_DS18B20 // Disable internal DS18B20 sensor #undef USE_DS18B20 // Disable internal DS18B20 sensor
#undef USE_I2C // Disable all I2C sensors and devices #undef USE_I2C // Disable all I2C sensors and devices
#undef USE_SPI // Disable all SPI devices #undef USE_SPI // Disable all SPI devices

2
sonoff/sonoff_template.h
View File

@ -531,7 +531,7 @@ const uint8_t kGpioNiceList[] PROGMEM = {
GPIO_DHT22, // DHT21, DHT22, AM2301, AM2302, AM2321 GPIO_DHT22, // DHT21, DHT22, AM2301, AM2302, AM2321
GPIO_SI7021, // iTead SI7021 GPIO_SI7021, // iTead SI7021
#endif #endif
#if defined(USE_DS18B20) || defined(USE_DS18x20) || defined(USE_DS18x20_LEGACY) #if defined(USE_DS18B20) || defined(USE_DS18x20)
GPIO_DSB, // Single wire DS18B20 or DS18S20 GPIO_DSB, // Single wire DS18B20 or DS18S20
#endif #endif

2
sonoff/support_features.ino
View File

@ -243,7 +243,7 @@ void GetFeatures(void)
feature_sns1 |= 0x00000010; // xsns_05_ds18b20.ino feature_sns1 |= 0x00000010; // xsns_05_ds18b20.ino
#endif #endif
#ifdef USE_DS18x20_LEGACY #ifdef USE_DS18x20_LEGACY
feature_sns1 |= 0x00000020; // xsns_05_ds18x20_legacy.ino feature_sns1 |= 0x00000020; // xsns_05_ds18x20_legacy.ino - no more supported since 6.6.0.14
#endif #endif
#ifdef USE_DS18x20 #ifdef USE_DS18x20
feature_sns1 |= 0x00000040; // xsns_05_ds18x20.ino feature_sns1 |= 0x00000040; // xsns_05_ds18x20.ino