From: Thomas Pietrzak <thomas.pietrzak@gmail.com>
Date: Fri, 16 Mar 2012 14:17:36 +0000 (+0000)
Subject: MAC port
X-Git-Url: https://git.thomaspietrzak.com/?a=commitdiff_plain;h=0a1a4fd2b572e7280eb515b3115a00ca44d338db;p=Widgetkeyboard.git

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 274757b..0da23cb 100644
--- a/KeyboardDebug/KeyboardDebug/keyboarddebug.cpp
+++ b/KeyboardDebug/KeyboardDebug/keyboarddebug.cpp
@@ -8,8 +8,12 @@ KeyboardDebug::KeyboardDebug(QWidget *parent, Qt::WFlags flags)
 	ui.setupUi(this);
 	try
 	{
-		_keyboardController = new DynamicKeyboardController("COM5", 115200);
-		getState();
+#ifdef WIN32
+        _keyboardController = new DynamicKeyboardController("COM5", 115200);
+#elif defined __MACOSX__
+        _keyboardController = new DynamicKeyboardController("/dev/tty.usbmodemfd121", 115200);
+#endif
+        getState();
 	}
 	catch (...)
 	{
@@ -42,7 +46,6 @@ KeyboardDebug::~KeyboardDebug()
 
 inline bool isChecked(QCheckBox *c)
 {
-	bool a = c->checkState() > 0;
 	return c->checkState() > 0;
 }
  
@@ -92,8 +95,11 @@ void KeyboardDebug::getState()
 {
 	UINT16 solenoids, duration;
 	UINT8 min, max;
-	if (_keyboardController)
-		_keyboardController->getState(solenoids, min, max, duration);
+    if (!_keyboardController)
+        return;
+
+    if (!_keyboardController->getState(solenoids, min, max, duration))
+        return;
 
 	ui.s1->setChecked(solenoids & 0x8000);
 	ui.s2->setChecked(solenoids & 0x4000);
diff --git a/KeyboardDebug/KeyboardDebug/keyboarddebug.h b/KeyboardDebug/KeyboardDebug/keyboarddebug.h
index 59869e4..82b83fd 100644
--- a/KeyboardDebug/KeyboardDebug/keyboarddebug.h
+++ b/KeyboardDebug/KeyboardDebug/keyboarddebug.h
@@ -4,7 +4,7 @@
 #include <QtGui/QMainWindow>
 #include "ui_keyboarddebug.h"
 
-#include <DynamicKeyboardLibrary\DynamicKeyboardController.h>
+#include <DynamicKeyboardLibrary/DynamicKeyboardController.h>
 
 class KeyboardDebug : public QMainWindow
 {