Fix for benchtest start and stopping, to show remaining events, and c…

…urrent event.
fredcooke · Mar 18, 2014 · 453d404 · 453d404
1 parent dca4c02
commit 453d404
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/core/wizards/BenchTest.qml b/core/wizards/BenchTest.qml
@@ -4,6 +4,10 @@ import QtQuick 1.1
 Item {
 	width:800
 	height:600
+    function benchTestReplyFunc(remaining,current) {
+        currentEvent.text = current;
+        eventsRemaining.text = remaining;
+    }
     Rectangle {
         x:0
         y:0
@@ -555,18 +559,13 @@ Item {
                                 a2dArray2[3] = sourcetext4.text;
                                 a2dArray2[4] = sourcetext5.text;
                                 a2dArray2[5] = sourcetext6.text;
-                                emscomms.benchTestReply.connect(benchTestReply);
+                                emscomms.benchTestReply.connect(benchTestReplyFunc);
                                 emscomms.startBenchTest(eventspercycletext.text,numberofcyclestext.text,tickspereventtext.text,a2dArray,a2dArray2);
                             }
                         }
                     }
                 }
             }
-            function benchTestReply(remaining,current)
-            {
-                currentEvent.text = current;
-                eventsRemaining.text = remaining;
-            }
 
             Rectangle {
                 //x:210

diff --git a/plugins/freeems/freeemscomms.cpp b/plugins/freeems/freeemscomms.cpp
@@ -684,7 +684,7 @@ int FreeEmsComms::startBenchTest(unsigned char eventspercycle,unsigned short num
 	QMutexLocker locker(&m_reqListMutex);
 	RequestClass req;
 	req.type = BENCHTEST;
-	req.addArg(0x08,sizeof(char)); //Was 0x01, changed to 0x08 for testing command failures.
+	req.addArg(0x01,sizeof(char));
 	req.addArg(eventspercycle,sizeof(eventspercycle));
 	req.addArg(numcycles,sizeof(numcycles));
 	req.addArg(ticksperevent,sizeof(ticksperevent));