tm3d
/
owTools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new Formula
[owTools.git]
/
src
/
owDeviceConfig.cpp
diff --git
a/src/owDeviceConfig.cpp
b/src/owDeviceConfig.cpp
index
66bc9df
..
1703957
100644
(file)
--- a/
src/owDeviceConfig.cpp
+++ b/
src/owDeviceConfig.cpp
@@
-279,7
+279,12
@@
double owDeviceConfig::calculateValueFromNumber(int code, int vn, std::vector<in
case 19:return V[vn]/500.0*14.0;break; //Test
case 20:return V[vn]*0.5+700;break;
case 21:return V[vn]+1280; break;
case 19:return V[vn]/500.0*14.0;break; //Test
case 20:return V[vn]*0.5+700;break;
case 21:return V[vn]+1280; break;
- default:return 0;
+ case 22:return V[vn]*10;break;
+ case 23:return V[vn]*0.025+700.0;break;
+ case 24:return V[vn]*1.1/1024.0;break;
+ case 25:return V[vn]*3.0/1024.0;break;
+ case 26:return V[vn]*5.0/1024.0;break;
+ default:return V[vn];
}
}
}
}
@@
-313,6
+318,8
@@
std::string owDeviceConfig::getSensorChip(uint8_t ch) {
case 24: s="BMP680";break;
case 25: s="SGP30";break;
case 26: s="SGPC3";break;
case 24: s="BMP680";break;
case 25: s="SGP30";break;
case 26: s="SGPC3";break;
+ case 27: s="iAQ-core C";break;
+ case 28: s="HDC2010";break;
default: return "";
}
return s;
default: return "";
}
return s;