From ec5f2ffe9a70ac0bc343309f917f9dd67af83f42 Mon Sep 17 00:00:00 2001 From: Jens Eden Date: Wed, 17 Dec 2014 16:37:14 +0000 Subject: [PATCH] fix string parser to allow character 'B' in beta release firmware string --- motorApp/OmsAsynSrc/omsBaseController.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/motorApp/OmsAsynSrc/omsBaseController.cpp b/motorApp/OmsAsynSrc/omsBaseController.cpp index 860d1478..46b0feb7 100644 --- a/motorApp/OmsAsynSrc/omsBaseController.cpp +++ b/motorApp/OmsAsynSrc/omsBaseController.cpp @@ -436,8 +436,11 @@ asynStatus omsBaseController::getFirmwareVersion() count++; errlogPrintf("OMS Firmware Version: %s\n", inputBuffer); } - // - if ((p = strstr(inputBuffer, "ver:"))){ + //beta versions have a B as first letter + if ((p = strstr(inputBuffer, "ver:B"))){ + count = sscanf(p, "ver:B%d.%d.%d,", &fwMajor, &fwMinor, &fwRevision); + } + else if ((p = strstr(inputBuffer, "ver:"))){ count = sscanf(p, "ver:%d.%d.%d,", &fwMajor, &fwMinor, &fwRevision); } if ((p == NULL) || (count < 2)) {