Merge pull request #509 from nicost/U2

Utilities: better way to fix conundrum of 3.3 versus 3.30
micro-manager · Oct 16, 2024 · 216ddd7 · 216ddd7
2 parents 0174e02 + cc60ed9
commit 216ddd7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/DeviceAdapters/Utilities/DATTLStateDevice.cpp b/DeviceAdapters/Utilities/DATTLStateDevice.cpp
@@ -391,8 +391,9 @@ int DATTLStateDevice::OnTTLLevel(MM::PropertyBase* pProp, MM::ActionType eAct)
 {
    if (eAct == MM::BeforeGet)
    {
-
-      pProp->Set(CDeviceUtils::ConvertToString(ttlVoltage_));
+      char buffer[8];
+      snprintf(buffer, sizeof(buffer), "%.1f", ttlVoltage_);
+      pProp->Set(buffer);
    }
    else if (eAct == MM::AfterSet)
    {

diff --git a/DeviceAdapters/Utilities/Utilities.cpp b/DeviceAdapters/Utilities/Utilities.cpp
@@ -65,8 +65,8 @@ const char* g_normalLogicString = "Normal";
 const char* g_invertedLogicString = "Inverted";
 const char* g_InvertLogic = "Invert Logic";
 const char* g_TTLVoltage = "TTL Voltage";
-const char* g_3_3 = "3.30";
-const char* g_5_0 = "5.00";
+const char* g_3_3 = "3.3";
+const char* g_5_0 = "5.0";