Add Famicom and SNES controller support

Author: magicien

JoyKeyMapper/DataModels/GameControllerIcon.swift

@@ -22,6 +22,10 @@ let joyconRBase = NSImage(named: "joycon_right_base")!
 let joyconRBody = NSImage(named: "joycon_right_body")!
 let joyconRButton = NSImage(named: "joycon_right_button")!
 
+let famicon_1 = NSImage(named: "famicon_1")!
+let famicon_2 = NSImage(named: "famicon_2")!
+let snescon = NSImage(named: "snescon")!
+
 let unknownController = NSImage(named: "unknown_controller")!
 
 let batteryFull = NSImage(named: "battery_full")!
@@ -41,6 +45,12 @@ func GameControllerIcon(for controller: GameController) -> NSImage {
         return createJoyConLIcon(for: controller)
     case .JoyConR:
         return createJoyConRIcon(for: controller)
+    case .FamicomController1:
+        return famicon_1
+    case .FamicomController2:
+        return famicon_2
+    case .SNESController:
+        return snescon
     default:
         return unknownController
     }

JoyKeyMapper/Views/KeyMapList/ViewController+NSOutlineViewDelegate.swift

@@ -31,7 +31,9 @@ let buttonNames: [JoyCon.Button: String] = [
     .LeftSL: "Left SL",
     .LeftSR: "Left SR",
     .RightSL: "Right SL",
-    .RightSR: "Right SR"
+    .RightSR: "Right SR",
+    .Start: "Start",
+    .Select: "Select",
 ]
 let directionNames: [JoyCon.StickDirection: String]  = [
     .Up: "Up",
@@ -45,7 +47,18 @@ let rightStickName = NSLocalizedString("Right Stick", comment: "Right Stick")
 let controllerButtons: [JoyCon.ControllerType: [JoyCon.Button]] = [
     .JoyConL: [.Up, .Right, .Down, .Left, .LeftSL, .LeftSR, .L, .ZL, .Minus, .Capture, .LStick],
     .JoyConR: [.A, .B, .X, .Y, .RightSL, .RightSR, .R, .ZR, .Plus, .Home, .RStick],
-    .ProController: [.A, .B, .X, .Y, .L, .ZL, .R, .ZR, .Up, .Right, .Down, .Left, .Minus, .Plus, .Capture, .Home, .LStick, .RStick]
+    .ProController: [.A, .B, .X, .Y, .L, .ZL, .R, .ZR, .Up, .Right, .Down, .Left, .Minus, .Plus, .Capture, .Home, .LStick, .RStick],
+    .FamicomController1: [.A, .B, .L, .R, .Up, .Right, .Down, .Left, .Start, .Select],
+    .FamicomController2: [.A, .B, .L, .R, .Up, .Right, .Down, .Left],
+    .SNESController: [.A, .B, .X, .Y, .L, .ZL, .R, .ZR, .Up, .Right, .Down, .Left, .Start, .Select],
+]
+let numSticks: [JoyCon.ControllerType: Int] = [
+    .JoyConL: 1,
+    .JoyConR: 1,
+    .ProController: 2,
+    .FamicomController1: 0,
+    .FamicomController2: 0,
+    .SNESController: 0
 ]
 let stickerDirections: [JoyCon.StickDirection] = [
     .Up, .Right, .Down, .Left
@@ -87,6 +100,10 @@ extension ViewController: NSOutlineViewDelegate, NSOutlineViewDataSource, KeyCon
         guard let buttons = controllerButtons[controller.type] else { return 0 }
         guard let config = self.selectedKeyConfig else { return 0 }
 
+        if controller.type == .unknown {
+            return 0
+        }
+        
         if let indexOfItem = item as? Int {
             let stickIndex = indexOfItem - buttons.count
 
@@ -111,13 +128,7 @@ extension ViewController: NSOutlineViewDelegate, NSOutlineViewDataSource, KeyCon
             return 0
         }
 
-        if controller.type == .JoyConL || controller.type == .JoyConR {
-            return buttons.count + 1
-        }
-        if controller.type == .ProController {
-            return buttons.count + 2
-        }
-        return 0
+        return buttons.count + (numSticks[controller.type] ?? 0)
     }
 
     func numberOfChildItemOfStick(for type: String?) -> Int {

Podfile

@@ -6,6 +6,6 @@ target 'JoyKeyMapper' do
   use_frameworks!
 
   # Pods for JoyKeyMapper
-  pod 'JoyConSwift', '0.1.2'
+  pod 'JoyConSwift', '0.2.1'
 
 end

Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - JoyConSwift (0.1.2)
+  - JoyConSwift (0.2.1)
 
 DEPENDENCIES:
-  - JoyConSwift (= 0.1.2)
+  - JoyConSwift (= 0.2.1)
 
 SPEC REPOS:
   trunk:
     - JoyConSwift
 
 SPEC CHECKSUMS:
-  JoyConSwift: 925e59c82d91ddf5381079612a84741f40cc1ecd
+  JoyConSwift: a8025cc234394cbc38fc1b48cfe1de8de6f66551
 
-PODFILE CHECKSUM: e982e7c0dcf71eb98d451ee7e1bc5b7d358a6dc4
+PODFILE CHECKSUM: f077d9a7d63235de745659f9e64c4c8ec6de86af
 
 COCOAPODS: 1.9.3