X-Git-Url: http://git.smho.de/gw/?p=owTools.git;a=blobdiff_plain;f=src%2FowDeviceConfig.cpp;fp=src%2FowDeviceConfig.cpp;h=5c86c05a18688a25af90f743f658e0e56b6b5d31;hp=1703957519e7baffc16e691e3633fa2765abaced;hb=2d637281cefcc16f27911887827217744880e74c;hpb=385ca6e4fbf0ecb17fa2eb2a8f5d0a91811a754a

diff --git a/src/owDeviceConfig.cpp b/src/owDeviceConfig.cpp
index 1703957..5c86c05 100644
--- a/src/owDeviceConfig.cpp
+++ b/src/owDeviceConfig.cpp
@@ -284,6 +284,11 @@ double owDeviceConfig::calculateValueFromNumber(int code, int vn, std::vector<in
 			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;
+<<<<<<< HEAD
+			case 27:return ((double)V[2]+(double)V[1]/1000.0)/8.0;break;
+			case 28:return exp(V[vn]/2560.0);break;
+=======
+>>>>>>> origin/master
 			default:return V[vn];
 		}
 }