From bb53e9d5394fb59469b9e23ce4ed26dfdc4c6248 Mon Sep 17 00:00:00 2001
From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
Date: Tue, 21 Mar 2023 16:13:44 +1100
Subject: [Keyboard] Consolidate Binepad BN009 R1 and R2 (#20113)
---
keyboards/binepad/bn009/config.h | 22 ---------
keyboards/binepad/bn009/info.json | 52 +++++++++++-----------
keyboards/binepad/bn009/keymaps/default/keymap.c | 42 -----------------
.../binepad/bn009/keymaps/default/keymap.json | 15 +++++++
keyboards/binepad/bn009/keymaps/default/readme.md | 1 -
keyboards/binepad/bn009/keymaps/via/keymap.c | 44 ------------------
keyboards/binepad/bn009/keymaps/via/keymap.json | 35 +++++++++++++++
keyboards/binepad/bn009/keymaps/via/rules.mk | 1 -
keyboards/binepad/bn009/r1/info.json | 14 ++++++
keyboards/binepad/bn009/r1/readme.md | 3 ++
keyboards/binepad/bn009/r1/rules.mk | 4 ++
keyboards/binepad/bn009/r2/config.h | 12 +++++
keyboards/binepad/bn009/r2/info.json | 13 ++++++
keyboards/binepad/bn009/r2/readme.md | 3 ++
keyboards/binepad/bn009/r2/rules.mk | 1 +
keyboards/binepad/bn009/readme.md | 35 ++++++++++++---
keyboards/binepad/bn009/rules.mk | 15 ++-----
17 files changed, 157 insertions(+), 155 deletions(-)
delete mode 100644 keyboards/binepad/bn009/config.h
delete mode 100644 keyboards/binepad/bn009/keymaps/default/keymap.c
create mode 100644 keyboards/binepad/bn009/keymaps/default/keymap.json
delete mode 100644 keyboards/binepad/bn009/keymaps/default/readme.md
delete mode 100644 keyboards/binepad/bn009/keymaps/via/keymap.c
create mode 100644 keyboards/binepad/bn009/keymaps/via/keymap.json
delete mode 100644 keyboards/binepad/bn009/keymaps/via/rules.mk
create mode 100644 keyboards/binepad/bn009/r1/info.json
create mode 100644 keyboards/binepad/bn009/r1/readme.md
create mode 100644 keyboards/binepad/bn009/r1/rules.mk
create mode 100644 keyboards/binepad/bn009/r2/config.h
create mode 100644 keyboards/binepad/bn009/r2/info.json
create mode 100644 keyboards/binepad/bn009/r2/readme.md
create mode 100644 keyboards/binepad/bn009/r2/rules.mk
(limited to 'keyboards/binepad/bn009')
diff --git a/keyboards/binepad/bn009/config.h b/keyboards/binepad/bn009/config.h
deleted file mode 100644
index 77f51ecf5a..0000000000
--- a/keyboards/binepad/bn009/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 BINEPAD
- *
- * 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 .
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/binepad/bn009/info.json b/keyboards/binepad/bn009/info.json
index 3304476f61..3f673566aa 100644
--- a/keyboards/binepad/bn009/info.json
+++ b/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" }
+ ]
+ }
}
-}
\ No newline at end of file
+}
diff --git a/keyboards/binepad/bn009/keymaps/default/keymap.c b/keyboards/binepad/bn009/keymaps/default/keymap.c
deleted file mode 100644
index 573a25d01d..0000000000
--- a/keyboards/binepad/bn009/keymaps/default/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2021 BINEPAD
- *
- * 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 .
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-[0] = LAYOUT(
- KC_7, KC_8, KC_9,
- KC_4, KC_5, KC_6,
- KC_1, KC_2, KC_3
-),
-
-
-[1] = LAYOUT(
- KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO
-),
-
-
-[2] = LAYOUT(
- KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO
-)
-
-};
diff --git a/keyboards/binepad/bn009/keymaps/default/keymap.json b/keyboards/binepad/bn009/keymaps/default/keymap.json
new file mode 100644
index 0000000000..2d5410de04
--- /dev/null
+++ b/keyboards/binepad/bn009/keymaps/default/keymap.json
@@ -0,0 +1,15 @@
+{
+ "keyboard": "binepad/bn009r2",
+ "version": 1,
+ "author": "binepad",
+ "notes": "This file is a keymap.json file for binepad/bn009r2",
+ "keymap": "default",
+ "layout": "LAYOUT_ortho_3x3",
+ "layers": [
+ [
+ "KC_7", "KC_8", "KC_9",
+ "KC_4", "KC_5", "KC_6",
+ "KC_1", "KC_2", "KC_3"
+ ]
+ ]
+}
diff --git a/keyboards/binepad/bn009/keymaps/default/readme.md b/keyboards/binepad/bn009/keymaps/default/readme.md
deleted file mode 100644
index b3c7ba28dc..0000000000
--- a/keyboards/binepad/bn009/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# bn009 - Default layout
diff --git a/keyboards/binepad/bn009/keymaps/via/keymap.c b/keyboards/binepad/bn009/keymaps/via/keymap.c
deleted file mode 100644
index 4ce3d1ae78..0000000000
--- a/keyboards/binepad/bn009/keymaps/via/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2021 BINEPAD
- *
- * 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 .
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] =
- LAYOUT(
- KC_7 , KC_8 , KC_9,
- KC_4 , KC_5 , KC_6,
- KC_1 , KC_2 , KC_3
- ),
- [1] =
- LAYOUT(
- KC_NO , KC_NO, KC_NO,
- KC_NO , KC_NO, KC_NO,
- KC_NO , KC_NO, KC_NO
- ),
- [2] =
- LAYOUT(
- KC_NO , KC_NO, KC_NO,
- KC_NO , KC_NO, KC_NO,
- KC_NO , KC_NO, KC_NO
- ),
- [3] =
- LAYOUT(
- KC_NO , KC_NO, KC_NO,
- KC_NO , KC_NO, KC_NO,
- KC_NO , KC_NO, KC_NO
- ),
-};
diff --git a/keyboards/binepad/bn009/keymaps/via/keymap.json b/keyboards/binepad/bn009/keymaps/via/keymap.json
new file mode 100644
index 0000000000..414859ec96
--- /dev/null
+++ b/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"
+ ]
+ ]
+}
diff --git a/keyboards/binepad/bn009/keymaps/via/rules.mk b/keyboards/binepad/bn009/keymaps/via/rules.mk
deleted file mode 100644
index 1e5b99807c..0000000000
--- a/keyboards/binepad/bn009/keymaps/via/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes
diff --git a/keyboards/binepad/bn009/r1/info.json b/keyboards/binepad/bn009/r1/info.json
new file mode 100644
index 0000000000..b83ebd3ebc
--- /dev/null
+++ b/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"
+ }
+ }
+
\ No newline at end of file
diff --git a/keyboards/binepad/bn009/r1/readme.md b/keyboards/binepad/bn009/r1/readme.md
new file mode 100644
index 0000000000..125441c6a2
--- /dev/null
+++ b/keyboards/binepad/bn009/r1/readme.md
@@ -0,0 +1,3 @@
+# BINEPAD BN009 R1
+
+* Hardware Supported: BN009 R1 *(ft. ATmega32U4)*
diff --git a/keyboards/binepad/bn009/r1/rules.mk b/keyboards/binepad/bn009/r1/rules.mk
new file mode 100644
index 0000000000..10468472aa
--- /dev/null
+++ b/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
diff --git a/keyboards/binepad/bn009/r2/config.h b/keyboards/binepad/bn009/r2/config.h
new file mode 100644
index 0000000000..45b63ec105
--- /dev/null
+++ b/keyboards/binepad/bn009/r2/config.h
@@ -0,0 +1,12 @@
+// Copyright 2023 Binepad (@binepad)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+
+/*
+ * Wear Leveling EEPROM Emulation
+ */
+
+#define WEAR_LEVELING_LOGICAL_SIZE 2048 // Number of bytes "exposed" to the rest of QMK and denotes the size of the usable EEPROM.
+#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2) // Number of bytes used by the wear-leveling algorithm for its underlying storage, and needs to be a multiple of the logical size.
diff --git a/keyboards/binepad/bn009/r2/info.json b/keyboards/binepad/bn009/r2/info.json
new file mode 100644
index 0000000000..c011fe0e32
--- /dev/null
+++ b/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"
+ }
+}
diff --git a/keyboards/binepad/bn009/r2/readme.md b/keyboards/binepad/bn009/r2/readme.md
new file mode 100644
index 0000000000..eee6d1608c
--- /dev/null
+++ b/keyboards/binepad/bn009/r2/readme.md
@@ -0,0 +1,3 @@
+# BINEPAD BN009 R2
+
+* Hardware Supported: BN009 *(ft. STM32F103)*
diff --git a/keyboards/binepad/bn009/r2/rules.mk b/keyboards/binepad/bn009/r2/rules.mk
new file mode 100644
index 0000000000..837f4bffb5
--- /dev/null
+++ b/keyboards/binepad/bn009/r2/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank
diff --git a/keyboards/binepad/bn009/readme.md b/keyboards/binepad/bn009/readme.md
index dc0442fa82..2b3153ca4d 100644
--- a/keyboards/binepad/bn009/readme.md
+++ b/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
diff --git a/keyboards/binepad/bn009/rules.mk b/keyboards/binepad/bn009/rules.mk
index 5356b24d77..74214d60ed 100644
--- a/keyboards/binepad/bn009/rules.mk
+++ b/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
--
cgit v1.2.3