Only use one button in GUI

README.md

@@ -16,10 +16,6 @@ This app can connect to a compatible transmitter over a serial port and then pro
 
 ![Screenshot](https://i.imgur.com/x0hnWq5.png)
 
-First, press `Connect` to establish a connection to your Transmitter. As soon as it is working the current stick positions will be visualized. Then, press `Create` to create a virtual HID Gamepad.
-
-As long as both have been initialized, you can use your Transmitter in your Simulator. The connection will be closed and the virtual device destroyed automatically when you close the App window.
-
 ## foohid command-line app
 
 This small utility does the same thing as the SerialGamepad.app without a graphical user interface.

SerialGamepad/Base.lproj/MainMenu.xib

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="14F1505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="14F1509" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
@@ -677,7 +677,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fCd-m1-NwV">
-                        <rect key="frame" x="14" y="169" width="152" height="32"/>
+                        <rect key="frame" x="14" y="169" width="302" height="32"/>
                         <buttonCell key="cell" type="push" title="Connect" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="adp-gD-EEf">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -686,16 +686,6 @@
                             <action selector="connectButtonPressed:" target="QvC-M9-y7g" id="3UW-Gk-OUp"/>
                         </connections>
                     </button>
-                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="v8W-R7-l4G">
-                        <rect key="frame" x="164" y="169" width="152" height="32"/>
-                        <buttonCell key="cell" type="push" title="Create" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="EEe-0L-Dx7">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="createButtonPressed:" target="QvC-M9-y7g" id="Iff-L2-DFe"/>
-                        </connections>
-                    </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" maxValue="1023" warningValue="2000" criticalValue="2000" levelIndicatorStyle="continuousCapacity" id="xcx-tB-hUl"/>
@@ -736,7 +726,6 @@
             </view>
             <connections>
                 <outlet property="connectButton" destination="fCd-m1-NwV" id="3l3-JM-thL"/>
-                <outlet property="createButton" destination="v8W-R7-l4G" id="dGA-CN-AUM"/>
                 <outlet property="level1" destination="Bo5-fb-a0u" id="EHR-Gm-wah"/>
                 <outlet property="level2" destination="LlC-lV-IAQ" id="iMK-OU-OLi"/>
                 <outlet property="level3" destination="URz-Id-X9n" id="dgR-4v-LBR"/>

SerialGamepad/Info.plist

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

SerialGamepad/MainWindow.h

@@ -24,8 +24,6 @@
 
 @property (strong) Thread *serialThread;
 
-@property (assign) BOOL gamepadCreated;
-
 - (void)populatePortList;
 - (void)setChannels:(id)data;
 

SerialGamepad/MainWindow.m

@@ -16,25 +16,21 @@
 
 @synthesize portList, connectButton, createButton;
 @synthesize level1, level2, level3, level4, level5, level6;
-@synthesize serialThread, gamepadCreated;
+@synthesize serialThread;
 
 - (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) {
+        [fooHID close];
+        
         // Stop thread and wait for it to finish
         [serialThread setRunning:NO];
         while ([serialThread isFinished] == NO) {
@@ -54,26 +50,18 @@
         if ([serialThread openPort] != 0) {
             serialThread = nil;
         } else {
-            [serialThread start];
-            [connectButton setTitle:@"Disconnect"];
+            if ([fooHID init] == 0) {
+                [serialThread start];
+                [connectButton setTitle:@"Disconnect"];
+            } else {
+                serialThread = nil;
+            }
         }
     } else {
         [serialThread setRunning:NO];
         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"];
-        }
+        [connectButton setTitle:@"Connect"];
     }
 }
 
@@ -108,7 +96,7 @@
         [level5 setDoubleValue:[[data objectAtIndex:4] doubleValue]];
         [level6 setDoubleValue:[[data objectAtIndex:5] doubleValue]];
         
-        if (gamepadCreated) {
+        if (serialThread != nil) {
             [fooHID send:data];
         }
     }