andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-07 20:29:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

1-wire fix & simplification

Browse Source
This commit is contained in:
Andrey Klimov
2020-05-08 02:53:47 +03:00
parent 56a0360823
commit e4a5c37cf9
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lighthub/owTerm.cpp
View File

@@ -102,7 +102,7 @@ int owSetup(owChangedType owCh) {
// Pass our oneWire reference to Dallas Temperature. // Pass our oneWire reference to Dallas Temperature.
sensors = new DallasTemperature(oneWire); // sensors = new DallasTemperature(oneWire);
term = new DeviceAddress[t_max]; term = new DeviceAddress[t_max];
//regs = new int [t_max]; //regs = new int [t_max];
@@ -119,23 +119,22 @@ int owSetup(owChangedType owCh) {
#else #else
oneWire->setActivePullup(); oneWire->setActivePullup();
#endif #endif
owChanged = owCh;
debugSerial.println(F("\tChecking for 1-Wire devices...")); debugSerial.println(F("\tChecking for 1-Wire devices..."));
if (oneWire->wireReset()) if (oneWire->wireReset())
debugSerial.println(F("\tReset done")); debugSerial.println(F("\tReset done"));
/*
if (oneWire->getError() == DS2482_ERROR_SHORT) if (oneWire->getError() == DS2482_ERROR_SHORT)
{ {
debugSerial<<F("1-wire shorted.")<<endl; debugSerial<<F("1-wire shorted.")<<endl;
return false; return false;
} }
sensors = new DallasTemperature(oneWire);
sensors->begin(); sensors->begin();
owChanged = owCh;
//owUpdate();
//debugSerial.println(F("\t1-w Updated"));
sensors->setWaitForConversion(false); sensors->setWaitForConversion(false);
*/
return true; return true;
} }
@@ -152,11 +151,20 @@ int owSetup(owChangedType owCh) {
int sensors_loop(void) { int sensors_loop(void) {
if (!sensors) return 100000;
if (oneWire->getError() == DS2482_ERROR_SHORT) if (oneWire->getError() == DS2482_ERROR_SHORT)
{ {
debugSerial<<F("1-wire disabled (shorted)")<<endl; debugSerial<<F("1-wire shorted")<<endl;
return 100000; oneWire->wireReset();
return 10000;
}
if (!sensors)
{
sensors = new DallasTemperature(oneWire);
sensors->begin();
sensors->setWaitForConversion(false);
// return 100000;
} }
if (si >= t_count) { if (si >= t_count) {
@@ -207,7 +215,7 @@ void owAdd(DeviceAddress addr) {
PrintBytes(term[t_count], 8,0); PrintBytes(term[t_count], 8,0);
debugSerial.println(); debugSerial.println();
if (term[t_count][0] == 0x28) { if (term[t_count][0] == 0x28) {
sensors->setResolution(term[t_count], TEMPERATURE_PRECISION); //// sensors->setResolution(term[t_count], TEMPERATURE_PRECISION);
oneWire->setStrongPullup(); oneWire->setStrongPullup();
// sensors.requestTemperaturesByAddress(term[t_count]); // sensors.requestTemperaturesByAddress(term[t_count]);
} }