Merge pull request #747 from slaclab/ESCRYODET-683

Map all epics floats to be doubles
slaclab · Oct 22, 2020 · 102403a · 102403a
2 parents b47f044 + f28a642
commit 102403a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/rogue/protocols/epicsV3/Value.cpp b/src/rogue/protocols/epicsV3/Value.cpp
@@ -147,15 +147,8 @@ void rpe::Value::initGdd(std::string typeStr, bool isEnum, uint32_t count) {
             bitSize, epicsName_.c_str(),typeStr.c_str());
    }
 
-   // 32-bit Float
-   else if ( typeStr == "float" or typeStr == "Float32" ) {
-      log_->info("Detected 32-bit float %s: typeStr=%s", epicsName_.c_str(),typeStr.c_str());
-      epicsType_ = aitEnumFloat32;
-      fSize_ = 4;
-   }
-
-   // 64-bit float
-   else if ( typeStr == "Float64" ) {
+   // Treat all floats as 64-bit
+   else if ( (typeStr.find("float") == 0) || ( typeStr.find("Double") == 0 ) || ( typeStr.find("Float") == 0 )) {
       log_->info("Detected 64-bit float %s: typeStr=%s", epicsName_.c_str(),typeStr.c_str());
       epicsType_ = aitEnumFloat64;
       fSize_ = 8;

diff --git a/tests/test_device.py b/tests/test_device.py
@@ -346,6 +346,11 @@ def parseBuildStamp(var, val):
             mode = 'RW',
             value = ''))
 
+        self.add(pr.LocalVariable(
+            name = 'TestFloatConv',
+            mode = 'RO',
+            value = 614.4))
+
         @self.command(hidden=False,value='',retValue='')
         def TestCommand(arg):
             return('Got {}'.format(arg))