Changeset 768

Timestamp:

08/31/09 16:10:30 (4 years ago)

Author:

atorf

Message:

• Implemented former patch for MacOS support
• Simple: Uses Windows/Fantom? code for USB, uses Linux fwrite to serial port for BT
• Careful: It all works because sometimes inside the BT-code, we just ask "if ispc", and else we do stuff for both Linux and Mac implicitely…
• Fixes #8

Location:

trunk/mfiles

Files:

• COM_CloseNXT.m (modified) (2 diffs)
• COM_CollectPacket.m (modified) (2 diffs)
• COM_OpenNXTEx.m (modified) (3 diffs)
• COM_SendPacket.m (modified) (2 diffs)
• private/checkHandleStruct.m (modified) (3 diffs)

trunk/mfiles/COM_CloseNXT.m

@@ -64 +64 @@
 % Signature
 %   Author: Linus Atorf (see AUTHORS)
-%   Date: 2008/07/09
+%   Date: 2009/08/31
 %   Copyright: 2007-2009, RWTH Aachen University
 %
@@ -137 +137 @@
         if h.ConnectionTypeValue == 1 % USB
             textOut(sprintf('Closing handle (USB) with MAC = %s (handle was %.1f minutes old)\n', h.NXTMAC, etime(clock, h.CreationTime) / 60));
-            if h.OSValue == 1 % win
+            if (h.OSValue == 1) || (h.OSValue == 3) % Windows and Mac
                 USB_CloseHandle_Windows(h);
             else % linux

trunk/mfiles/COM_CollectPacket.m

@@ -58 +58 @@
 % Signature
 %   Author: Linus Atorf (see AUTHORS)
-%   Date: 2007/10/14
+%   Date: 2009/08/31
 %   Copyright: 2007-2009, RWTH Aachen University
 %
@@ -93 +93 @@
 
     if handle.ConnectionTypeValue == 1 % USB
-        if handle.OSValue == 1 % Windows
+        if (handle.OSValue == 1) || (handle.OSValue == 3) % Windows and Mac
             [type cmd statusbyte content] = USB_CollectPacket_Windows(handle);
         else % Linux

trunk/mfiles/COM_OpenNXTEx.m

@@ -100 +100 @@
 % Signature
 %   Author: Linus Atorf (see AUTHORS)
-%   Date: 2009/07/10
+%   Date: 2009/08/31
 %   Copyright: 2007-2009, RWTH Aachen University
 %
@@ -254 +254 @@
         h.OSName    = 'Windows';
         h.OSValue   = 1;
-    else % no support for Mac yet...
-        h.OSName    = 'Linux';
-        h.OSValue   = 2;
+    else % mac or linux
+        if ismac
+            h.OSName    = 'Mac';
+            h.OSValue   = 3;
+        else
+            h.OSName    = 'Linux';
+            h.OSValue   = 2;
+        end%if
     end%if
 
@@ -487 +492 @@
     textOut(sprintf('Opening USB connection...\n'));
     
-    if hIn.OSValue == 1
+    if (hIn.OSValue == 1) || (hIn.OSValue == 3) % Windows and Mac
         hOut = USB_OpenHandle_Windows(hIn, SuppressErrors);
-    elseif hIn.OSValue == 2
+    elseif hIn.OSValue == 2 % Linux
         hOut = USB_OpenHandle_Linux(hIn, SuppressErrors);
     end%if

trunk/mfiles/COM_SendPacket.m

@@ -34 +34 @@
 % Signature
 %   Author: Linus Atorf (see AUTHORS)
-%   Date: 2008/07/09
+%   Date: 2009/08/31
 %   Copyright: 2007-2009, RWTH Aachen University
 %
@@ -72 +72 @@
         end%if
         
-        if handle.OSValue == 1 % Windows
+        if (handle.OSValue == 1) || (handle.OSValue == 3) % Windows and Mac
             USB_SendAndCollectPacket_Windows(Packet(3:end), handle);
         else % Linux

trunk/mfiles/private/checkHandleStruct.m

@@ -17 +17 @@
 %   Author: Linus Atorf (see AUTHORS)
 %   Date: 2008/07/01
-%   Copyright: 2007-2009, RWTH Aachen University
-;
+%   Copyright: 2007-2008, RWTH Aachen University
 %
 % ***********************************************************************************************
@@ -63 +62 @@
                     end%if
                 end%if
-            else % Linux
+            elseif h.OSValue == 2 % Linux
                 if h.ConnectionTypeValue == 1 % USB
                      if ~isnumeric(h.Handle) % also possible: isa('libpointer') ?
@@ -69 +68 @@
                      end%if
                 else % BT
+                    if isfloat(h.Handle)
+                        valid = true;
+                    end%if
+                end%if
+            else % Mac
+                if h.ConnectionTypeValue == 1 % USB, Windows part for USB
+                    if isfloat(h.Handle)
+                        valid = true;
+                    end%if
+                else % BT, Linux part for BT
                     if isfloat(h.Handle)
                         valid = true;