From 8c6cf7ae59496db53d378e894a96a321697ec8ff Mon Sep 17 00:00:00 2001
From: Joey Yakimowich-Payne <jyapayne@gmail.com>
Date: Wed, 27 Jun 2018 23:23:58 +0900
Subject: [PATCH] Fix input keys

---
 examples/helloworld/helloworld.nim |  9 +++++++--
 src/libnx/input.nim                | 14 +++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/examples/helloworld/helloworld.nim b/examples/helloworld/helloworld.nim
index 85129c7..944ffc5 100644
--- a/examples/helloworld/helloworld.nim
+++ b/examples/helloworld/helloworld.nim
@@ -1,7 +1,9 @@
+import sets
 import libnx/graphics
 import libnx/wrapper/console
 import libnx/wrapper/hid
 import libnx/app
+import libnx/input
 
 proc main() =
   initDefault()
@@ -9,9 +11,12 @@ proc main() =
 
   echo "\x1b[17;20HHELLO FROM NIM"
   mainLoop:
-    let keysDown = hidKeysDown(CONTROLLER_P1_AUTO)
+    let keysDown = keysDown(Controller.P1_AUTO)
 
-    if (keysDown and KEY_PLUS.uint64) > 0.uint64:
+    if keysDown.len() > 0:
+      echo keysDown
+
+    if ControllerKey.Plus in keysDown:
       break
 
 main()
diff --git a/src/libnx/input.nim b/src/libnx/input.nim
index c3740d6..d04969e 100644
--- a/src/libnx/input.nim
+++ b/src/libnx/input.nim
@@ -177,13 +177,13 @@ proc setControllerLayout*(id: Controller, layoutType: ControllerLayoutType) =
 proc getControllerLayout*(id: Controller): ControllerLayoutType =
   hidGetControllerLayout(HidControllerID(id)).ControllerLayoutType
 
-proc scanInput*() = scanInput()
+proc scanInput*() = hidScanInput()
 
 proc keysHeld*(id: Controller): HashSet[ControllerKey] =
   result = initSet[ControllerKey]()
 
   var raw = hidKeysHeld(HidControllerID(id))
-  for i in ControllerKey.low.int ..< ControllerKey.size:
+  for i in 0 ..< ControllerKey.size:
     let bit = raw and 0x1
     if bit == 1:
       result.incl(ControllerKey(BIT(i)))
@@ -193,7 +193,7 @@ proc keysDown*(id: Controller): HashSet[ControllerKey] =
   result = initSet[ControllerKey]()
 
   var raw = hidKeysDown(HidControllerID(id))
-  for i in ControllerKey.low.int ..< ControllerKey.size:
+  for i in 0 ..< ControllerKey.size:
     let bit = raw and 0x1
     if bit == 1:
       result.incl(ControllerKey(BIT(i)))
@@ -203,7 +203,7 @@ proc keysUp*(id: Controller): HashSet[ControllerKey] =
   result = initSet[ControllerKey]()
 
   var raw = hidKeysUp(HidControllerID(id))
-  for i in ControllerKey.low.int ..< ControllerKey.size:
+  for i in 0 ..< ControllerKey.size:
     let bit = raw and 0x1
     if bit == 1:
       result.incl(ControllerKey(BIT(i)))
@@ -213,7 +213,7 @@ proc mouseButtonsHeld*(): HashSet[MouseButton] =
   result = initSet[MouseButton]()
 
   var raw = hidMouseButtonsHeld()
-  for i in MouseButton.low.int ..< MouseButton.size:
+  for i in 0 ..< MouseButton.size:
     let bit = raw and 0x1
     if bit == 1:
       result.incl(MouseButton(BIT(i)))
@@ -224,7 +224,7 @@ proc mouseButtonsDown*(): HashSet[MouseButton] =
   result = initSet[MouseButton]()
 
   var raw = hidMouseButtonsDown()
-  for i in MouseButton.low.int ..< MouseButton.size:
+  for i in 0 ..< MouseButton.size:
     let bit = raw and 0x1
     if bit == 1:
       result.incl(MouseButton(BIT(i)))
@@ -234,7 +234,7 @@ proc mouseButtonsUp*(): HashSet[MouseButton] =
   result = initSet[MouseButton]()
 
   var raw = hidMouseButtonsUp()
-  for i in MouseButton.low.int ..< MouseButton.size:
+  for i in 0 ..< MouseButton.size:
     let bit = raw and 0x1
     if bit == 1:
       result.incl(MouseButton(BIT(i)))