From 812f97e241acb307e02e4149442a62cacb4aeb8b Mon Sep 17 00:00:00 2001
From: holtenc <holtenc@gmail.com>
Date: Thu, 14 Apr 2022 11:26:24 -0500
Subject: [PATCH] [Keyboard] move/rename obro to Meridian RGB (#16828)
Co-authored-by: Joel Challis <git@zvecr.com>
---
keyboards/{handwired/obro => primekb/meridian_rgb}/config.h | 6 +++++-
.../{handwired/obro => primekb/meridian_rgb}/info.json | 2 +-
.../obro => primekb/meridian_rgb}/keymaps/default/keymap.c | 0
.../obro => primekb/meridian_rgb}/keymaps/via/keymap.c | 0
.../obro => primekb/meridian_rgb}/keymaps/via/rules.mk | 0
.../obro/obro.c => primekb/meridian_rgb/meridian_rgb.c} | 2 +-
.../obro/obro.h => primekb/meridian_rgb/meridian_rgb.h} | 0
.../{handwired/obro => primekb/meridian_rgb}/readme.md | 6 +++---
keyboards/{handwired/obro => primekb/meridian_rgb}/rules.mk | 0
9 files changed, 10 insertions(+), 6 deletions(-)
rename keyboards/{handwired/obro => primekb/meridian_rgb}/config.h (93%)
rename keyboards/{handwired/obro => primekb/meridian_rgb}/info.json (98%)
rename keyboards/{handwired/obro => primekb/meridian_rgb}/keymaps/default/keymap.c (100%)
rename keyboards/{handwired/obro => primekb/meridian_rgb}/keymaps/via/keymap.c (100%)
rename keyboards/{handwired/obro => primekb/meridian_rgb}/keymaps/via/rules.mk (100%)
rename keyboards/{handwired/obro/obro.c => primekb/meridian_rgb/meridian_rgb.c} (96%)
rename keyboards/{handwired/obro/obro.h => primekb/meridian_rgb/meridian_rgb.h} (100%)
rename keyboards/{handwired/obro => primekb/meridian_rgb}/readme.md (84%)
rename keyboards/{handwired/obro => primekb/meridian_rgb}/rules.mk (100%)
diff --git a/keyboards/handwired/obro/config.h b/keyboards/primekb/meridian_rgb/config.h
similarity index 93%
rename from keyboards/handwired/obro/config.h
rename to keyboards/primekb/meridian_rgb/config.h
index 1217214dd7..4dc63d91ce 100644
--- a/keyboards/handwired/obro/config.h
+++ b/keyboards/primekb/meridian_rgb/config.h
@@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PRODUCT_ID 0x0042
#define DEVICE_VER 0x0002
#define MANUFACTURER Prime Keyboards
-#define PRODUCT obro
+#define PRODUCT Meridian RGB
/* key matrix size */
#define MATRIX_ROWS 5
@@ -49,6 +49,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_LIMIT_VAL 200
+#define LED_NUM_LOCK_PIN B0
+#define LED_CAPS_LOCK_PIN B1
+#define LED_SCROLL_LOCK_PIN B2
+
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
diff --git a/keyboards/handwired/obro/info.json b/keyboards/primekb/meridian_rgb/info.json
similarity index 98%
rename from keyboards/handwired/obro/info.json
rename to keyboards/primekb/meridian_rgb/info.json
index e289ae585e..606fab0692 100644
--- a/keyboards/handwired/obro/info.json
+++ b/keyboards/primekb/meridian_rgb/info.json
@@ -1,5 +1,5 @@
{
- "keyboard_name": "Obro",
+ "keyboard_name": "Meridian RGB",
"url": "https://www.primekb.com",
"maintainer": "holtenc",
"layouts": {
diff --git a/keyboards/handwired/obro/keymaps/default/keymap.c b/keyboards/primekb/meridian_rgb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/handwired/obro/keymaps/default/keymap.c
rename to keyboards/primekb/meridian_rgb/keymaps/default/keymap.c
diff --git a/keyboards/handwired/obro/keymaps/via/keymap.c b/keyboards/primekb/meridian_rgb/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/handwired/obro/keymaps/via/keymap.c
rename to keyboards/primekb/meridian_rgb/keymaps/via/keymap.c
diff --git a/keyboards/handwired/obro/keymaps/via/rules.mk b/keyboards/primekb/meridian_rgb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/handwired/obro/keymaps/via/rules.mk
rename to keyboards/primekb/meridian_rgb/keymaps/via/rules.mk
diff --git a/keyboards/handwired/obro/obro.c b/keyboards/primekb/meridian_rgb/meridian_rgb.c
similarity index 96%
rename from keyboards/handwired/obro/obro.c
rename to keyboards/primekb/meridian_rgb/meridian_rgb.c
index e02765e6ad..95bb63a91b 100644
--- a/keyboards/handwired/obro/obro.c
+++ b/keyboards/primekb/meridian_rgb/meridian_rgb.c
@@ -15,4 +15,4 @@ 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 "obro.h"
+#include "meridian_rgb.h"
diff --git a/keyboards/handwired/obro/obro.h b/keyboards/primekb/meridian_rgb/meridian_rgb.h
similarity index 100%
rename from keyboards/handwired/obro/obro.h
rename to keyboards/primekb/meridian_rgb/meridian_rgb.h
diff --git a/keyboards/handwired/obro/readme.md b/keyboards/primekb/meridian_rgb/readme.md
similarity index 84%
rename from keyboards/handwired/obro/readme.md
rename to keyboards/primekb/meridian_rgb/readme.md
index 7be928050d..d07752ae3d 100644
--- a/keyboards/handwired/obro/readme.md
+++ b/keyboards/primekb/meridian_rgb/readme.md
@@ -6,17 +6,17 @@
Make example for this keyboard (after setting up your build environment):
- make handwired/obro:default
+ make primekb/meridian_rgb:default
Flashing example for this keyboard:
- make handwired/obro:default:flash
+ make primekb/meridian_rgb: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:
-* Bootmagic reset: HOld down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* Bootmagic reset: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
* Physical reset button: Briefly press the button on the back of the PCB
* Keycode in layout: Press the key mapped to RESET if it is available
diff --git a/keyboards/handwired/obro/rules.mk b/keyboards/primekb/meridian_rgb/rules.mk
similarity index 100%
rename from keyboards/handwired/obro/rules.mk
rename to keyboards/primekb/meridian_rgb/rules.mk