Fixes lasting incom(m)ing reading misspelling; does heel/toe swap; th…

…at's it.
cpscotti · Mar 8, 2011 · 3924da5 · 3924da5
1 parent 5e17244
commit 3924da5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/PushBurton2/npushfoottick.cpp b/PushBurton2/npushfoottick.cpp
@@ -90,7 +90,7 @@ void NPushFootTick::dump_to_xml(QXmlStreamWriter& xml) const
 
 QString NPushFootTick::get_pretty_print() const
 {
-    return QString("Foot: [%1;%2;%3]")
+    return QString("Foot: [%1;T:%2;H:%3]")
             .arg(QString(side))
             .arg(QString::number(toes))
             .arg(QString::number(heel));

diff --git a/PushBurton2/pushdevicesholder.cpp b/PushBurton2/pushdevicesholder.cpp
@@ -92,7 +92,7 @@ void PushDevicesHolder::push_back(PushBurtonGenericDevice* ptr)
             //If new device subscribes to it //PS: This enables recursion!!
             if(ptr->subscribesTo(iptr) || typeid(*iptr) == typeid(PushN8SimulationDevice)) {
                 qDebug() << "Connected " << iptr->get_description() << "\'s output to " << ptr->get_description();
-                ptr->connect(iptr, SIGNAL(reading_ready(NPushLogTick*)), ptr, SLOT(incomming_reading(NPushLogTick*)), Qt::UniqueConnection);
+                ptr->connect(iptr, SIGNAL(reading_ready(NPushLogTick*)), ptr, SLOT(incoming_reading(NPushLogTick*)), Qt::UniqueConnection);
             }
         }
     }
@@ -103,7 +103,7 @@ void PushDevicesHolder::push_back(PushBurtonGenericDevice* ptr)
         if(iptr->subscribesToAny()) {
             if(iptr->subscribesTo(ptr)) {
                 qDebug() << "Connected " << ptr->get_description() << "\'s output to " << iptr->get_description();
-                iptr->connect(ptr, SIGNAL(reading_ready(NPushLogTick*)), iptr, SLOT(incomming_reading(NPushLogTick*)), Qt::UniqueConnection);
+                iptr->connect(ptr, SIGNAL(reading_ready(NPushLogTick*)), iptr, SLOT(incoming_reading(NPushLogTick*)), Qt::UniqueConnection);
             }
         }
     }

diff --git a/PushBurton2/pushn8footdevice.cpp b/PushBurton2/pushn8footdevice.cpp
@@ -61,8 +61,11 @@ void PushN8FootDevice::gotDataReceived(QString data)
     QStringList params;
     if(getPackage(data, params))
     {
-        int ntoes = params[1].toInt();
+//        int ntoes = params[1].toInt();//Want to flip, this is it!
-        int nheel = params[2].toInt();
+//        int nheel = params[2].toInt();// THIS IS THE OLD SETUP
+
+        int ntoes = params[2].toInt();//Want to flip, this is it!
+        int nheel = params[1].toInt();// THIS IS THE NEW SETUP for the v3 boxes
 
         NPushFootTick * newFootTick = new NPushFootTick(side, ntoes, nheel);