Removed Thread, moved code into Serial

CaseLights.xcodeproj/project.pbxproj

@@ -11,7 +11,6 @@
 		E9109B151C2AAEFD00726111 /* SystemInfoKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = E9109B0B1C2AAC1B00726111 /* SystemInfoKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		E9109B191C2AAFE100726111 /* GPUStats.m in Sources */ = {isa = PBXBuildFile; fileRef = E9109B181C2AAFE100726111 /* GPUStats.m */; };
 		E9AB18011C29F8CD00BF3C51 /* Serial.m in Sources */ = {isa = PBXBuildFile; fileRef = E9AB18001C29F8CD00BF3C51 /* Serial.m */; };
-		E9AB18061C2A173500BF3C51 /* Thread.m in Sources */ = {isa = PBXBuildFile; fileRef = E9AB18051C2A173500BF3C51 /* Thread.m */; };
 		E9F13E031C28B3D3004C6B95 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E9F13E021C28B3D3004C6B95 /* AppDelegate.m */; };
 		E9F13E061C28B3D3004C6B95 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E9F13E051C28B3D3004C6B95 /* main.m */; };
 		E9F13E081C28B3D3004C6B95 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E9F13E071C28B3D3004C6B95 /* Assets.xcassets */; };
@@ -61,8 +60,6 @@
 		E9109B181C2AAFE100726111 /* GPUStats.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUStats.m; path = CaseLights/GPUStats.m; sourceTree = "<group>"; };
 		E9AB17FF1C29F8CD00BF3C51 /* Serial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Serial.h; path = CaseLights/Serial.h; sourceTree = "<group>"; };
 		E9AB18001C29F8CD00BF3C51 /* Serial.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Serial.m; path = CaseLights/Serial.m; sourceTree = "<group>"; };
-		E9AB18041C2A173500BF3C51 /* Thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Thread.h; sourceTree = "<group>"; };
-		E9AB18051C2A173500BF3C51 /* Thread.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Thread.m; sourceTree = "<group>"; };
 		E9F13DFE1C28B3D3004C6B95 /* CaseLights.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CaseLights.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		E9F13E011C28B3D3004C6B95 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		E9F13E021C28B3D3004C6B95 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -127,8 +124,6 @@
 			children = (
 				E9F13E011C28B3D3004C6B95 /* AppDelegate.h */,
 				E9F13E021C28B3D3004C6B95 /* AppDelegate.m */,
-				E9AB18041C2A173500BF3C51 /* Thread.h */,
-				E9AB18051C2A173500BF3C51 /* Thread.m */,
 				E9109B161C2AAFA200726111 /* LowLevel */,
 				E9F13E071C28B3D3004C6B95 /* Assets.xcassets */,
 				E9F13E091C28B3D3004C6B95 /* MainMenu.xib */,
@@ -262,7 +257,6 @@
 				E9109B191C2AAFE100726111 /* GPUStats.m in Sources */,
 				E9F13E061C28B3D3004C6B95 /* main.m in Sources */,
 				E9F13E031C28B3D3004C6B95 /* AppDelegate.m in Sources */,
-				E9AB18061C2A173500BF3C51 /* Thread.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

CaseLights/AppDelegate.m

@@ -79,13 +79,37 @@
         // TODO Enable item if it was last used
     }
     
+    JSKSystemMonitor *systemMonitor = [JSKSystemMonitor systemMonitor];
+    
+#ifdef DEBUG
+    JSKMCPUUsageInfo cpuUsageInfo = systemMonitor.cpuUsageInfo;
+    NSLog(@"CPU Usage: %.3f%%\n", cpuUsageInfo.usage);
+    
+    JSKMMemoryUsageInfo memoryUsageInfo = systemMonitor.memoryUsageInfo;
+    NSLog(@"Memory Usage: %.2fGB Free, %.2fGB Used, %.2fGB Active, %.2fGB Inactive, %.2fGB Compressed, %.2fGB Wired\n", memoryUsageInfo.freeMemory / (1024.0 * 1024.0 * 1024.0), memoryUsageInfo.usedMemory / (1024.0 * 1024.0 * 1024.0), memoryUsageInfo.activeMemory / (1024.0 * 1024.0 * 1024.0), memoryUsageInfo.inactiveMemory / (1024.0 * 1024.0 * 1024.0), memoryUsageInfo.compressedMemory / (1024.0 * 1024.0 * 1024.0), memoryUsageInfo.wiredMemory / (1024.0 * 1024.0 * 1024.0));
+#endif
+    
+    // Add CPU Usage menu item
+    NSMenuItem *cpuUsageItem = [[NSMenuItem alloc] initWithTitle:@"CPU Usage" action:@selector(selectedCPUVisualization:) keyEquivalent:@""];
+    [menuVisualizations addItem:cpuUsageItem];
+    
+    // TODO enable item if it was last used
+    
+    // Add Memory Usage item
+    NSMenuItem *memoryUsageItem = [[NSMenuItem alloc] initWithTitle:@"RAM Usage" action:@selector(selectedMemoryVisualization:) keyEquivalent:@""];
+    [menuVisualizations addItem:memoryUsageItem];
+    
+    // TODO enable item if it was last used
+    
     // Check available temperatures and add menu items
     JSKSMC *smc = [JSKSMC smc];
     for (int i = 0; i < [[smc workingTempKeys] count]; i++) {
         NSString *key = [smc.workingTempKeys objectAtIndex:i];
-        //NSString *name = [smc humanReadableNameForKey:key];
         
-        //NSLog(@"%@: %@\n", key, name);
+#ifdef DEBUG
+        NSString *name = [smc humanReadableNameForKey:key];
+        NSLog(@"Sensor \"%@\": \"%@\"\n", key, name);
+#endif
         
         if ([key isEqualToString:@"TC0D"]) {
             NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:@"CPU Temperature" action:@selector(selectedCPUVisualization:) keyEquivalent:@""];
@@ -94,26 +118,14 @@
             // TODO enable item if it was last used
         }
         
-        // TODO add GPU temperature item
+        if ([key isEqualToString:@"TG0D"]) {
+            NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:@"GPU Temperature" action:@selector(selectedGPUVisualization:) keyEquivalent:@""];
+            [menuVisualizations addItem:item];
+            
+            // TODO enable item if it was last used
+        }
     }
     
-    // Add CPU Usage menu item
-    NSMenuItem *cpuUsageItem = [[NSMenuItem alloc] initWithTitle:@"CPU Usage" action:@selector(selectedCPUVisualization:) keyEquivalent:@""];
-    [menuVisualizations addItem:cpuUsageItem];
-    
-    // TODO enable item if it was last used
-    
-    // Add Memory Usage item
-    NSMenuItem *memoryUsageItem = [[NSMenuItem alloc] initWithTitle:@"RAM Usage" action:@selector(selectedMemoryVisualization:) keyEquivalent:@""];
-    [menuVisualizations addItem:memoryUsageItem];
-    
-    // TODO enable item if it was last used
-    
-    JSKSystemMonitor *systemMonitor = [JSKSystemMonitor systemMonitor];
-    //JSKMCPUUsageInfo cpuUsageInfo = systemMonitor.cpuUsageInfo;
-    JSKMMemoryUsageInfo memoryUsageInfo = systemMonitor.memoryUsageInfo;
-    NSLog(@"Memory Usage: %lld Free, %lld Used, %lld Active, %lld Inactive, %lld Compressed, %lld Wired\n", memoryUsageInfo.freeMemory / 1000000, memoryUsageInfo.usedMemory / 1000000, memoryUsageInfo.activeMemory / 1000000, memoryUsageInfo.inactiveMemory / 1000000, memoryUsageInfo.compressedMemory / 1000000, memoryUsageInfo.wiredMemory / 1000000);
-    
     // Prepare serial port menu
     NSArray *ports = [Serial listSerialPorts];
     if ([ports count] > 0) {
@@ -237,6 +249,13 @@
         // TODO store new selection
         
         // TODO send command
+    } else if ([sender.title isEqualToString:@"GPU Temperature"]) {
+        // Turn on "off" menu item
+        [sender setState:NSOnState];
+        
+        // TODO store new selection
+        
+        // TODO send command
     } else {
         NSLog(@"Unknown GPU Visualization selected!\n");
     }

CaseLights/GPUStats.m

@@ -43,12 +43,13 @@
                         CFNumberGetValue((CFNumberRef)gpuUsage, kCFNumberSInt64Type, &gpuUsageNum);
                         CFNumberGetValue((CFNumberRef)freeVRAM, kCFNumberSInt64Type, &freeVRAMNum);
                         CFNumberGetValue((CFNumberRef)usedVRAM, kCFNumberSInt64Type, &usedVRAMNum);
-                        *usage = [NSNumber numberWithDouble:gpuUsageNum / (double)10000000];
+                        *usage = [NSNumber numberWithDouble:gpuUsageNum / 10000000.0];
                         *free = [NSNumber numberWithDouble:freeVRAMNum];
                         *used = [NSNumber numberWithDouble:usedVRAMNum];
                         
-                        //NSLog(@"GPU: %.3f%% VRAM: %.3f%%\n", gpuUsageNum / (double)10000000,
-                              //usedVRAMNum / (double)(freeVRAMNum + usedVRAMNum) * 100.0);
+#ifdef DEBUG
+                        NSLog(@"GPU: %.3f%% VRAM: %.3f%% (%.2fMB)\n", gpuUsageNum / 10000000.0, ((double)usedVRAMNum) / (freeVRAMNum + usedVRAMNum) * 100.0, (usedVRAMNum + freeVRAMNum) / (1024.0 * 1024.0));
+#endif
                     }
                 }
                 CFRelease(services);

CaseLights/Info.plist

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

CaseLights/Serial.h

@@ -10,6 +10,12 @@
 
 @interface Serial : NSObject
 
+@property int fd;
+@property (strong) NSString *portName;
+
+- (NSInteger)openPort;
+- (NSInteger)hasData;
+
 + (NSArray *)listSerialPorts;
 
 @end

CaseLights/Serial.m

@@ -13,6 +13,12 @@
 #import <IOKit/IOKitLib.h>
 #import <IOKit/serial/IOSerialKeys.h>
 
+#import <termios.h>
+#import <fcntl.h>
+#import <unistd.h>
+#import <poll.h>
+#import <sys/ioctl.h>
+
 #import "Serial.h"
 
 kern_return_t findSerialPorts(io_iterator_t *matches);
@@ -20,6 +26,75 @@ kern_return_t getSerialPortPath(io_iterator_t serialPortIterator, char **deviceF
 
 @implementation Serial
 
+@synthesize fd, portName;
+
+- (NSInteger)openPort {
+    // We need a port name
+    if (portName == nil) {
+        NSLog(@"Can't open serial port without name!\n");
+        return 1;
+    }
+    
+    // Check if there was already a port opened
+    if (fd != -1) {
+        NSLog(@"Closing previously opened serial port \"%@\"!\n", portName);
+        close(fd);
+    }
+    
+    // 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 \"%@\": %s (%d)!\n", portName, strerror(errno), errno);
+        return 1;
+    }
+    
+    // Prevent additional opens except by root-owned processes
+    if (ioctl(fd, TIOCEXCL) == -1) {
+        NSLog(@"Error enabling exclusive access on \"%@\": %s (%d)!\n", portName, strerror(errno), errno);
+        return 1;
+    }
+    
+    fcntl(fd, F_SETFL, 0); // Enable blocking I/O
+    
+    // Read current settings
+    struct termios options;
+    tcgetattr(fd, &options);
+    
+    // Clear all settings
+    options.c_lflag = 0;
+    options.c_oflag = 0;
+    options.c_iflag = 0;
+    options.c_cflag = 0;
+    
+    options.c_cflag |= CS8; // 8 data bits
+    options.c_cflag |= CREAD; // Enable receiver
+    options.c_cflag |= CLOCAL; // Ignore modem status lines
+    
+    // Set Baudrate
+    cfsetispeed(&options, B115200);
+    cfsetospeed(&options, B115200);
+    
+    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;
+}
+
+- (NSInteger)hasData {
+    struct pollfd fds;
+    fds.fd = fd;
+    fds.events = (POLLIN | POLLPRI); // Data may be read
+    if (poll(&fds, 1, 0) > 0) {
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
 + (NSArray *)listSerialPorts {
     // Get Iterator with all serial ports
     io_iterator_t serialPortIterator;

CaseLights/Thread.h

@@ -1,23 +0,0 @@
-//
-//  Thread.h
-//  SerialGamepad
-//
-//  Created by Thomas Buck on 15.12.15.
-//  Copyright © 2015 xythobuz. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@class AppDelegate;
-
-@interface Thread : NSThread
-
-@property BOOL running;
-@property int fd;
-@property (strong) NSString *portName;
-@property (weak) AppDelegate *appDelegate;
-
-- (id)initWithDelegate:(AppDelegate *)delegate;
-- (NSInteger)openPort;
-
-@end

CaseLights/Thread.m

@@ -1,93 +0,0 @@
-//
-//  Thread.m
-//  SerialGamepad
-//
-//  Created by Thomas Buck on 15.12.15.
-//  Copyright © 2015 xythobuz. All rights reserved.
-//
-
-#import <termios.h>
-#import <fcntl.h>
-#import <unistd.h>
-#include <poll.h>
-
-#import "Thread.h"
-#import "AppDelegate.h"
-
-@implementation Thread
-
-@synthesize running, fd, portName, appDelegate;
-
-- (id)initWithDelegate:(AppDelegate *)delegate {
-    self = [super init];
-    if (self != nil) {
-        appDelegate = delegate;
-    }
-    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); // Enable blocking I/O
-    
-    // Read current settings
-    struct termios options;
-    tcgetattr(fd, &options);
-    
-    options.c_lflag = 0;
-    options.c_oflag = 0;
-    options.c_iflag = 0;
-    options.c_cflag = 0;
-    
-    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; // 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;
-}
-
-- (NSInteger)hasData {
-    struct pollfd fds;
-    fds.fd = fd;
-    fds.events = (POLLIN | POLLPRI); // Data may be read
-    if (poll(&fds, 1, 0) > 0) {
-        return 1;
-    } else {
-        return 0;
-    }
-}
-
-- (void)main {
-    NSLog(@"Connection running...\n");
-    
-    running = YES;
-    while (running) {
-        
-    }
-    
-    close(fd);
-    NSLog(@"Connection closed...\n");
-    fd = -1;
-}
-
-@end