VIA keymap for JJ4x4 and general cleanup (#8888)

8 files changed, 140 insertions, 99 deletions

diff --git a/keyboards/jj4x4/config.h b/keyboards/jj4x4/config.h
index 8c5b1988d6..45c8671cc5 100644
--- a/keyboards/jj4x4/config.h
+++ b/keyboards/jj4x4/config.h
@@ -19,8 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x20A0
-#define PRODUCT_ID      0x422D
+#define VENDOR_ID       0x4B50 // "KP"
+#define PRODUCT_ID      0x0044 // 4x4
 #define DEVICE_VER      0x0200
 #define MANUFACTURER    KPrepublic
 #define PRODUCT         JJ4x4
diff --git a/keyboards/jj4x4/info.json b/keyboards/jj4x4/info.json
index 602fdc90a3..0fff9b9c88 100644
--- a/keyboards/jj4x4/info.json
+++ b/keyboards/jj4x4/info.json
@@ -1,30 +1,30 @@
 {
-  "keyboard_name": "jj4x4",
-  "url": "",
-  "maintainer": "qmk",
-  "width": 4,
-  "height": 4,
-  "layouts": {
-    "LAYOUT_ortho_4x4": {
-      "key_count": 16,
-      "layout": [
-        {"x":0, "y":0},
-        {"x":1, "y":0},
-        {"x":2, "y":0},
-        {"x":3, "y":0},
-        {"x":0, "y":1},
-        {"x":1, "y":1},
-        {"x":2, "y":1},
-        {"x":3, "y":1},
-        {"x":0, "y":2},
-        {"x":1, "y":2},
-        {"x":2, "y":2},
-        {"x":3, "y":2},
-        {"x":0, "y":3},
-        {"x":1, "y":3},
-        {"x":2, "y":3},
-        {"x":3, "y":3}
-      ]
+    "keyboard_name": "JJ4x4",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 4,
+    "height": 4,
+    "layouts": {
+        "LAYOUT_ortho_4x4": {
+            "key_count": 16,
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+                {"x":3, "y":1},
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2},
+                {"x":3, "y":2},
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+                {"x":3, "y":3}
+            ]
+        }
     }
-  }
-}
\ No newline at end of file
+}
diff --git a/keyboards/jj4x4/jj4x4.h b/keyboards/jj4x4/jj4x4.h
index 7b8cb81835..ee17e896dd 100644
--- a/keyboards/jj4x4/jj4x4.h
+++ b/keyboards/jj4x4/jj4x4.h
@@ -28,14 +28,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * represents the switch matrix.
  */
 #define LAYOUT_ortho_4x4( \
-	K01, K02, K03, K04, \
-	K11, K12, K13, K14, \
-	K21, K22, K23, K24, \
-	K31, K32, K33, K34 \
-) \
-{ \
-  { K01, K02, K03, K04 }, \
-  { K11, K12, K13, K14 }, \
-  { K21, K22, K23, K24 }, \
-  { K31, K32, K33, K34 } \
-}	
+    K00, K01, K02, K03, \
+    K10, K11, K12, K13, \
+    K20, K21, K22, K23, \
+    K30, K31, K32, K33 \
+) { \
+    { K00, K01, K02, K03 }, \
+    { K10, K11, K12, K13 }, \
+    { K20, K21, K22, K23 }, \
+    { K30, K31, K32, K33 } \
+}
diff --git a/keyboards/jj4x4/keymaps/default/keymap.c b/keyboards/jj4x4/keymaps/default/keymap.c
index a0b06ee92a..ae2c6b5417 100644
--- a/keyboards/jj4x4/keymaps/default/keymap.c
+++ b/keyboards/jj4x4/keymaps/default/keymap.c
@@ -13,61 +13,56 @@
  * 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
 
 enum layers {
-  _BASE = 0,
-  _FN1,
-  _FN2,
+    _BASE = 0,
+    _FN1,
+    _FN2
 };
 
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
+    QMKBEST = SAFE_RANGE,
+    QMKURL
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_BASE] = LAYOUT_ortho_4x4(
-    KC_PGUP,  KC_HOME,  KC_UP,    KC_END , \
-    KC_PGDN,  KC_LEFT,  KC_DOWN,  KC_RGHT, \
-    MO(_FN2), KC_VOLU,  KC_MPLY,  KC_MPRV, \
-    MO(_FN1), KC_VOLD,  KC_MUTE,  KC_MNXT  \
-  ),
-  [_FN1] = LAYOUT_ortho_4x4(
-    KC_ESC,   KC_P7,    KC_P8,    KC_P9,   \
-    KC_TAB,   KC_P4,    KC_P5,    KC_P6,   \
-    KC_ENT,   KC_P1,    KC_P2,    KC_P3,   \
-    _______,  KC_P0,    KC_P0,    KC_DOT   \
-  ),
-  [_FN2] = LAYOUT_ortho_4x4(
-    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI, \
-    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD, \
-    _______,  _______,  _______,  RESET,   \
-    BL_STEP,  _______,  QMKBEST,  QMKURL   \
-  )
-
+    [_BASE] = LAYOUT_ortho_4x4(
+        KC_PGUP,  KC_HOME, KC_UP,   KC_END,
+        KC_PGDN,  KC_LEFT, KC_DOWN, KC_RGHT,
+        MO(_FN2), KC_VOLU, KC_MPLY, KC_MPRV,
+        MO(_FN1), KC_VOLD, KC_MUTE, KC_MNXT
+    ),
+    [_FN1] = LAYOUT_ortho_4x4(
+        KC_ESC,  KC_P7,   KC_P8,   KC_P9,
+        KC_TAB,  KC_P4,   KC_P5,   KC_P6,
+        KC_ENT,  KC_P1,   KC_P2,   KC_P3,
+        _______, KC_P0,   KC_P0,   KC_DOT
+    ),
+    [_FN2] = LAYOUT_ortho_4x4(
+        RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
+        RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
+        _______, _______, _______, RESET,
+        BL_STEP, _______, QMKBEST, QMKURL
+    )
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QMKBEST:
-      if (record->event.pressed) {
-        // when keycode QMKBEST is pressed
-        SEND_STRING("QMK is the best thing ever!");
-      } else {
-        // when keycode QMKBEST is released
-      }
-      break;
-    case QMKURL:
-      if (record->event.pressed) {
-        // when keycode QMKURL is pressed
-        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
-      } else {
-        // when keycode QMKURL is released
-      }
-      break;
-  }
-  return true;
+    switch (keycode) {
+        case QMKBEST:
+            if (record->event.pressed) {
+                // when keycode QMKBEST is pressed
+                SEND_STRING("QMK is the best thing ever!");
+            }
+            break;
+        case QMKURL:
+            if (record->event.pressed) {
+                // when keycode QMKURL is pressed
+                SEND_STRING("https://qmk.fm/\n");
+            }
+            break;
+    }
+    return true;
 }
diff --git a/keyboards/jj4x4/keymaps/via/keymap.c b/keyboards/jj4x4/keymaps/via/keymap.c
new file mode 100644
index 0000000000..35ca0e361d
--- /dev/null
+++ b/keyboards/jj4x4/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2020
+ *
+ * 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] = {
+    LAYOUT_ortho_4x4(
+        KC_P7,   KC_P8,   KC_P9,   KC_PSLS,
+        KC_P4,   KC_P5,   KC_P6,   KC_PAST,
+        KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
+        KC_P0,   KC_PDOT, KC_PPLS, LT(1, KC_ENT)
+    ),
+    LAYOUT_ortho_4x4(
+        RESET,   _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______
+    ),
+    LAYOUT_ortho_4x4(
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______
+    ),
+    LAYOUT_ortho_4x4(
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/jj4x4/keymaps/via/rules.mk b/keyboards/jj4x4/keymaps/via/rules.mk
new file mode 100644
index 0000000000..82fb80d5e7
--- /dev/null
+++ b/keyboards/jj4x4/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+EXTRAKEY_ENABLE = no
+MOUSEKEY_ENABLE = no
diff --git a/keyboards/jj4x4/README.md b/keyboards/jj4x4/readme.md
index 24212bc990..714e8e88f7 100644
--- a/keyboards/jj4x4/README.md
+++ b/keyboards/jj4x4/readme.md
@@ -1,8 +1,8 @@
-# jj4x4
+# JJ4x4
 
 ![jj4x4](https://cdn.shopify.com/s/files/1/2711/4238/products/JJ4x4case-1_1024x1024.jpg?v=1532325339)
 
-A 4x4 keypad kit made and KPRepublic on AliExpress. This is a chopped off version of the jj40 with rearranged keys.
+A 4x4 keypad kit made and KPRepublic on AliExpress. This is a chopped off version of the JJ40 with rearranged keys.
 
 * Keyboard Maintainer: [QMK Community](https://github.com/qmk)
 * Hardware Supported: Atmega32A
@@ -18,22 +18,22 @@ Flashing example for this keyboard ([after setting up the bootloadHID flashing e
 
 **Reset Key**:
 
-Hold down the key located at *K12*, commonly programmed as *8* while plugging in the keyboard USB cable.
+Hold down the key located at *K11*, commonly programmed as *8* while plugging in the keyboard USB cable.
 
-Key *K12* is in the above picture:
+Key *K11* is in the above picture:
 
 Row 2 from the top, Column 2 from the left, see the schematic below:
 
 ```
-  ,-----------------------.
-  |     |     |     |     |
-  |-----`-----`-----`-----|
-  |     | K12 |     |     |
-  |-----`-----`-----`-----|
-  |     |     |     |     |
-  |-----`-----`-----`-----|
-  |     |     |     |     |
-  `-----`-----`-----`-----'
+,-----------------------.
+|     |     |     |     |
+|-----`-----`-----`-----|
+|     | K11 |     |     |
+|-----`-----`-----`-----|
+|     |     |     |     |
+|-----`-----`-----`-----|
+|     |     |     |     |
+`-----`-----`-----`-----'
 ```
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/jj4x4/rules.mk b/keyboards/jj4x4/rules.mk
index 82e25e6a7a..5ff5c37692 100644
--- a/keyboards/jj4x4/rules.mk
+++ b/keyboards/jj4x4/rules.mk
@@ -31,6 +31,6 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs
+HD44780_ENABLE = no         # Enable support for HD44780 based LCDs
 
 LAYOUTS = ortho_4x4