Hub16 QMK configurator support + various bugfixes (#11496)

* qmk configurator support + various bugfixes

* Update keyboards/hub16/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>

9 files changed, 61 insertions, 96 deletions

diff --git a/keyboards/hub16/keymaps/ahk_companion/readme.md b/keyboards/hub16/keymaps/ahk_companion/readme.md
index 6e8f9f2d2a..a6163a3d56 100644
--- a/keyboards/hub16/keymaps/ahk_companion/readme.md
+++ b/keyboards/hub16/keymaps/ahk_companion/readme.md
@@ -1,7 +1,7 @@
 # AutoHotKey Companion
 
 ## Overview
-AutoHotKey Companion Keymap for <a href="https://www.tindie.com/products/joshajohnson/hub16-programmable-macro-keyboard/">Hub16 macropad</a> is designed be a quick and easy way to get started with AutoHotKey and to provide a foundation for customizing your own macropad. I upgraded to the Super16 from a Super16 because it kept the RGB underglow lights for an easy way (RGB) to identify what layer I was on with a quick glance or peripheral vision and added 2 rotary encoders and a USB 2.0 hub with USB-C ports. The F13 to F24 keys were selected as they are rarely used so you won't run into conflicts with existing application shortcuts and AutoHotKey recognizes them without any issues. *Note:* MacOS does not support/recognize F21 to F24 so these would need to be remapped for Mac users. 
+AutoHotKey Companion Keymap for <a href="https://www.tindie.com/products/joshajohnson/hub16-programmable-macro-keyboard/">Hub16 macropad</a> is designed be a quick and easy way to get started with AutoHotKey and to provide a foundation for customizing your own macropad. I upgraded to the Hub16 from a Super16 because it kept the RGB underglow lights for an easy way (RGB) to identify what layer I was on with a quick glance or peripheral vision and added 2 rotary encoders and a USB 2.0 hub with USB-C ports. The F13 to F24 keys were selected as they are rarely used so you won't run into conflicts with existing application shortcuts and AutoHotKey recognizes them without any issues. *Note:* MacOS does not support/recognize F21 to F24 so these would need to be remapped for Mac users. 
 
 Same functionality can be accomplished with other similar applications on the host system like Keyboard Maestro, AutoIt, etc. 
 
@@ -64,7 +64,7 @@ While the first 5 layers are accessible with only 1 key press at most, the 5th (
     
 ## Host Configuration
 
-Once the keymap has been flashed to the Super16, you can download the accompanying AutoHotKey file or create your own and have it start automatically either via a Windows Task or another way. Using AutoHotKey allows adjustment of functionality of the buttons without the need to change your map and reflash the macropad every time.
+Once the keymap has been flashed to the Hub16, you can download the accompanying AutoHotKey file or create your own and have it start automatically either via a Windows Task or another way. Using AutoHotKey allows adjustment of functionality of the buttons without the need to change your map and reflash the macropad every time.
 Starting the AHK file can be done either by:
 * Creating a Windows Task 
 * Adding the AHK to the startup folder
diff --git a/keyboards/hub16/keymaps/ahk_companion/rules.mk b/keyboards/hub16/keymaps/ahk_companion/rules.mk
deleted file mode 100755
index 022a3eeeed..0000000000
--- a/keyboards/hub16/keymaps/ahk_companion/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-TAP_DANCE_ENABLE = no      # Support for tap dancing
-
-
diff --git a/keyboards/hub16/keymaps/default/keymap.c b/keyboards/hub16/keymaps/default/keymap.c
new file mode 100755
index 0000000000..e077fe7409
--- /dev/null
+++ b/keyboards/hub16/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2019 Josh Johnson
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT( /* Base */
+       KC_MUTE,        KC_MPLY,
+    KC_7,   KC_8,   KC_9,   KC_PAST,
+    KC_4,   KC_5,   KC_6,   KC_PMNS,
+    KC_1,   KC_2,   KC_3,   KC_PPLS,
+    MO(1),  KC_0,   KC_PDOT,KC_PENT
+  ),
+
+  [1] = LAYOUT( /* LED Control */
+        _______,           _______,
+    _______, RGB_MOD, RGB_RMOD, RGB_TOG,
+    RGB_VAD, RGB_VAI, RGB_HUD,  RGB_HUI,
+    RGB_SAD, RGB_SAI, _______,  _______,
+    _______, _______, RESET,    _______
+  ),
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* Left Encoder */
+        if (clockwise) {
+            tap_code(KC_VOLD);
+        } else {
+            tap_code(KC_VOLU);
+        }
+    } else if (index == 1) { /* Right Encoder */
+        if (clockwise) {
+            tap_code(KC_MPRV);
+        } else {
+            tap_code(KC_MNXT);
+        }
+    }
+}
diff --git a/keyboards/hub16/keymaps/default/keymap.json b/keyboards/hub16/keymaps/default/keymap.json
deleted file mode 100644
index 6f4814eac8..0000000000
--- a/keyboards/hub16/keymaps/default/keymap.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version":1,"notes":"","documentation":"\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n","keyboard":"hub16","keymap":"default","layout":"LAYOUT","layers":[["KC_NLCK","KC_PSLS","KC_P7","KC_P8","KC_P9","KC_PPLS","KC_P4","KC_P5","KC_P6","KC_PCMM","KC_P1","KC_P2","KC_P3","KC_PEQL","KC_P0","KC_P0","KC_PDOT","KC_PENT"]],"author":""}
diff --git a/keyboards/hub16/keymaps/default_tap_dance/rules.mk b/keyboards/hub16/keymaps/default_tap_dance/rules.mk
deleted file mode 100644
index 25ec20cc46..0000000000
--- a/keyboards/hub16/keymaps/default_tap_dance/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes      # Support for tap dancing
diff --git a/keyboards/hub16/keymaps/default_tap_dance/keymap.c b/keyboards/hub16/keymaps/macro/keymap.c
index d3cad67ae1..3bf8fa31fd 100755
--- a/keyboards/hub16/keymaps/default_tap_dance/keymap.c
+++ b/keyboards/hub16/keymaps/macro/keymap.c
@@ -36,18 +36,18 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT( /* Base */
-        KC_S,      KC_V,    
-    KC_A, KC_B, KC_C, KC_D, 
-    KC_E, KC_F, KC_G, KC_H, 
-    KC_I, KC_J, KC_K, KC_L, 
+        KC_S,      KC_V,
+    KC_A, KC_B, KC_C, KC_D,
+    KC_E, KC_F, KC_G, KC_H,
+    KC_I, KC_J, KC_K, KC_L,
     KC_M, KC_N, KC_O, TD(CTRL)
   ),
 
   [_CTRL] = LAYOUT( /* Control */
-          KC_NO,            KC_NO,        
+          KC_NO,            KC_NO,
     _______, RGB_MOD, RGB_RMOD, RGB_TOG,
-    RGB_VAD, RGB_VAI, RGB_HUD,  RGB_HUI, 
-    RGB_SAD, RGB_SAI, _______,  _______, 
+    RGB_VAD, RGB_VAI, RGB_HUD,  RGB_HUI,
+    RGB_SAD, RGB_SAI, _______,  _______,
     _______, _______, RESET,    TD(BASE)
   ),
 };
@@ -112,4 +112,4 @@ void td_ctrl (qk_tap_dance_state_t *state, void *user_data) {
   } else if (state->count == 2) {
     layer_move(_CTRL);
   }
-}
\ No newline at end of file
+}
diff --git a/keyboards/hub16/keymaps/macro/rules.mk b/keyboards/hub16/keymaps/macro/rules.mk
new file mode 100644
index 0000000000..e5ddcae8d9
--- /dev/null
+++ b/keyboards/hub16/keymaps/macro/rules.mk
@@ -0,0 +1 @@
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/hub16/keymaps/no_mod/keymap.c b/keyboards/hub16/keymaps/no_mod/keymap.c
deleted file mode 100755
index 7c57ffbfe2..0000000000
--- a/keyboards/hub16/keymaps/no_mod/keymap.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2019 Josh Johnson
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Keyboard Layers
-enum keyboard_layers{
-    _BASE = 0,
-    _CONTROL
-};
-
-// Tap Dance Declarations
-enum tap_dance { TD_TO_LED = 0, TD_TO_DEFAULT = 1 };
-
-qk_tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for standard key, twice to toggle to control layer
-    [TD_TO_LED]     = ACTION_TAP_DANCE_DUAL_ROLE(KC_P, _CONTROL),
-    [TD_TO_DEFAULT] = ACTION_TAP_DANCE_DUAL_ROLE(KC_P, _BASE)};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT( /* Base */
-        KC_S,      KC_V,    
-    KC_A, KC_B, KC_C, KC_D, 
-    KC_E, KC_F, KC_G, KC_H, 
-    KC_I, KC_J, KC_K, KC_L, 
-    KC_M, KC_N, KC_O, TD(TD_TO_LED) 
-  ),
-
-  [_CONTROL] = LAYOUT( /* LED Control */
-          KC_NO,            KC_NO,        
-    _______, RGB_MOD, RGB_RMOD, RGB_TOG,
-    RGB_VAD, RGB_VAI, RGB_HUD,  RGB_HUI, 
-    RGB_SAD, RGB_SAI, _______,  _______, 
-    _______, _______, RESET,    TD(TD_TO_DEFAULT) 
-  ),
-};
-
-void encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* Left Encoder */
-        if (clockwise) {
-            tap_code(KC_R);
-        } else {
-            tap_code(KC_Q);
-        }
-    } else if (index == 1) { /* Right Encoder */
-        if (clockwise) {
-            tap_code(KC_U);
-        } else {
-            tap_code(KC_T);
-        }
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // Example of "pressing" CONTROL+SHIFT+V instead of "A" on keyboard
-    // More info: https://docs.qmk.fm/#/feature_macros
-    // case KC_A:
-    //   if (record->event.pressed) {
-    //     SEND_STRING(SS_LCTL(SS_LSFT("v")));
-    //   } else {
-    //   }
-    //   break; 
-  }
-  return true;
-};
diff --git a/keyboards/hub16/keymaps/via/rules.mk b/keyboards/hub16/keymaps/via/rules.mk
index b1c00b69f5..1e5b99807c 100644
--- a/keyboards/hub16/keymaps/via/rules.mk
+++ b/keyboards/hub16/keymaps/via/rules.mk
@@ -1,4 +1 @@
 VIA_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-TAP_DANCE_ENABLE = no