Permalink
Browse files

Merge branch 'master' of github.com:pushsnowboarding/Push-Snowboarding

  • Loading branch information...
2 parents 4a19784 + 1855376 commit f299873ec60862ac1ea4d8cd1ae45affa7548953 cpscotti committed Jun 14, 2011
@@ -59,7 +59,7 @@ class PushN8BtDevice : public PushBurtonGenericDevice
QString getDetails();
- QString get_description();
+ virtual QString getName();
bool is_online();
@@ -83,3 +83,8 @@ char PushN8FootDevice::get_side()
{
return side;
}
+
+QString PushN8FootDevice::getName()
+{
+ return "push.n8.bt.foot";
+}
@@ -45,6 +45,8 @@ class PushN8FootDevice : public PushN8BtDevice
char get_side();
+ virtual QString getName();
+
private:
char side;
@@ -66,3 +66,8 @@ void PushN8GSRDevice::gotDataReceived(QString data)
}
// qDebug() << "Data received: " << data;
}
+
+QString PushN8GSRDevice::getName()
+{
+ return "push.n8.bt.gsr";
+}
@@ -43,6 +43,8 @@ class PushN8GSRDevice : public PushN8BtDevice
~PushN8GSRDevice();
+ virtual QString getName();
+
public slots:
void gotDataReceived(QString);
#endif
@@ -66,3 +66,8 @@ void PushN8HeartDevice::gotDataReceived(QString data)
}
}
}
+
+QString PushN8HeartDevice::getName()
+{
+ return "push.n8.bt.heart";
+}
@@ -44,6 +44,8 @@ class PushN8HeartDevice : public PushN8BtDevice
~PushN8HeartDevice();
+ virtual QString getName();
+
public slots:
void gotDataReceived(QString);
#endif
@@ -79,3 +79,8 @@ void PushN8IMUDevice::gotDataReceived(QString data)
}
+
+QString PushN8IMUDevice::getName()
+{
+ return "push.n8.bt.imu";
+}
@@ -43,6 +43,8 @@ class PushN8IMUDevice : public PushN8BtDevice
~PushN8IMUDevice();
+ virtual QString getName();
+
public slots:
void gotDataReceived(QString);

0 comments on commit f299873

Please sign in to comment.