New Devices

[owTools.git] / src / owDeviceConfig.cpp

diff --git a/src/owDeviceConfig.cpp b/src/owDeviceConfig.cpp
index 1703957..5c86c05 100644 (file)
--- 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];
                }
 }