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

Refactor ds18x20.ino

Browse Source
This commit is contained in:
Theo Arends 2019-09-25 16:28:54 +02:00
parent 2d1bc97843
commit fa826d33d9
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sonoff/my_user_config.h
View File

@ -321,10 +321,9 @@
//#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 the following option for multiple sensors
#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 // 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 resistor
// -- I2C sensors --------------------------------- // -- I2C sensors ---------------------------------
#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)

14
sonoff/xsns_05_ds18x20.ino
View File

@ -74,7 +74,11 @@ uint8_t OneWireReset(void)
uint8_t retries = 125; uint8_t retries = 125;
//noInterrupts(); //noInterrupts();
#ifdef DS18B20_INTERNAL_PULLUP
pinMode(ds18x20_pin, INPUT_PULLUP);
#else
pinMode(ds18x20_pin, INPUT); pinMode(ds18x20_pin, INPUT);
#endif
do { do {
if (--retries == 0) { if (--retries == 0) {
return 0; return 0;
@ -84,7 +88,11 @@ uint8_t OneWireReset(void)
pinMode(ds18x20_pin, OUTPUT); pinMode(ds18x20_pin, OUTPUT);
digitalWrite(ds18x20_pin, LOW); digitalWrite(ds18x20_pin, LOW);
delayMicroseconds(480); delayMicroseconds(480);
#ifdef DS18B20_INTERNAL_PULLUP
pinMode(ds18x20_pin, INPUT_PULLUP);
#else
pinMode(ds18x20_pin, INPUT); pinMode(ds18x20_pin, INPUT);
#endif
delayMicroseconds(70); delayMicroseconds(70);
uint8_t r = !digitalRead(ds18x20_pin); uint8_t r = !digitalRead(ds18x20_pin);
//interrupts(); //interrupts();
@ -113,7 +121,11 @@ uint8_t OneWireReadBit(void)
pinMode(ds18x20_pin, OUTPUT); pinMode(ds18x20_pin, OUTPUT);
digitalWrite(ds18x20_pin, LOW); digitalWrite(ds18x20_pin, LOW);
delayMicroseconds(3); delayMicroseconds(3);
#ifdef DS18B20_INTERNAL_PULLUP
pinMode(ds18x20_pin, INPUT_PULLUP);
#else
pinMode(ds18x20_pin, INPUT); pinMode(ds18x20_pin, INPUT);
#endif
delayMicroseconds(10); delayMicroseconds(10);
uint8_t r = digitalRead(ds18x20_pin); uint8_t r = digitalRead(ds18x20_pin);
//interrupts(); //interrupts();
@ -432,7 +444,7 @@ void Ds18x20Show(bool json)
if (json) { if (json) {
if (1 == ds18x20_sensors) { if (1 == ds18x20_sensors) {
ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s}"), ds18x20_types, temperature); ResponseAppend_P(JSON_SNS_TEMP, ds18x20_types, temperature);
} else { } else {
char address[17]; char address[17];
for (uint32_t j = 0; j < 6; j++) { for (uint32_t j = 0; j < 6; j++) {