From 5b87534f63eb2abd0974aa56969b2b03cee0ad0a Mon Sep 17 00:00:00 2001
From: Minori Tokuda <minorityland@gmail.com>
Date: Wed, 17 Jul 2019 15:47:40 +0900
Subject: [PATCH] Fix for Nomu30 BLE support (#1)

* add valid pin assigns and BLE related keys to nomu30_ble

* fix nrfutil subcommand name.

Because the version 7.0 of "click" library in "nrfutil" replaces dashes to
underscores in subcommand name.
---
 keyboards/nomu30_ble/keymaps/default/keymap.c |  8 +++-
 keyboards/nomu30_ble/pro_v1/config.h          | 38 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/keyboards/nomu30_ble/keymaps/default/keymap.c b/keyboards/nomu30_ble/keymaps/default/keymap.c
index b43f43965b67..8f0eee1d79df 100644
--- a/keyboards/nomu30_ble/keymaps/default/keymap.c
+++ b/keyboards/nomu30_ble/keymaps/default/keymap.c
@@ -42,12 +42,13 @@ enum custom_keycodes {
 #define _NUMS 1
 #define _SYMS 2
 #define _FUNC 3
+#define _BLE  4
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
         KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
         KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
-        KC_LSFT, LALT_T(KC_Z), LGUI_T(KC_X), KC_C, LT(_SYMS, KC_V), LT(_FUNC, KC_B), LT(_NUMS, KC_N), KC_M, KC_SPC
+        KC_LSFT, LALT_T(KC_Z), LGUI_T(KC_X), LT(_BLE, KC_C), LT(_SYMS, KC_V), LT(_FUNC, KC_B), LT(_NUMS, KC_N), KC_M, KC_SPC
     ),
     [_NUMS] = LAYOUT(
         KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV,
@@ -63,6 +64,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
         KC_TAB, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, RESET,
         KC_TRNS, KC_LALT, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [_BLE] = LAYOUT(
+        ADV_ID0, ADV_ID1, ADV_ID2, ADV_ID3, ADV_ID4, DEL_ID0, DEL_ID1, DEL_ID2, DEL_ID3, DEL_ID4, DELBNDS,
+        BATT_LV, USB_EN,  USB_DIS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BLE_EN,  BLE_DIS, KC_TRNS, AD_WO_L,
+        ENT_SLP, KC_LALT, KC_LGUI, ENT_DFU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
 
diff --git a/keyboards/nomu30_ble/pro_v1/config.h b/keyboards/nomu30_ble/pro_v1/config.h
index e26c7ebce3c3..e7ac148158c2 100644
--- a/keyboards/nomu30_ble/pro_v1/config.h
+++ b/keyboards/nomu30_ble/pro_v1/config.h
@@ -6,8 +6,42 @@
 #define THIS_DEVICE_ROWS 3
 #define THIS_DEVICE_COLS 12
 
-#define MATRIX_ROW_PINS { PIN15, PIN11, PIN14 }
-#define MATRIX_COL_PINS { PIN5, PIN20, PIN6, PIN19, PIN7, PIN18, PIN8, PIN17, PIN9, PIN16, PIN10 }
+#undef C6
+#undef D0
+#undef D1
+#undef D2
+#undef D3
+#undef D4
+#undef D7
+#undef E6
+#undef F4
+#undef F5
+#undef F6
+#undef F7
+
+// B* names are already used in nRF SDK. 
+#define _B1 PIN16
+#define _B2 PIN14
+#define _B3 PIN15
+#define _B4 PIN11
+#define _B5 PIN12
+#define _B6 PIN13
+
+#define C6 PIN8
+#define D0 PIN6
+#define D1 PIN5
+#define D2 PIN2
+#define D3 PIN1
+#define D4 PIN7
+#define D7 PIN9
+#define E6 PIN10
+#define F4 PIN20
+#define F5 PIN19
+#define F6 PIN18
+#define F7 PIN17
+
+#define MATRIX_ROW_PINS { D1, D0, D4 }
+#define MATRIX_COL_PINS { C6, D7, E6, _B4, F4, F5, F6, F7, _B1, _B3, _B2, _B6 }
 
 #define IS_LEFT_HAND  true
 #define ENABLE_STARTUP_ADV_NOLIST