Implemented sending command for static colors and lights

CaseLights/AppDelegate.m

@@ -23,6 +23,9 @@
 #define TEXT_CPU_TEMPERATURE @"CPU Temperature"
 #define TEXT_GPU_TEMPERATURE @"GPU Temperature"
 
+#define KEY_CPU_TEMPERATURE @"TC0D"
+#define KEY_GPU_TEMPERATURE @"TG0D"
+
 @interface AppDelegate ()
 
 @property (weak) NSMenuItem *lastLEDMode;
@@ -60,8 +63,33 @@
     BOOL turnOnLights = [store boolForKey:PREF_LIGHTS_STATE];
     NSString *lastMode = [store stringForKey:PREF_LED_MODE];
     
+    // Prepare serial port menu
+    NSArray *ports = [Serial listSerialPorts];
+    if ([ports count] > 0) {
+        [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];
+            
+            // 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];
+                }
+            }
+        }
+    }
+    
+    // Select "Off" button if it was last selected
     if ([lastMode isEqualToString:@""]) {
-        [buttonOff setState:NSOnState];
+        [buttonOff setState:NSOffState];
+        [self turnLEDsOff:buttonOff];
     }
     
     // Prepare static colors menu
@@ -77,7 +105,7 @@
     for (NSString *key in [staticColors allKeys]) {
         NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:key action:@selector(selectedVisualization:) keyEquivalent:@""];
         if ([key isEqualToString:lastMode]) {
-            [item setState:NSOnState];
+            [self selectedVisualization:item];
         }
         [menuColors addItem:item];
     }
@@ -91,20 +119,20 @@
     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));
+    NSLog(@"Memory Usage: %.2fGB Free + %.2fGB Used = %.2fGB\n", memoryUsageInfo.freeMemory / (1024.0 * 1024.0 * 1024.0), memoryUsageInfo.usedMemory / (1024.0 * 1024.0 * 1024.0), (memoryUsageInfo.freeMemory + memoryUsageInfo.usedMemory) / (1024.0 * 1024.0 * 1024.0));
 #endif
     
     // Add CPU Usage menu item
     NSMenuItem *cpuUsageItem = [[NSMenuItem alloc] initWithTitle:TEXT_CPU_USAGE action:@selector(selectedVisualization:) keyEquivalent:@""];
     if ([lastMode isEqualToString:TEXT_CPU_USAGE]) {
-        [cpuUsageItem setState:NSOnState];
+        [self selectedVisualization:cpuUsageItem];
     }
     [menuVisualizations addItem:cpuUsageItem];
     
     // Add Memory Usage item
     NSMenuItem *memoryUsageItem = [[NSMenuItem alloc] initWithTitle:TEXT_RAM_USAGE action:@selector(selectedVisualization:) keyEquivalent:@""];
     if ([lastMode isEqualToString:TEXT_RAM_USAGE]) {
-        [memoryUsageItem setState:NSOnState];
+        [self selectedVisualization:memoryUsageItem];
     }
     [menuVisualizations addItem:memoryUsageItem];
     
@@ -117,13 +145,13 @@
     } else {
         NSMenuItem *itemUsage = [[NSMenuItem alloc] initWithTitle:TEXT_GPU_USAGE action:@selector(selectedVisualization:) keyEquivalent:@""];
         if ([lastMode isEqualToString:TEXT_GPU_USAGE]) {
-            [itemUsage setState:NSOnState];
+            [self selectedVisualization:itemUsage];
         }
         [menuVisualizations addItem:itemUsage];
         
         NSMenuItem *itemVRAM = [[NSMenuItem alloc] initWithTitle:TEXT_VRAM_USAGE action:@selector(selectedVisualization:) keyEquivalent:@""];
         if ([lastMode isEqualToString:TEXT_VRAM_USAGE]) {
-            [itemVRAM setState:NSOnState];
+            [self selectedVisualization:itemVRAM];
         }
         [menuVisualizations addItem:itemVRAM];
     }
@@ -137,58 +165,38 @@
         NSString *name = [smc humanReadableNameForKey:key];
         NSLog(@"Sensor \"%@\": \"%@\"\n", key, name);
 #endif
-        
-        if ([key isEqualToString:@"TC0D"]) {
+
+        if ([key isEqualToString:KEY_CPU_TEMPERATURE]) {
             NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:TEXT_CPU_TEMPERATURE action:@selector(selectedVisualization:) keyEquivalent:@""];
             if ([lastMode isEqualToString:TEXT_CPU_TEMPERATURE]) {
-                [item setState:NSOnState];
+                [self selectedVisualization:item];
             }
             [menuVisualizations addItem:item];
         }
         
-        if ([key isEqualToString:@"TG0D"]) {
+        if ([key isEqualToString:KEY_GPU_TEMPERATURE]) {
             NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:TEXT_GPU_TEMPERATURE action:@selector(selectedVisualization:) keyEquivalent:@""];
             if ([lastMode isEqualToString:TEXT_GPU_TEMPERATURE]) {
-                [item setState:NSOnState];
+                [self selectedVisualization:item];
             }
             [menuVisualizations addItem:item];
         }
     }
     
-    // Prepare serial port menu
-    NSArray *ports = [Serial listSerialPorts];
-    if ([ports count] > 0) {
-        [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];
-            
-            // 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];
-                }
-            }
-        }
-    }
-    
     // Restore previously used lights configuration
     if (turnOnLights) {
-        // TODO Turn on lights
+        // Turn on lights
+        if ([serial isOpen]) {
+            [serial sendString:@"UV 1\n"];
+        }
         
         [buttonLights setState:NSOnState];
     } else {
-        // TODO Turn off lights
-        
+        // Turn off lights
+        if ([serial isOpen]) {
+            [serial sendString:@"UV 0\n"];
+        }
     }
-    
-    // TODO Restore previously used LED configuration
 }
 
 - (void)applicationWillTerminate:(NSNotification *)aNotification {
@@ -248,10 +256,13 @@
         [store synchronize];
         
 #ifdef DEBUG
-        NSLog(@"Stored new mode: \"\"!\n");
+        NSLog(@"Stored new mode: \"off\"!\n");
 #endif
         
-        // TODO Send command to turn off LEDs
+        // Send command to turn off LEDs
+        if ([serial isOpen]) {
+            [serial sendString:@"RGB 0 0 0\n"];
+        }
     } else {
         // Try to restore last LED setting
         if (lastLEDMode != nil) {
@@ -262,11 +273,17 @@
 
 - (IBAction)toggleLights:(NSMenuItem *)sender {
     if ([sender state] == NSOffState) {
-        // TODO Turn on lights
+        // Turn on lights
+        if ([serial isOpen]) {
+            [serial sendString:@"UV 1\n"];
+        }
         
         [sender setState:NSOnState];
     } else {
-        // TODO Turn off lights
+        // Turn off lights
+        if ([serial isOpen]) {
+            [serial sendString:@"UV 0\n"];
+        }
         
         [sender setState:NSOffState];
     }
@@ -279,56 +296,61 @@
 
 - (void)selectedVisualization:(NSMenuItem *)sender {
     // Turn off all other LED menu items
-    for (int i = 0; i < [menuColors numberOfItems]; i++) {
-        [[menuColors itemAtIndex:i] setState:NSOffState];
+    if (menuColors != nil) {
+        for (int i = 0; i < [menuColors numberOfItems]; i++) {
+            [[menuColors itemAtIndex:i] setState:NSOffState];
+        }
     }
-    for (int i = 0; i < [menuAnimations numberOfItems]; i++) {
-        [[menuAnimations itemAtIndex:i] setState:NSOffState];
+    if (menuAnimations != nil) {
+        for (int i = 0; i < [menuAnimations numberOfItems]; i++) {
+            [[menuAnimations itemAtIndex:i] setState:NSOffState];
+        }
     }
-    for (int i = 0; i < [menuVisualizations numberOfItems]; i++) {
-        [[menuVisualizations itemAtIndex:i] setState:NSOffState];
+    if (menuVisualizations != nil) {
+        for (int i = 0; i < [menuVisualizations numberOfItems]; i++) {
+            [[menuVisualizations itemAtIndex:i] setState:NSOffState];
+        }
     }
     [buttonOff setState:NSOffState];
     [sender setState:NSOnState];
     
     if ([sender.title isEqualToString:TEXT_GPU_USAGE]) {
-        // TODO store new selection
-        
         // TODO send command
-    } else if ([sender.title isEqualToString:TEXT_VRAM_USAGE]) {
-        // TODO store new selection
         
+    } else if ([sender.title isEqualToString:TEXT_VRAM_USAGE]) {
         // TODO send command
-    } else if ([sender.title isEqualToString:TEXT_GPU_TEMPERATURE]) {
-        // TODO store new selection
         
+    } else if ([sender.title isEqualToString:TEXT_GPU_TEMPERATURE]) {
         // TODO send command
-    } else if ([sender.title isEqualToString:TEXT_CPU_USAGE]) {
-        // TODO store new selection
         
+    } else if ([sender.title isEqualToString:TEXT_CPU_USAGE]) {
         // TODO send command
-    } else if ([sender.title isEqualToString:TEXT_CPU_TEMPERATURE]) {
-        // TODO store new selection
         
+    } else if ([sender.title isEqualToString:TEXT_CPU_TEMPERATURE]) {
         // TODO send command
         
     } else if ([sender.title isEqualToString:TEXT_RAM_USAGE]) {
-        // TODO store new selection
-        
         // TODO send command
         
     } else {
         BOOL found = NO;
         
         // Check if a static color was selected
-        for (NSString *key in [staticColors allKeys]) {
-            if ([sender.title isEqualToString:key]) {
-                found = YES;
-                
-                // TODO store new selection
-                
-                // TODO send command
-                
+        if (staticColors != nil) {
+            for (NSString *key in [staticColors allKeys]) {
+                if ([sender.title isEqualToString:key]) {
+                    found = YES;
+                    
+                    NSColor *color = [staticColors valueForKey:key];
+                    unsigned char red = [color redComponent] * 255;
+                    unsigned char green = [color greenComponent] * 255;
+                    unsigned char blue = [color blueComponent] * 255;
+                    NSString *string = [NSString stringWithFormat:@"RGB %d %d %d\n", red, green, blue];
+                    
+                    if ([serial isOpen]) {
+                        [serial sendString:string];
+                    }
+                }
             }
         }
         

CaseLights/Info.plist

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

CaseLights/Serial.m

@@ -61,7 +61,7 @@
 #endif
     
     // Open port read-only, without controlling terminal, non-blocking
-    fd = open([portName UTF8String], O_RDONLY | O_NOCTTY | O_NONBLOCK);
+    fd = open([portName UTF8String], O_RDWR | O_NOCTTY | O_NONBLOCK);
     if (fd == -1) {
         NSLog(@"Error opening serial port \"%@\": %s (%d)!\n", portName, strerror(errno), errno);
         return 1;