Fully implemented functionality

SerialGamepad/Base.lproj/MainMenu.xib

@@ -698,27 +698,27 @@
                     </button>
                     <levelIndicator verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bo5-fb-a0u">
                         <rect key="frame" x="20" y="140" width="290" height="16"/>
-                        <levelIndicatorCell key="cell" alignment="left" doubleValue="-511" minValue="-511" maxValue="511" warningValue="2000" criticalValue="2000" levelIndicatorStyle="continuousCapacity" id="xcx-tB-hUl"/>
+                        <levelIndicatorCell key="cell" alignment="left" maxValue="1023" warningValue="2000" criticalValue="2000" levelIndicatorStyle="continuousCapacity" id="xcx-tB-hUl"/>
                     </levelIndicator>
                     <levelIndicator verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LlC-lV-IAQ">
                         <rect key="frame" x="20" y="116" width="290" height="16"/>
-                        <levelIndicatorCell key="cell" alignment="left" doubleValue="-511" minValue="-511" maxValue="511" warningValue="2000" criticalValue="2000" levelIndicatorStyle="continuousCapacity" id="sb6-cl-NKs"/>
+                        <levelIndicatorCell key="cell" alignment="left" maxValue="1023" warningValue="2000" criticalValue="2000" levelIndicatorStyle="continuousCapacity" id="sb6-cl-NKs"/>
                     </levelIndicator>
                     <levelIndicator verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="URz-Id-X9n">
                         <rect key="frame" x="20" y="92" width="290" height="16"/>
-                        <levelIndicatorCell key="cell" alignment="left" doubleValue="-511" minValue="-511" maxValue="511" warningValue="2000" criticalValue="2000" levelIndicatorStyle="continuousCapacity" id="Sov-4g-u59"/>
+                        <levelIndicatorCell key="cell" alignment="left" maxValue="1023" warningValue="2000" criticalValue="2000" levelIndicatorStyle="continuousCapacity" id="Sov-4g-u59"/>
                     </levelIndicator>
                     <levelIndicator verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="txY-x4-Zyp">
                         <rect key="frame" x="20" y="68" width="290" height="16"/>
-                        <levelIndicatorCell key="cell" alignment="left" doubleValue="-511" minValue="-511" maxValue="511" warningValue="2000" criticalValue="2000" levelIndicatorStyle="continuousCapacity" id="RKp-wa-VLB"/>
+                        <levelIndicatorCell key="cell" alignment="left" maxValue="1023" warningValue="2000" criticalValue="2000" levelIndicatorStyle="continuousCapacity" id="RKp-wa-VLB"/>
                     </levelIndicator>
                     <levelIndicator verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VyV-eY-7y9">
                         <rect key="frame" x="20" y="44" width="290" height="16"/>
-                        <levelIndicatorCell key="cell" alignment="left" doubleValue="-511" minValue="-511" maxValue="511" warningValue="2000" criticalValue="2000" levelIndicatorStyle="continuousCapacity" id="CyL-Tq-w7d"/>
+                        <levelIndicatorCell key="cell" alignment="left" maxValue="1023" warningValue="2000" criticalValue="2000" levelIndicatorStyle="continuousCapacity" id="CyL-Tq-w7d"/>
                     </levelIndicator>
                     <levelIndicator verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vCW-tD-iWD">
                         <rect key="frame" x="20" y="20" width="290" height="16"/>
-                        <levelIndicatorCell key="cell" alignment="left" doubleValue="-511" minValue="-511" maxValue="511" warningValue="2000" criticalValue="2000" levelIndicatorStyle="continuousCapacity" id="nfv-aV-cRB"/>
+                        <levelIndicatorCell key="cell" alignment="left" maxValue="1023" warningValue="2000" criticalValue="2000" levelIndicatorStyle="continuousCapacity" id="nfv-aV-cRB"/>
                     </levelIndicator>
                     <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mvV-p0-WO6">
                         <rect key="frame" x="18" y="214" width="295" height="26"/>

SerialGamepad/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>61</string>
+	<string>87</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

SerialGamepad/MainWindow.h

@@ -8,9 +8,9 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "Thread.h"
+@class Thread;
 
-@interface MainWindow : NSWindow
+@interface MainWindow : NSWindow <NSWindowDelegate>
 
 @property (weak) IBOutlet NSPopUpButton *portList;
 @property (weak) IBOutlet NSButton *connectButton;
@@ -24,6 +24,9 @@
 
 @property (strong) Thread *serialThread;
 
+@property (assign) BOOL gamepadCreated;
+
 - (void)populatePortList;
+- (void)setChannels:(id)data;
 
 @end

SerialGamepad/MainWindow.m

@@ -8,17 +8,46 @@
 
 #import "MainWindow.h"
 
+#import "fooHID.h"
 #import "Serial.h"
+#import "Thread.h"
 
 @implementation MainWindow
 
 @synthesize portList, connectButton, createButton;
 @synthesize level1, level2, level3, level4, level5, level6;
-@synthesize serialThread;
+@synthesize serialThread, gamepadCreated;
+
+- (id)init {
+    self = [super init];
+    if (self != nil) {
+        serialThread = nil;
+        gamepadCreated = NO;
+        [self setDelegate:self];
+    }
+    return self;
+}
+
+- (BOOL)windowShouldClose:(id)sender {
+    if (gamepadCreated) {
+        [fooHID close];
+        gamepadCreated = NO;
+    }
+    
+    if (serialThread != nil) {
+        // Stop thread and wait for it to finish
+        [serialThread setRunning:NO];
+        while ([serialThread isFinished] == NO) {
+            usleep(1000);
+        }
+    }
+    
+    return YES;
+}
 
 - (IBAction)connectButtonPressed:(id)sender {
     if (serialThread == nil) {
-        serialThread = [[Thread alloc] init];
+        serialThread = [[Thread alloc] initWithWindow:self];
         [serialThread setName:@"Serial Communication"];
         [serialThread setPortName:[portList titleOfSelectedItem]];
         
@@ -30,15 +59,22 @@
         }
     } else {
         [serialThread setRunning:NO];
-        // TODO disable button, thread should call back when closed
-        // so we can set serialThread to nil then
         serialThread = nil;
         [connectButton setTitle:@"Connect"];
     }
 }
 
 - (IBAction)createButtonPressed:(id)sender {
-    
+    if (gamepadCreated) {
+        [fooHID close];
+        gamepadCreated = NO;
+        [createButton setTitle:@"Create"];
+    } else {
+        if ([fooHID init] == 0) {
+            gamepadCreated = YES;
+            [createButton setTitle:@"Destroy"];
+        }
+    }
 }
 
 - (void)populatePortList {
@@ -46,11 +82,36 @@
     if ([ports count] > 0) {
         [portList removeAllItems];
         [portList addItemsWithTitles:ports];
+        
+        for (int i = 0; i < [ports count]; i++) {
+            if ([[ports objectAtIndex:i] isEqualToString:@"/dev/tty.SLAB_USBtoUART"]) {
+                [portList selectItemAtIndex:i];
+            }
+        }
+        
         [portList setEnabled:YES];
         [connectButton setEnabled:YES];
+        [createButton setEnabled:YES];
     } else {
         NSLog(@"Couldn't find any serial ports!\n");
     }
 }
 
+- (void)setChannels:(id)data {
+    if ([data count] < 6) {
+        NSLog(@"Not enough channel data (%lu)?!\n", (unsigned long)[data count]);
+    } else {
+        [level1 setDoubleValue:[[data objectAtIndex:0] doubleValue]];
+        [level2 setDoubleValue:[[data objectAtIndex:1] doubleValue]];
+        [level3 setDoubleValue:[[data objectAtIndex:2] doubleValue]];
+        [level4 setDoubleValue:[[data objectAtIndex:3] doubleValue]];
+        [level5 setDoubleValue:[[data objectAtIndex:4] doubleValue]];
+        [level6 setDoubleValue:[[data objectAtIndex:5] doubleValue]];
+        
+        if (gamepadCreated) {
+            [fooHID send:data];
+        }
+    }
+}
+
 @end

SerialGamepad/Thread.h

@@ -8,12 +8,16 @@
 
 #import <Foundation/Foundation.h>
 
+@class MainWindow;
+
 @interface Thread : NSThread
 
 @property BOOL running;
 @property int fd;
 @property (strong) NSString *portName;
+@property (weak) MainWindow *mainWindow;
 
+- (id)initWithWindow:(MainWindow *)window;
 - (NSInteger)openPort;
 
 @end

SerialGamepad/Thread.m

@@ -12,24 +12,51 @@
 
 #import "Thread.h"
 #import "fooHID.h"
+#import "MainWindow.h"
+
+#define CHANNELS 6
+#define TESTCHANNEL 2
+#define PACKETSIZE 18
+#define HEADERBYTES 2
+#define CHECKSUMBYTES 2
+#define PAYLOADBYTES (PACKETSIZE - HEADERBYTES - CHECKSUMBYTES)
+#define HEADERBYTE_A 85
+#define HEADERBYTE_B 252
+
+enum ThreadState {
+    READ_FIRST_BYTE,
+    READ_SECOND_BYTE,
+    READ_PAYLOAD,
+    READ_CHECKSUM
+};
 
 @implementation Thread
 
-@synthesize running, fd, portName;
+@synthesize running, fd, portName, mainWindow;
+
+- (id)initWithWindow:(MainWindow *)window {
+    self = [super init];
+    if (self != nil) {
+        mainWindow = window;
+    }
+    return self;
+}
 
 - (NSInteger)openPort {
     if (portName == nil) {
         return 1;
     }
     
+    // Open port read-only, without controlling terminal, non-blocking
     fd = open([portName UTF8String], O_RDONLY | O_NOCTTY | O_NONBLOCK);
     if (fd == -1) {
         NSLog(@"Error opening serial port \"%@\"!\n", portName);
         return 1;
     }
     
-    fcntl(fd, F_SETFL, 0);
+    fcntl(fd, F_SETFL, 0); // Enable blocking I/O
     
+    // Read current settings
     struct termios options;
     tcgetattr(fd, &options);
     
@@ -38,41 +65,29 @@
     options.c_iflag = 0;
     options.c_cflag = 0;
     
-    options.c_cflag |= CS8;
-    options.c_cflag |= CREAD;
-    options.c_cflag |= CLOCAL;
+    options.c_cflag |= CS8; // 8 data bits
+    options.c_cflag |= CREAD; // Enable receiver
+    options.c_cflag |= CLOCAL; // Ignore modem status lines
     
     cfsetispeed(&options, B115200);
     cfsetospeed(&options, B115200);
     
-    options.c_cc[VMIN] = 0;
-    options.c_cc[VTIME] = 1;
+    options.c_cc[VMIN] = 0; // Return even with zero bytes...
+    options.c_cc[VTIME] = 1; // ...but only after .1 seconds
     
+    // Set new settings
     tcsetattr(fd, TCSANOW, &options);
     tcflush(fd, TCIOFLUSH);
     
     return 0;
 }
 
-#define PACKETSIZE 18
-#define HEADERBYTES 2
-#define CHECKSUMBYTES 2
-#define PAYLOADBYTES (PACKETSIZE - HEADERBYTES - CHECKSUMBYTES)
-#define HEADERBYTE_A 85
-#define HEADERBYTE_B 252
-
-enum ThreadState {
-    READ_FIRST_BYTE,
-    READ_SECOND_BYTE,
-    READ_PAYLOAD,
-    READ_CHECKSUM
-};
-
 - (void)main {
     enum ThreadState state = READ_FIRST_BYTE;
     unsigned char c = 0;
-    unsigned char buffer[PACKETSIZE];
+    unsigned char buffer[PAYLOADBYTES];
     unsigned char checksum[CHECKSUMBYTES];
+    uint16_t channels[CHANNELS + 1];
     int received = 0;
     
     NSLog(@"Connection running...\n");
@@ -107,7 +122,34 @@ enum ThreadState {
             if (received >= CHECKSUMBYTES) {
                 state = READ_FIRST_BYTE;
                 
-                // TODO got something
+                uint16_t sum = 0;
+                for (int i = 0; i < PAYLOADBYTES; i++) {
+                    sum += buffer[i];
+                }
+                
+                if (sum != ((checksum[0] << 8) | checksum[1])) {
+                    NSLog(@"Wrong checksum: %d != %d\n", sum, ((checksum[0] << 8) | checksum[1]));
+                } else {
+                    for (int i = 0; i < (CHANNELS + 1); i++) {
+                        channels[i] = buffer[2 * i] << 8;
+                        channels[i] |= buffer[(2 * i) + 1];
+                    
+                        if (i < CHANNELS) {
+                            channels[i] -= 1000;
+                        }
+                    }
+                    
+                    if (channels[CHANNELS] != channels[TESTCHANNEL]) {
+                        NSLog(@"Wrong test channel value: %d != %d\n", channels[CHANNELS], channels[TESTCHANNEL]);
+                    }
+                    
+                    NSMutableArray *arr = [[NSMutableArray alloc] initWithCapacity:CHANNELS];
+                    for (int i = 0; i < CHANNELS; i++) {
+                        [arr addObject:[[NSNumber alloc] initWithInteger:(NSInteger)channels[i]]];
+                    }
+                    
+                    [mainWindow performSelectorOnMainThread:@selector(setChannels:) withObject:arr waitUntilDone:NO];
+                }
             }
         } else {
             NSLog(@"Invalid state?!\n");

SerialGamepad/fooHID.m

@@ -59,7 +59,7 @@ struct gamepad_report_t {
 };
 
 static io_connect_t connector;
-static uint64_t input[4];
+static uint64_t deviceName = 0, deviceNameLength;
 static struct gamepad_report_t gamepad;
 
 /*
@@ -118,9 +118,14 @@ int foohidInit() {
     
     NSLog(@"Creating virtual HID device...\n");
     
-    input[0] = (uint64_t)strdup(VIRTUAL_DEVICE_NAME);
-    input[1] = strlen((char*)input[0]);
+    if (deviceName == 0) {
+        deviceName = (uint64_t)strdup(VIRTUAL_DEVICE_NAME);
+        deviceNameLength = strlen((char *)deviceName);
+    }
     
+    uint64_t input[4];
+    input[0] = deviceName;
+    input[1] = deviceNameLength;
     input[2] = (uint64_t)report_descriptor;
     input[3] = sizeof(report_descriptor);
     
@@ -138,6 +143,10 @@ int foohidInit() {
 void foohidClose() {
     NSLog(@"Destroying virtual HID device\n");
     
+    uint64_t input[2];
+    input[0] = deviceName;
+    input[1] = deviceNameLength;
+    
     uint32_t output_count = 1;
     uint64_t output = 0;
     kern_return_t ret = IOConnectCallScalarMethod(connector, FOOHID_DESTROY, input, 2, &output, &output_count);
@@ -170,6 +179,9 @@ void foohidSend(uint16_t *data) {
      NSLog(@"Aux 2: %d\n", gamepad.aux2);
      */
     
+    uint64_t input[4];
+    input[0] = deviceName;
+    input[1] = deviceNameLength;
     input[2] = (uint64_t)&gamepad;
     input[3] = sizeof(struct gamepad_report_t);