tm3d
/
owTools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct errors in database SQL
[owTools.git]
/
src
/
owDeviceConfig.cpp
diff --git
a/src/owDeviceConfig.cpp
b/src/owDeviceConfig.cpp
index
21dc7fe
..
9262567
100644
(file)
--- a/
src/owDeviceConfig.cpp
+++ b/
src/owDeviceConfig.cpp
@@
-242,7
+242,8
@@
double owDeviceConfig::calculateValueFromNumber(int code, int vn, std::vector<in
case 14:return (V[vn] - 32767.0) / 100.0; break;
case 15:return exp((V[vn]-32767.0)/1000.0); break;
case 16:return V[vn]/32.0; break;
case 14:return (V[vn] - 32767.0) / 100.0; break;
case 15:return exp((V[vn]-32767.0)/1000.0); break;
case 16:return V[vn]/32.0; break;
- case 17:return 5120.0/V[vn]; break; //Current of DS2438 with 0.025 Ohm;
+ case 17:return V[vn]*0.2441/1000.0; break; //Vsens DS2438
+ case 18:return V[vn]/8.0;break;
default:return 0;
}
}
default:return 0;
}
}
@@
-270,6
+271,9
@@
std::string owDeviceConfig::getSensorChip(uint8_t ch) {
case 17: s="MAX1164/TGS8100";break; // VOC-Sensor
case 18: s="TGS8100 direkt";break; // VOC-Sensor
case 19: s="DS2423";break; // Counter
case 17: s="MAX1164/TGS8100";break; // VOC-Sensor
case 18: s="TGS8100 direkt";break; // VOC-Sensor
case 19: s="DS2423";break; // Counter
+ case 20: s="Intern ADC";break;
+ case 21: s="SHT35";break; // Feuchte/Temperatur Bester
+ case 22: s="SHT31";break; // Feuchte/Temperautr
default: return "";
}
return s;
default: return "";
}
return s;