From e842d9f2d7aa4dd6b55e4e1e84e850a2f2c82331 Mon Sep 17 00:00:00 2001
From: Raphael Grimm <raphael.grimm@kit.edu>
Date: Wed, 23 Jan 2019 18:27:19 +0100
Subject: [PATCH] Fix regex in BLEProthesisInterfaceQtWorker
---
.../BLEProthesisInterfaceQtWorker.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/source/RobotAPI/drivers/KITProstheticHandDriver/BLEProthesisInterfaceQtWorker.cpp b/source/RobotAPI/drivers/KITProstheticHandDriver/BLEProthesisInterfaceQtWorker.cpp
index adc9d2a80..0f5294d5f 100644
--- a/source/RobotAPI/drivers/KITProstheticHandDriver/BLEProthesisInterfaceQtWorker.cpp
+++ b/source/RobotAPI/drivers/KITProstheticHandDriver/BLEProthesisInterfaceQtWorker.cpp
@@ -346,8 +346,8 @@ void BLEProthesisInterfaceQtWorker::consumeData<BLEProthesisInterface::SensorVal
}
auto listPacks = _valueAkk.split('\n');
- static const QRegularExpression m2(R"(^M2:[ \t]+Pos.:[ \t]+(-?[1-9][0-9]*)[ \t]+PWM:[ \t]+(-?[1-9][0-9]*)[ \t]+$)");
- static const QRegularExpression m3(R"(^M3:[ \t]+Pos.:[ \t]+(-?[1-9][0-9]*)[ \t]+PWM:[ \t]+(-?[1-9][0-9]*)[ \t]+$)");
+ static const QRegularExpression m2(R"(^M2:[ \t]+Pos.:[ \t]+(-?[1-9][0-9]*|0)[ \t]+PWM:[ \t]+(-?[1-9][0-9]*|0)[ \t\n\r]+$)");
+ static const QRegularExpression m3(R"(^M3:[ \t]+Pos.:[ \t]+(-?[1-9][0-9]*|0)[ \t]+PWM:[ \t]+(-?[1-9][0-9]*|0)[ \t\n\r]+$)");
for (int i = 0; i < listPacks.size() - 1; ++i)
{
@@ -379,7 +379,7 @@ void BLEProthesisInterfaceQtWorker::consumeData<BLEProthesisInterface::SensorVal
}
else
{
- qWarning() << "unknown format for data: " << listPacks.at(i) << "\nSkipping";
+ qWarning() << "unknown format for data: " << listPacks.at(i).toLocal8Bit() << "\nSkipping";
}
}
_valueAkk = listPacks.back();
--
GitLab