MAC port

git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@68 47cf9a05-e0a8-4ed5-9e9b-101a649bc004

diff --git a/KeyboardDebug/KeyboardDebug/keyboarddebug.cpp b/KeyboardDebug/KeyboardDebug/keyboarddebug.cpp
index 274757bcc2471c4b14bbc1afd37056ae5bdb06f0..0da23cbc6a1fc37c5423b82e47f3036f390e23f9 100644 (file)
--- a/KeyboardDebug/KeyboardDebug/keyboarddebug.cpp
+++ b/KeyboardDebug/KeyboardDebug/keyboarddebug.cpp
@@ -8,8 +8,12 @@ KeyboardDebug::KeyboardDebug(QWidget *parent, Qt::WFlags flags)
        ui.setupUi(this);\r
        try\r
        {\r
-               _keyboardController = new DynamicKeyboardController("COM5", 115200);\r
-               getState();\r
+#ifdef WIN32\r
+        _keyboardController = new DynamicKeyboardController("COM5", 115200);\r
+#elif defined __MACOSX__\r
+        _keyboardController = new DynamicKeyboardController("/dev/tty.usbmodemfd121", 115200);\r
+#endif\r
+        getState();\r
        }\r
        catch (...)\r
        {\r
@@ -42,7 +46,6 @@ KeyboardDebug::~KeyboardDebug()
 \r
 inline bool isChecked(QCheckBox *c)\r
 {\r
-       bool a = c->checkState() > 0;\r
        return c->checkState() > 0;\r
 }\r
  \r
@@ -92,8 +95,11 @@ void KeyboardDebug::getState()
 {\r
        UINT16 solenoids, duration;\r
        UINT8 min, max;\r
-       if (_keyboardController)\r
-               _keyboardController->getState(solenoids, min, max, duration);\r
+    if (!_keyboardController)\r
+        return;\r
+\r
+    if (!_keyboardController->getState(solenoids, min, max, duration))\r
+        return;\r
 \r
        ui.s1->setChecked(solenoids & 0x8000);\r
        ui.s2->setChecked(solenoids & 0x4000);\r

diff --git a/KeyboardDebug/KeyboardDebug/keyboarddebug.h b/KeyboardDebug/KeyboardDebug/keyboarddebug.h
index 59869e449699dc69625e234f710d5cec4d33e358..82b83fda8020256eda2ebbfe88f97c737bb0bead 100644 (file)
--- a/KeyboardDebug/KeyboardDebug/keyboarddebug.h
+++ b/KeyboardDebug/KeyboardDebug/keyboarddebug.h
@@ -4,7 +4,7 @@
 #include <QtGui/QMainWindow>\r
 #include "ui_keyboarddebug.h"\r
 \r
-#include <DynamicKeyboardLibrary\DynamicKeyboardController.h>\r
+#include <DynamicKeyboardLibrary/DynamicKeyboardController.h>\r
 \r
 class KeyboardDebug : public QMainWindow\r
 {\r