5.10.0 20171201 * Upgrade library ArduinoJson to 5.11.2 * Upgrade library IRRemoteEsp8266 to 2.2.1 + 2 commits but disabled some protocols (code size reduction) * Upgrade library NeoPixelBus to 2.2.9 * Upgrade library OneWire to 2.3.3 + 6 commits and disabled CRC lookup-table (#define ONEWIRE_CRC8_TABLE 0) (code size reduction) * Update library PubSubClient to 2.6 + 9 commits and additional delay (#790) * Update core_esp8266_wiring_digital.c to latest (staged) level * Patch library I2Cdevlib-Core for esp8266-core 2.4.0-rc2 compatibility * Remove command EnergyReset 1..3 now replaced by ENergyReset1 to EnergyReset3 * Remove spaces in JSON messages (code size reduction) * Renamed xsns_05_ds18x20.ino to xsns_05_ds18x20_legacy.ino still using library OneWire and providing dynamic sensor scan * Fix possible iram1_0_seg compile error by shrinking ICACHE_RAM_ATTR code usage * Fix PWM watchdog timeout if Dimmer is set to 100 or Color set to 0xFF (#1146) * Fix Sonoff Bridge Learn Mode hang caused by unrecognised RF code (#1181) * Fix blank console log window by using XML character encoding (#1187) * Fix wrong response name for command HlwISet (#1214) * Fix DHT type sensor timeout recognition by distinguish "signal already there" from "timeout" (#1233) * Add fixed color options 1..12 to command Color * Add + (plus) and - (minus) to commands Dimmer (+10/-10), Speed and Scheme * Add + (plus) and - (minus) to command Color to select 1 out of 12 preset colors * Add + (plus) and - (minus) to command Ct to control ColdWarm led ColorTemperature (+34/-34) * Add commands EnergyReset1 0..42500, EnergyReset2 0..42500 and EnergyReset3 0..42500000 * to (Re)set Energy Today, Yesterday or Total respectively in Wh (#406, #685, #1202) * Add optional ADS1115 driver as alternative for unsupported I2Cdevlib in esp8266-core 2.4.0-rc2 * Add support for INA219 Voltage and Current sensor to be enabled in user_config.h with define USE_INA219 * Add support for Arilux LC11 (Clearing RF home code when selecting no Arilux module) * Add support for WS2812 RGBW ledstrips to be enabled in user_config.h with define USE_WS2812_CTYPE (#1156) * Add SettingsSaveAll routine to command SaveData to be used before controlled power down (#1202) * Add option PUSHBUTTON_TOGGLE (SwitchMode 7) to allow toggling on any switch change (#1221) * Add new xdrv_05_ds18x20.ino free from library OneWire and add the following features: * Add support for DS1822 * Add forced setting of 12-bit resolution for selected device types (#1222) * Add read temperature retry counter (#1215) * Fix lost sensors by performing sensor probe at restart only thereby removing dynamic sensor probe (#1215) * Fix sensor address sorting using ascending sort on sensor type followed by sensor address * Rewrite JSON resulting in shorter message allowing more sensors in default firmware image: * "DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6} * Add additional define in user_config.h to select either single sensor (defines disabled), new multi sensor (USE_DS18X20) or legacy multi sensor (USE_DS18X20_LEGACY) * Add clock support for more different pixel counts (#1226) * Add support for Sonoff Dual R2 (#1249) * Add FriendlyName to web page tab and add program information to web page footer (#1275)
243 lines
6.1 KiB
C++
243 lines
6.1 KiB
C++
/*
|
|
xsns_05_ds18b20.ino - DS18B20 temperature sensor support for Sonoff-Tasmota
|
|
|
|
Copyright (C) 2017 Theo Arends
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifdef USE_DS18B20
|
|
/*********************************************************************************************\
|
|
* DS18B20 - Temperature - Single sensor
|
|
\*********************************************************************************************/
|
|
|
|
#define W1_SKIP_ROM 0xCC
|
|
#define W1_CONVERT_TEMP 0x44
|
|
#define W1_READ_SCRATCHPAD 0xBE
|
|
|
|
float ds18b20_last_temperature = 0;
|
|
uint16_t ds18b20_last_result = 0;
|
|
uint8_t ds18x20_pin = 0;
|
|
|
|
/*********************************************************************************************\
|
|
* Embedded stripped and tuned OneWire library
|
|
\*********************************************************************************************/
|
|
|
|
uint8_t OneWireReset()
|
|
{
|
|
uint8_t retries = 125;
|
|
|
|
//noInterrupts();
|
|
pinMode(ds18x20_pin, INPUT);
|
|
do {
|
|
if (--retries == 0) {
|
|
return 0;
|
|
}
|
|
delayMicroseconds(2);
|
|
} while (!digitalRead(ds18x20_pin));
|
|
pinMode(ds18x20_pin, OUTPUT);
|
|
digitalWrite(ds18x20_pin, LOW);
|
|
delayMicroseconds(480);
|
|
pinMode(ds18x20_pin, INPUT);
|
|
delayMicroseconds(70);
|
|
uint8_t r = !digitalRead(ds18x20_pin);
|
|
//interrupts();
|
|
delayMicroseconds(410);
|
|
return r;
|
|
}
|
|
|
|
void OneWireWriteBit(uint8_t v)
|
|
{
|
|
static const uint8_t delay_low[2] = { 65, 10 };
|
|
static const uint8_t delay_high[2] = { 5, 55 };
|
|
|
|
v &= 1;
|
|
//noInterrupts();
|
|
digitalWrite(ds18x20_pin, LOW);
|
|
pinMode(ds18x20_pin, OUTPUT);
|
|
delayMicroseconds(delay_low[v]);
|
|
digitalWrite(ds18x20_pin, HIGH);
|
|
//interrupts();
|
|
delayMicroseconds(delay_high[v]);
|
|
}
|
|
|
|
uint8_t OneWireReadBit()
|
|
{
|
|
//noInterrupts();
|
|
pinMode(ds18x20_pin, OUTPUT);
|
|
digitalWrite(ds18x20_pin, LOW);
|
|
delayMicroseconds(3);
|
|
pinMode(ds18x20_pin, INPUT);
|
|
delayMicroseconds(10);
|
|
uint8_t r = digitalRead(ds18x20_pin);
|
|
//interrupts();
|
|
delayMicroseconds(53);
|
|
return r;
|
|
}
|
|
|
|
void OneWireWrite(uint8_t v)
|
|
{
|
|
for (uint8_t bit_mask = 0x01; bit_mask; bit_mask <<= 1) {
|
|
OneWireWriteBit((bit_mask & v) ? 1 : 0);
|
|
}
|
|
}
|
|
|
|
uint8_t OneWireRead()
|
|
{
|
|
uint8_t r = 0;
|
|
|
|
for (uint8_t bit_mask = 0x01; bit_mask; bit_mask <<= 1) {
|
|
if (OneWireReadBit()) {
|
|
r |= bit_mask;
|
|
}
|
|
}
|
|
return r;
|
|
}
|
|
|
|
boolean OneWireCrc8(uint8_t *addr)
|
|
{
|
|
uint8_t crc = 0;
|
|
uint8_t len = 8;
|
|
|
|
while (len--) {
|
|
uint8_t inbyte = *addr++; // from 0 to 7
|
|
for (uint8_t i = 8; i; i--) {
|
|
uint8_t mix = (crc ^ inbyte) & 0x01;
|
|
crc >>= 1;
|
|
if (mix) {
|
|
crc ^= 0x8C;
|
|
}
|
|
inbyte >>= 1;
|
|
}
|
|
}
|
|
return (crc == *addr); // addr 8
|
|
}
|
|
|
|
/********************************************************************************************/
|
|
|
|
void Ds18x20Init()
|
|
{
|
|
ds18x20_pin = pin[GPIO_DSB];
|
|
}
|
|
|
|
void Ds18x20Convert()
|
|
{
|
|
OneWireReset();
|
|
OneWireWrite(W1_SKIP_ROM); // Address all Sensors on Bus
|
|
OneWireWrite(W1_CONVERT_TEMP); // start conversion, no parasite power on at the end
|
|
// delay(750); // 750ms should be enough for 12bit conv
|
|
}
|
|
|
|
boolean Ds18b20Read(float &t)
|
|
{
|
|
uint8_t data[9];
|
|
int8_t sign = 1;
|
|
|
|
if (!ds18b20_last_temperature) {
|
|
t = NAN;
|
|
} else {
|
|
ds18b20_last_result++;
|
|
if (ds18b20_last_result > 4) { // Reset after 4 misses
|
|
ds18b20_last_temperature = NAN;
|
|
}
|
|
t = ds18b20_last_temperature;
|
|
}
|
|
|
|
/*
|
|
if (!OneWireReadBit()) { //check measurement end
|
|
AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DSB D_SENSOR_BUSY));
|
|
return !isnan(t);
|
|
}
|
|
*/
|
|
for (uint8_t retry = 0; retry < 3; retry++) {
|
|
OneWireReset();
|
|
OneWireWrite(W1_SKIP_ROM);
|
|
OneWireWrite(W1_READ_SCRATCHPAD);
|
|
for (uint8_t i = 0; i < 9; i++) {
|
|
data[i] = OneWireRead();
|
|
}
|
|
if (OneWireCrc8(data)) {
|
|
uint16_t temp12 = (data[1] << 8) + data[0];
|
|
if (temp12 > 2047) {
|
|
temp12 = (~temp12) +1;
|
|
sign = -1;
|
|
}
|
|
t = ConvertTemp(sign * temp12 * 0.0625);
|
|
ds18b20_last_result = 0;
|
|
}
|
|
if (!isnan(t)) {
|
|
ds18b20_last_temperature = t;
|
|
return true;
|
|
}
|
|
}
|
|
AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DSB D_SENSOR_CRC_ERROR));
|
|
return !isnan(t);
|
|
}
|
|
|
|
void Ds18b20Show(boolean json)
|
|
{
|
|
float t;
|
|
|
|
if (Ds18b20Read(t)) { // Check if read failed
|
|
char temperature[10];
|
|
|
|
dtostrfi(t, Settings.flag2.temperature_resolution, temperature);
|
|
|
|
if(json) {
|
|
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"DS18B20\":{\"" D_TEMPERATURE "\":%s}"), mqtt_data, temperature);
|
|
#ifdef USE_DOMOTICZ
|
|
DomoticzSensor(DZ_TEMP, temperature);
|
|
#endif // USE_DOMOTICZ
|
|
#ifdef USE_WEBSERVER
|
|
} else {
|
|
snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_TEMP, mqtt_data, "DS18B20", temperature, TempUnit());
|
|
#endif // USE_WEBSERVER
|
|
}
|
|
}
|
|
}
|
|
|
|
/*********************************************************************************************\
|
|
* Interface
|
|
\*********************************************************************************************/
|
|
|
|
#define XSNS_05
|
|
|
|
boolean Xsns05(byte function)
|
|
{
|
|
boolean result = false;
|
|
|
|
if (pin[GPIO_DSB] < 99) {
|
|
switch (function) {
|
|
case FUNC_XSNS_INIT:
|
|
Ds18x20Init();
|
|
break;
|
|
case FUNC_XSNS_PREP:
|
|
Ds18x20Convert(); // Start conversion, takes up to one second
|
|
break;
|
|
case FUNC_XSNS_JSON_APPEND:
|
|
Ds18b20Show(1);
|
|
break;
|
|
#ifdef USE_WEBSERVER
|
|
case FUNC_XSNS_WEB:
|
|
Ds18b20Show(0);
|
|
Ds18x20Convert(); // Start conversion, takes up to one second
|
|
break;
|
|
#endif // USE_WEBSERVER
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
#endif // USE_DS18B20
|