From c7dfd393bfb89a753885e66b998981dd5c774739 Mon Sep 17 00:00:00 2001
From: Nicholas G <speeedypotato@gmail.com>
Date: Sat, 25 Sep 2021 01:29:48 -0400
Subject: [PATCH] Pocket IIDX Configuration

---
 README.md                          |   2 +-
 build_uf2/Pico_Game_Controller.uf2 | Bin 76288 -> 76288 bytes
 src/controller_config.h            |  20 ++++++------
 src/pico_game_controller.c         |   7 ++---
 src/usb_descriptors.c              |  47 +++++++++++++----------------
 src/usb_descriptors.h              |  15 +++++----
 6 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/README.md b/README.md
index 85e5fbf..c1bd045 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Pico-Game-Controller
 
-Code for a keyboard or game controller using a Raspberry Pi Pico. Capable of handling 11 buttons, 10 LEDs, 1 WS2812B RGB strip, and 2 encoders. Developed with SDVX and IIDX in mind - see branches release/pocket-sdvx-pico and release/pocket-iidx for preconfigured versions.
+This branch was developed with IIDX in mind. Capable of handling 11 buttons, 11 LEDs, 1 WS2812B RGB strip, and 1 encoder. Note: 12 buttons/LEDs are reported but B8 should probably not be used (https://github.com/veroxzik/arduino-konami-spoof)
 
 Demo of this firmware running on Pocket SDVX Pico, purchasable at https://discord.gg/MmuKd73XbY
 
diff --git a/build_uf2/Pico_Game_Controller.uf2 b/build_uf2/Pico_Game_Controller.uf2
index 10a29a2d55157c19dcc15b0c9a88136499add2d6..9bd3c7e0ec1b426d8e0e265cdd712ef7cc509142 100644
GIT binary patch
delta 9659
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

delta 9823
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
SMEt&|a-`9LLfVEus{aeM@Tocg

diff --git a/src/controller_config.h b/src/controller_config.h
index abca538..656543d 100644
--- a/src/controller_config.h
+++ b/src/controller_config.h
@@ -1,12 +1,12 @@
 #ifndef CONTROLLER_CONFIG_H
 #define CONTROLLER_CONFIG_H
 
-#define SW_GPIO_SIZE 11               // Number of switches
-#define LED_GPIO_SIZE 10              // Number of switch LEDs
-#define ENC_GPIO_SIZE 2               // Number of encoders
-#define ENC_PPR 600                   // Encoder PPR
-#define MOUSE_SENS 1                  // Mouse sensitivity multiplier
-#define ENC_DEBOUNCE false            // Encoder Debouncing
+#define SW_GPIO_SIZE 12               // Number of switches
+#define LED_GPIO_SIZE 12              // Number of switch LEDs
+#define ENC_GPIO_SIZE 1               // Number of encoders
+#define ENC_PPR 24                    // Encoder PPR
+#define MOUSE_SENS 5                  // Mouse sensitivity multiplier
+#define ENC_DEBOUNCE true            // Encoder Debouncing
 #define SW_DEBOUNCE_TIME_US 4000      // Switch debounce delay in us
 #define ENC_PULSE (ENC_PPR * 4)       // 4 pulses per PPR
 #define REACTIVE_TIMEOUT_MAX 1000000  // HID to reactive timeout in us
@@ -22,13 +22,13 @@ const uint8_t SW_KEYCODE[] = {HID_KEY_D, HID_KEY_F, HID_KEY_J, HID_KEY_K,
                               HID_KEY_C, HID_KEY_M, HID_KEY_A, HID_KEY_B,
                               HID_KEY_1, HID_KEY_E, HID_KEY_G};
 const uint8_t SW_GPIO[] = {
-    4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 27,
+    2, 4, 6, 8, 10, 12, 14, 26, 16, 18, 20, 22,
 };
 const uint8_t LED_GPIO[] = {
-    5, 7, 9, 11, 13, 15, 17, 19, 21, 26,
+    3, 5, 7, 9, 11, 13, 15, 27, 17, 19, 21, 26,
 };
-const uint8_t ENC_GPIO[] = {0, 2};      // L_ENC(0, 1); R_ENC(2, 3)
-const bool ENC_REV[] = {false, false};  // Reverse Encoders
+const uint8_t ENC_GPIO[] = {0};  // TT(0, 1)
+const bool ENC_REV[] = {false};  // Reverse Encoders
 const uint8_t WS2812B_GPIO = 28;
 
 #endif
diff --git a/src/pico_game_controller.c b/src/pico_game_controller.c
index f14fcec..11ecebf 100644
--- a/src/pico_game_controller.c
+++ b/src/pico_game_controller.c
@@ -91,7 +91,6 @@ void update_lights() {
 struct report {
   uint16_t buttons;
   uint8_t joy0;
-  uint8_t joy1;
 } report;
 
 /**
@@ -110,7 +109,6 @@ void joy_mode() {
     }
 
     report.joy0 = ((double)cur_enc_val[0] / ENC_PULSE) * (UINT8_MAX + 1);
-    report.joy1 = ((double)cur_enc_val[1] / ENC_PULSE) * (UINT8_MAX + 1);
 
     tud_hid_n_report(0x00, REPORT_ID_JOYSTICK, &report, sizeof(report));
   }
@@ -146,9 +144,8 @@ void key_mode() {
         delta[i] = (enc_val[i] - prev_enc_val[i]) * (ENC_REV[i] ? 1 : -1);
         prev_enc_val[i] = enc_val[i];
       }
-
-      tud_hid_mouse_report(REPORT_ID_MOUSE, 0x00, delta[0] * MOUSE_SENS,
-                           delta[1] * MOUSE_SENS, 0, 0);
+      tud_hid_mouse_report(REPORT_ID_MOUSE, 0x00, delta[0] * MOUSE_SENS, 0, 0,
+                           0);
     }
     // Alternate reports
     kbm_report = !kbm_report;
diff --git a/src/usb_descriptors.c b/src/usb_descriptors.c
index 3ce3276..f4d1afc 100644
--- a/src/usb_descriptors.c
+++ b/src/usb_descriptors.c
@@ -34,10 +34,6 @@
  * Auto ProductID layout's Bitmap:
  *   [MSB]         HID | MSC | CDC          [LSB]
  */
-#define _PID_MAP(itf, n) ((CFG_TUD_##itf) << (n))
-#define USB_PID                                                      \
-  (0x4000 | _PID_MAP(CDC, 0) | _PID_MAP(MSC, 1) | _PID_MAP(HID, 2) | \
-   _PID_MAP(MIDI, 3) | _PID_MAP(VENDOR, 4))
 
 //--------------------------------------------------------------------+
 // Device Descriptors
@@ -51,8 +47,8 @@ tusb_desc_device_t const desc_device_joy = {
     .bDeviceProtocol = 0x00,
     .bMaxPacketSize0 = CFG_TUD_ENDPOINT0_SIZE,
 
-    .idVendor = 0xCafe,
-    .idProduct = USB_PID,
+    .idVendor = 0x1ccf,
+    .idProduct = 0x8048,
     .bcdDevice = 0x0100,
 
     .iManufacturer = 0x01,
@@ -70,8 +66,8 @@ tusb_desc_device_t const desc_device_key = {
     .bDeviceProtocol = 0x00,
     .bMaxPacketSize0 = CFG_TUD_ENDPOINT0_SIZE,
 
-    .idVendor = 0xCafe,
-    .idProduct = USB_PID,
+    .idVendor = 0x1ccf,
+    .idProduct = 0x8048,
     .bcdDevice = 0x0100,
 
     .iManufacturer = 0x01,
@@ -92,14 +88,12 @@ uint8_t const* tud_descriptor_device_cb(void) {
 
 uint8_t const desc_hid_report_joy[] = {
     GAMECON_REPORT_DESC_JOYSTICK(HID_REPORT_ID(REPORT_ID_JOYSTICK)),
-    GAMECON_REPORT_DESC_LIGHTS(HID_REPORT_ID(REPORT_ID_LIGHTS))
-};
+    GAMECON_REPORT_DESC_LIGHTS(HID_REPORT_ID(REPORT_ID_LIGHTS))};
 
 uint8_t const desc_hid_report_key[] = {
     GAMECON_REPORT_DESC_LIGHTS(HID_REPORT_ID(REPORT_ID_LIGHTS)),
     GAMECON_REPORT_DESC_NKRO(HID_REPORT_ID(REPORT_ID_KEYBOARD)),
-    TUD_HID_REPORT_DESC_MOUSE(HID_REPORT_ID(REPORT_ID_MOUSE))
-};
+    TUD_HID_REPORT_DESC_MOUSE(HID_REPORT_ID(REPORT_ID_MOUSE))};
 
 // Invoked when received GET HID REPORT DESCRIPTOR
 // Application return pointer to descriptor
@@ -131,7 +125,6 @@ uint8_t const desc_configuration_joy[] = {
                        sizeof(desc_hid_report_joy), EPNUM_HID,
                        CFG_TUD_HID_EP_BUFSIZE, 1)};
 
-
 uint8_t const desc_configuration_key[] = {
     // Config number, interface count, string index, total length, attribute,
     // power in mA
@@ -159,19 +152,21 @@ uint8_t const* tud_descriptor_configuration_cb(uint8_t index) {
 // array of pointer to string descriptors
 char const* string_desc_arr[] = {
     (const char[]){0x09, 0x04},  // 0: is supported language is English (0x0409)
-    "SpeedyPotato",              // 1: Manufacturer
-    "Pico Game Controller",      // 2: Product
-    "123456",                    // 3: Serials, should use chip ID
-    "Button 1",
-    "Button 2",
-    "Button 3",
-    "Button 4",
-    "Button 5",
-    "Button 6",
-    "Button 7",
-    "Button 8",
-    "Button 9",
-    "Button 10",
+    "Konami Amusement",          // 1: Manufacturer
+    "beatmania IIDX controller premium model",  // 2: Product
+    "123456",  // 3: Serials, should use chip ID
+    "Key 1",
+    "Key 2",
+    "Key 3",
+    "Key 4",
+    "Key 5",
+    "Key 6",
+    "Key 7",
+    "UNUSED GPIO 27",
+    "Key E1",
+    "Key E2",
+    "Key E3",
+    "Key E4",
     "Red 1",
     "Green 1",
     "Blue 1",
diff --git a/src/usb_descriptors.h b/src/usb_descriptors.h
index 9d30995..fc3761a 100644
--- a/src/usb_descriptors.h
+++ b/src/usb_descriptors.h
@@ -2,8 +2,8 @@
 #define USB_DESCRIPTORS_H_
 
 #include "common/tusb_common.h"
-#include "device/usbd.h"
 #include "controller_config.h"
+#include "device/usbd.h"
 
 enum {
   REPORT_ID_JOYSTICK = 1,
@@ -27,15 +27,15 @@ enum {
       HID_USAGE(HID_USAGE_DESKTOP_JOYSTICK),                                   \
       HID_COLLECTION(HID_COLLECTION_APPLICATION),                              \
       __VA_ARGS__ HID_USAGE_PAGE(HID_USAGE_PAGE_BUTTON), HID_USAGE_MIN(1),     \
-      HID_USAGE_MAX(SW_GPIO_SIZE),                                             \
-      HID_LOGICAL_MIN(0), HID_LOGICAL_MAX(1), HID_REPORT_COUNT(SW_GPIO_SIZE),  \
-      HID_REPORT_SIZE(1), HID_INPUT(HID_DATA | HID_VARIABLE | HID_ABSOLUTE),   \
-      HID_REPORT_COUNT(1), HID_REPORT_SIZE(16 - SW_GPIO_SIZE), /*Padding*/\
+      HID_USAGE_MAX(SW_GPIO_SIZE), HID_LOGICAL_MIN(0), HID_LOGICAL_MAX(1),     \
+      HID_REPORT_COUNT(SW_GPIO_SIZE), HID_REPORT_SIZE(1),                      \
+      HID_INPUT(HID_DATA | HID_VARIABLE | HID_ABSOLUTE), HID_REPORT_COUNT(1),  \
+      HID_REPORT_SIZE(16 - SW_GPIO_SIZE), /*Padding*/                          \
       HID_INPUT(HID_CONSTANT | HID_VARIABLE | HID_ABSOLUTE),                   \
       HID_USAGE_PAGE(HID_USAGE_PAGE_DESKTOP), HID_LOGICAL_MIN(0x00),           \
       HID_LOGICAL_MAX_N(0x00ff, 2),                                            \
       HID_USAGE(HID_USAGE_DESKTOP_X), /*Joystick*/                             \
-      HID_USAGE(HID_USAGE_DESKTOP_Y), HID_REPORT_COUNT(2), HID_REPORT_SIZE(8), \
+      HID_REPORT_COUNT(2), HID_REPORT_SIZE(8), \
       HID_INPUT(HID_DATA | HID_VARIABLE | HID_ABSOLUTE), HID_COLLECTION_END
 
 // Light Map
@@ -45,9 +45,8 @@ enum {
       __VA_ARGS__ HID_REPORT_COUNT(LED_GPIO_SIZE + (WS2812B_LED_ZONES * 3)),   \
       HID_REPORT_SIZE(8), HID_LOGICAL_MIN(0x00), HID_LOGICAL_MAX_N(0x00ff, 2), \
       HID_USAGE_PAGE(HID_USAGE_PAGE_ORDINAL), HID_STRING_MINIMUM(4),           \
-      HID_STRING_MAXIMUM(16), HID_USAGE_MIN(1), HID_USAGE_MAX(16),             \
+      HID_STRING_MAXIMUM(18), HID_USAGE_MIN(1), HID_USAGE_MAX(18),             \
       HID_OUTPUT(HID_DATA | HID_VARIABLE | HID_ABSOLUTE), HID_REPORT_COUNT(1), \
-      HID_REPORT_SIZE(8), /*Padding*/                                          \
       HID_INPUT(HID_CONSTANT | HID_VARIABLE | HID_ABSOLUTE),                   \
       HID_COLLECTION_END