Open and close selected port. Can now relist serial ports.

CaseLights/AppDelegate.h

@@ -8,6 +8,8 @@
 
 #import <Cocoa/Cocoa.h>
 
+@class Serial;
+
 @interface AppDelegate : NSObject <NSApplicationDelegate>
 
 @property (weak) IBOutlet NSMenu *statusMenu;
@@ -26,5 +28,7 @@
 
 @property (strong) NSDictionary *staticColors;
 
+@property (strong) Serial *serial;
+
 @end
 

CaseLights/AppDelegate.m

@@ -26,8 +26,11 @@
 @synthesize buttonOff, buttonLights;
 @synthesize statusItem, statusImage;
 @synthesize staticColors;
+@synthesize serial;
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
+    serial = [[Serial alloc] init];
+    
     // Prepare status bar menu
     statusImage = [NSImage imageNamed:@"MenuIcon"];
     [statusImage setTemplate:YES];
@@ -138,12 +141,17 @@
             // Set Enabled if it was used the last time
             if ((savedPort != nil) && [[ports objectAtIndex:i] isEqualToString:savedPort]) {
                 [[menuPorts itemAtIndex:i] setState:NSOnState];
+                
+                // Try to open serial port
+                [serial setPortName:savedPort];
+                if ([serial openPort]) {
+                    // Unselect it when an error occured opening the port
+                    [[menuPorts itemAtIndex:i] setState:NSOffState];
+                }
             }
         }
     }
     
-    // TODO Open serial port, if it was already specified and found
-    
     // Restore previously used lights configuration
     if (turnOnLights) {
         // TODO Turn on lights
@@ -158,8 +166,27 @@
 }
 
 - (void)applicationWillTerminate:(NSNotification *)aNotification {
-    // TODO Close serial port, if it was specified and opened
-    
+    // Close serial port, if it was opened
+    if ([serial isOpen]) {
+        [serial closePort];
+    }
+}
+- (IBAction)relistSerialPorts:(id)sender {
+    // Refill port list
+    NSArray *ports = [Serial listSerialPorts];
+    [menuPorts removeAllItems];
+    for (int i = 0; i < [ports count]; i++) {
+        // Add Menu Item for this port
+        NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:[ports objectAtIndex:i] action:@selector(selectedSerialPort:) keyEquivalent:@""];
+        [menuPorts addItem:item];
+        
+        // Mark it if it is currently open
+        if ([serial isOpen]) {
+            if ([[ports objectAtIndex:i] isEqualToString:[serial portName]]) {
+                [[menuPorts itemAtIndex:i] setState:NSOnState];
+            }
+        }
+    }
 }
 
 - (IBAction)turnLEDsOff:(NSMenuItem *)sender {
@@ -328,9 +355,18 @@
     // Select only the current port
     [source setState:NSOnState];
     
-    // TODO Close previously opened port, if any
+    // Close previously opened port, if any
+    if ([serial isOpen]) {
+        [serial closePort];
+    }
     
-    // TODO Try to open selected port
+    // Try to open selected port
+    [serial setPortName:[source title]];
+    if ([serial openPort] != 0) {
+        [source setState:NSOffState];
+    } else {
+        // TODO Restore the current configuration
+    }
 }
 
 - (IBAction)showAbout:(id)sender {

CaseLights/Base.lproj/MainMenu.xib

@@ -710,6 +710,12 @@
                         </items>
                     </menu>
                 </menuItem>
+                <menuItem title="Relist Serial Ports" id="jVd-gl-Z6F">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="relistSerialPorts:" target="Voe-Tx-rLC" id="iFU-PL-xR8"/>
+                    </connections>
+                </menuItem>
                 <menuItem title="About CaseLights" id="GeK-ey-XEn">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>

CaseLights/Info.plist

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

CaseLights/Serial.h

@@ -1,6 +1,6 @@
 //
 //  Serial.h
-//  SerialGamepad
+//  CaseLights
 //
 //  Created by Thomas Buck on 14.12.15.
 //  Copyright © 2015 xythobuz. All rights reserved.
@@ -10,11 +10,13 @@
 
 @interface Serial : NSObject
 
-@property int fd;
 @property (strong) NSString *portName;
 
 - (NSInteger)openPort;
-- (NSInteger)hasData;
+- (void)closePort;
+- (BOOL)isOpen;
+- (BOOL)hasData;
+- (void)sendString:(NSString *)string;
 
 + (NSArray *)listSerialPorts;
 

CaseLights/Serial.m

@@ -1,6 +1,6 @@
 //
 //  Serial.m
-//  SerialGamepad / CaseLights
+//  CaseLights
 //
 //  For more informations refer to this document:
 //  https://developer.apple.com/library/mac/documentation/DeviceDrivers/Conceptual/WorkingWSerial/WWSerial_SerialDevs/SerialDevices.html
@@ -21,13 +21,28 @@
 
 #import "Serial.h"
 
-kern_return_t findSerialPorts(io_iterator_t *matches);
-kern_return_t getSerialPortPath(io_iterator_t serialPortIterator, char **deviceFilePath, CFIndex maxPathCount, CFIndex maxPathSize);
+@interface Serial ()
+
+@property (assign) int fd;
+
++ (kern_return_t)findSerialPorts:(io_iterator_t *)matches;
++ (kern_return_t)getSerialPortPath:(io_iterator_t)serialPortIterator to:(char **)deviceFilePath with:(CFIndex)maxPathCount and:(CFIndex)maxPathSize;
+
+@end
 
 @implementation Serial
 
 @synthesize fd, portName;
 
+- (id)init {
+    self = [super init];
+    if (self != nil) {
+        fd = -1;
+        portName = nil;
+    }
+    return self;
+}
+
 - (NSInteger)openPort {
     // We need a port name
     if (portName == nil) {
@@ -36,11 +51,15 @@ kern_return_t getSerialPortPath(io_iterator_t serialPortIterator, char **deviceF
     }
     
     // Check if there was already a port opened
-    if (fd != -1) {
+    if (fd > -1) {
         NSLog(@"Closing previously opened serial port \"%@\"!\n", portName);
         close(fd);
     }
     
+#ifdef DEBUG
+    NSLog(@"Opening serial port \"%@\"...\n", portName);
+#endif
+    
     // Open port read-only, without controlling terminal, non-blocking
     fd = open([portName UTF8String], O_RDONLY | O_NOCTTY | O_NONBLOCK);
     if (fd == -1) {
@@ -84,21 +103,70 @@ kern_return_t getSerialPortPath(io_iterator_t serialPortIterator, char **deviceF
     return 0;
 }
 
-- (NSInteger)hasData {
+- (void)closePort {
+#ifdef DEBUG
+    NSLog(@"Closing serial port \"%@\"...\n", portName);
+#endif
+    
+    if (fd > -1) {
+        close(fd);
+    } else {
+        NSLog(@"Trying to close already closed port!\n");
+    }
+    fd = -1;
+}
+
+- (BOOL)isOpen {
+    if (fd > -1) {
+        return YES;
+    } else {
+        return NO;
+    }
+}
+
+- (BOOL)hasData {
+    if (fd < 0) {
+        NSLog(@"Error trying to poll a closed port!\n");
+        return NO;
+    }
+    
     struct pollfd fds;
     fds.fd = fd;
     fds.events = (POLLIN | POLLPRI); // Data may be read
-    if (poll(&fds, 1, 0) > 0) {
-        return 1;
+    int val = poll(&fds, 1, 0);
+    if (val > 0) {
+        return YES;
+    } else if (val == 0) {
+        return NO;
     } else {
-        return 0;
+        NSLog(@"Error polling serial port: %s (%d)!\n", strerror(errno), errno);
+        return NO;
+    }
+}
+
+- (void)sendString:(NSString *)string {
+    if (fd < 0) {
+        NSLog(@"Error trying to send to a closed port!\n");
+        return;
+    }
+    
+    const char *data = [string UTF8String];
+    size_t length = strlen(data);
+    ssize_t sent = 0;
+    while (sent < length) {
+        ssize_t ret = write(fd, data + sent, length - sent);
+        if (ret < 0) {
+            NSLog(@"Error writing to serial port: %s (%d)!\n", strerror(errno), errno);
+        } else {
+            sent += ret;
+        }
     }
 }
 
 + (NSArray *)listSerialPorts {
     // Get Iterator with all serial ports
     io_iterator_t serialPortIterator;
-    kern_return_t kernResult = findSerialPorts(&serialPortIterator);
+    kern_return_t kernResult = [Serial findSerialPorts:&serialPortIterator];
     
     // Create 2D array
     char **portList;
@@ -106,7 +174,7 @@ kern_return_t getSerialPortPath(io_iterator_t serialPortIterator, char **deviceF
     for (int i = 0; i < 100; i++) portList[i] = malloc(200 * sizeof(char));
     
     // Copy device name into C-String array
-    kernResult = getSerialPortPath(serialPortIterator, portList, 100, 200);
+    kernResult = [Serial getSerialPortPath:serialPortIterator to:portList with:100 and:200];
     IOObjectRelease(serialPortIterator);
     
     // Copy contents into NSString Array
@@ -125,9 +193,7 @@ kern_return_t getSerialPortPath(io_iterator_t serialPortIterator, char **deviceF
     return [[NSArray alloc] initWithObjects:stringList count:realCount];
 }
 
-@end
-
-kern_return_t findSerialPorts(io_iterator_t *matches) {
++ (kern_return_t)findSerialPorts:(io_iterator_t *)matches {
     kern_return_t kernResult;
     mach_port_t masterPort;
     CFMutableDictionaryRef classesToMatch;
@@ -165,7 +231,7 @@ kern_return_t findSerialPorts(io_iterator_t *matches) {
     return kernResult;
 }
 
-kern_return_t getSerialPortPath(io_iterator_t serialPortIterator, char **deviceFilePath, CFIndex maxPathCount, CFIndex maxPathSize) {
++ (kern_return_t)getSerialPortPath:(io_iterator_t)serialPortIterator to:(char **)deviceFilePath with:(CFIndex)maxPathCount and:(CFIndex)maxPathSize {
     io_object_t modemService;
     kern_return_t kernResult = KERN_FAILURE;
     CFIndex i = 0;
@@ -213,3 +279,5 @@ kern_return_t getSerialPortPath(io_iterator_t serialPortIterator, char **deviceF
     
     return kernResult;
 }
+
+@end