[Keyboard] Consolidate Binepad BN009 R1 and R2 (qmk#20113)

keyboards/binepad/bn009/info.json

@@ -1,33 +1,33 @@
 {
-  "keyboard_name": "BN009",
   "manufacturer": "Binepad",
-  "url": "https://binepad.com",
+  "keyboard_name": "BN009",
   "maintainer": "binepad",
-  "usb": {
-    "vid": "0x4249",
-    "pid": "0x4295",
-    "device_version": "0.0.1"
+  "features": {
+      "bootmagic": true,
+      "command": false,
+      "console": false,
+      "extrakey": true,
+      "mousekey": true,
+      "nkro": false
   },
-  "matrix_pins": {
-    "cols": ["B6", "B5", "B4"],
-    "rows": ["D2", "D1", "D0"]
+  "url": "http://binepad.com",
+  "usb": {
+      "vid": "0x4249",
+      "pid": "0x4295"
   },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
   "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]}
-      ]
-    }
+      "LAYOUT_ortho_3x3": {
+          "layout": [
+              { "matrix": [0, 0], "x": 0, "y": 0, "label": "k00" },
+              { "matrix": [0, 1], "x": 1, "y": 0, "label": "k01" },
+              { "matrix": [0, 2], "x": 2, "y": 0, "label": "k02" },
+              { "matrix": [1, 0], "x": 0, "y": 1, "label": "k10" },
+              { "matrix": [1, 1], "x": 1, "y": 1, "label": "k11" },
+              { "matrix": [1, 2], "x": 2, "y": 1, "label": "k12" },
+              { "matrix": [2, 0], "x": 0, "y": 2, "label": "k20" },
+              { "matrix": [2, 1], "x": 1, "y": 2, "label": "k21" },
+              { "matrix": [2, 2], "x": 2, "y": 2, "label": "k22" }
+          ]
+      }
   }
-}
+}

keyboards/binepad/bn009/keymaps/via/keymap.json

@@ -0,0 +1,35 @@
+{
+  "config": {
+      "features": {
+          "via": true
+      }
+  },
+  "keyboard": "binepad/bn009r2",
+  "version": 1,
+  "author": "binepad",
+  "notes": "This file is a keymap.json file for binepad/bn009r2",
+  "keymap": "via",
+  "layout": "LAYOUT_ortho_3x3",
+  "layers": [
+      [
+          "KC_7", "KC_8", "KC_9",
+          "KC_4", "KC_5", "KC_6",
+          "KC_1", "KC_2", "KC_3"
+      ],
+      [
+          "KC_NO", "KC_NO", "KC_NO", 
+          "KC_NO", "KC_NO", "KC_NO", 
+          "KC_NO", "KC_NO", "KC_NO"
+      ],
+      [
+          "KC_NO", "KC_NO", "KC_NO", 
+          "KC_NO", "KC_NO", "KC_NO", 
+          "KC_NO", "KC_NO", "KC_NO"
+      ],
+      [
+          "KC_NO", "KC_NO", "KC_NO", 
+          "KC_NO", "KC_NO", "KC_NO", 
+          "KC_NO", "KC_NO", "KC_NO"
+      ]
+  ]
+}

keyboards/binepad/bn009/r1/info.json

@@ -0,0 +1,14 @@
+{
+    "keyboard_name": "BN009 R1",
+    "bootloader": "atmel-dfu",
+      "diode_direction": "COL2ROW",
+      "matrix_pins": {
+          "cols": ["D2", "D1", "D0"],
+          "rows": ["B6", "B5", "B4"]
+      },
+      "processor": "atmega32u4",
+    "usb": {
+      "device_version": "0.0.1"
+    }
+  }
+

keyboards/binepad/bn009/r1/readme.md

@@ -0,0 +1,3 @@
+# BINEPAD BN009 R1
+
+* Hardware Supported: BN009 R1 *(ft. ATmega32U4)*

keyboards/binepad/bn009/r1/rules.mk

@@ -0,0 +1,4 @@
+# Copyright 2020 Binepad (@binpad)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+LTO_ENABLE = yes

keyboards/binepad/bn009/r2/info.json

@@ -0,0 +1,13 @@
+{
+    "keyboard_name": "BN009 R2",
+    "bootloader": "stm32duino",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A6"],
+        "rows": ["B6", "B7", "B2"]
+    },
+    "processor": "STM32F103",
+    "usb": {
+        "device_version": "2.0.0"
+    }
+}

keyboards/binepad/bn009/r2/readme.md

@@ -0,0 +1,3 @@
+# BINEPAD BN009 R2
+
+* Hardware Supported: BN009 *(ft. STM32F103)*

keyboards/binepad/bn009/readme.md

@@ -4,14 +4,35 @@
 
 A 9% macropad.
 
-* Keyboard Maintainer: [BINEPAD]
-* Hardware Supported: BN009 PCB (ATmega32U4)
-* Hardware Availability: [Interest Check](https://www.binepad.com/bn009)
-
-**Physical reset button**: There's a small hole at the bottom of macropad. Use the reset pin provided in box and push it hard through the hole, so that it press the reset button on  pcb.
+* Keyboard Maintainer: [binepad](https://github.com/binepad)
+* Hardware Supported:
+    * BN009 R1 *(ft. ATmega32U4)*
+    * BN009 R2 *(ft. STM32F103)*
+* Hardware Availability: [binepad.com](https://www.binepad.com/bn009)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make binepad/bn009:default
+    make binepad/bn009/r1:default
+
+..or..
+
+    make binepad/bn009/r2:default
+
+Flashing example for this keyboard:
+
+    make binepad/bn009/r1:default:flash
+
+..or..
+
+    make binepad/bn009/r2:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
 
-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).
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button under the small hole on the back of the macropad
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` or `RESET` if it is available

keyboards/binepad/bn009/rules.mk

@@ -1,12 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
+# This file is mostly left blank
+
+DEFAULT_FOLDER = binepad/bn009/r2