From 295205e0fede6fee884afd32a31ea53af4672a7c Mon Sep 17 00:00:00 2001 From: holtenc Date: Sat, 9 Apr 2022 15:16:22 -0500 Subject: [PATCH 1/5] move/rename obro to Meridian RGB --- 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 1217214dd710..4dc63d91cedc 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 . #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 . #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 e289ae585e39..606fab06927b 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 e02765e6ada6..95bb63a91b30 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 . */ -#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 7be928050d5f..d07752ae3de1 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 From 711e9cefee72acef6aba5b734abeb9abaddfbaff Mon Sep 17 00:00:00 2001 From: holtenc Date: Sat, 9 Apr 2022 15:35:23 -0500 Subject: [PATCH 2/5] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3f646c6b010b..c8c87b462204 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,4 @@ user_song_list.h compile_commands.json .clangd/ .cache/ +keyboards/primekb/meridian_rgb/.vscode/c_cpp_properties.json From 1a909fc5f839b1637b5347635fc607ff7a48c931 Mon Sep 17 00:00:00 2001 From: holtenc Date: Sun, 10 Apr 2022 16:02:37 -0500 Subject: [PATCH 3/5] Delete .gitignore --- .gitignore | 94 ------------------------------------------------------ 1 file changed, 94 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c8c87b462204..000000000000 --- a/.gitignore +++ /dev/null @@ -1,94 +0,0 @@ -# Junk files -*.bak -*.swp -*~ -.DS_Store -._* - -# Build artifacts -.clang_complete -.build/ -*.elf -*.log -*.lss -*.lst -*.map -*.o -*.stackdump -*.sym - -# QMK-specific -api_data/v1 -quantum/version.h -*.bin -*.eep -*.hex -*.qmk -*.uf2 - -# Old-style QMK Makefiles -/keyboards/*/Makefile -/keyboards/*/*/Makefile -/keyboards/*/*/*/Makefile -/keyboards/*/*/*/*/Makefile -/keyboards/*/*/*/*/*/Makefile -/keyboards/*/keymaps/Makefile -/keyboards/*/*/keymaps/Makefile -/keyboards/*/*/*/keymaps/Makefile -/keyboards/*/*/*/*/keymaps/Makefile -/keyboards/*/*/*/*/*/keymaps/Makefile - -# Eclipse/PyCharm/Other IDE Settings -*.iml -.browse.VC.db* -.cproject -.idea -.idea/ -.project -.settings/ -.vagrant/ - -# ? -.dep -.history/ -build/ -cmake-build-debug -CMakeLists.txt - -# Let these ones be user specific, since we have so many different configurations -*.code-workspace -.stfolder -.tags -.vscode/c_cpp_properties.json -.vscode/ipch/ -.vscode/last.sql -.vscode/launch.json -.vscode/tasks.json -.vscode/temp.sql -tags - -# Ignore image files -*.gif -*.jpg -*.png - -# Things Travis sees -/.vs -id_rsa_* -secrets.tar - -# Python things -__pycache__ -.python-version - -# Prerequisites for updating ChibiOS -/util/fmpp* - -# Allow to exist but don't include it in the repo -user_song_list.h - -# clangd -compile_commands.json -.clangd/ -.cache/ -keyboards/primekb/meridian_rgb/.vscode/c_cpp_properties.json From 1efa960cc5686ac7103d12bf9ad8ee7ae8a67798 Mon Sep 17 00:00:00 2001 From: holtenc Date: Mon, 11 Apr 2022 11:15:28 -0500 Subject: [PATCH 4/5] put .gitignore back as requested --- .gitignore | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..c8c87b462204 --- /dev/null +++ b/.gitignore @@ -0,0 +1,94 @@ +# Junk files +*.bak +*.swp +*~ +.DS_Store +._* + +# Build artifacts +.clang_complete +.build/ +*.elf +*.log +*.lss +*.lst +*.map +*.o +*.stackdump +*.sym + +# QMK-specific +api_data/v1 +quantum/version.h +*.bin +*.eep +*.hex +*.qmk +*.uf2 + +# Old-style QMK Makefiles +/keyboards/*/Makefile +/keyboards/*/*/Makefile +/keyboards/*/*/*/Makefile +/keyboards/*/*/*/*/Makefile +/keyboards/*/*/*/*/*/Makefile +/keyboards/*/keymaps/Makefile +/keyboards/*/*/keymaps/Makefile +/keyboards/*/*/*/keymaps/Makefile +/keyboards/*/*/*/*/keymaps/Makefile +/keyboards/*/*/*/*/*/keymaps/Makefile + +# Eclipse/PyCharm/Other IDE Settings +*.iml +.browse.VC.db* +.cproject +.idea +.idea/ +.project +.settings/ +.vagrant/ + +# ? +.dep +.history/ +build/ +cmake-build-debug +CMakeLists.txt + +# Let these ones be user specific, since we have so many different configurations +*.code-workspace +.stfolder +.tags +.vscode/c_cpp_properties.json +.vscode/ipch/ +.vscode/last.sql +.vscode/launch.json +.vscode/tasks.json +.vscode/temp.sql +tags + +# Ignore image files +*.gif +*.jpg +*.png + +# Things Travis sees +/.vs +id_rsa_* +secrets.tar + +# Python things +__pycache__ +.python-version + +# Prerequisites for updating ChibiOS +/util/fmpp* + +# Allow to exist but don't include it in the repo +user_song_list.h + +# clangd +compile_commands.json +.clangd/ +.cache/ +keyboards/primekb/meridian_rgb/.vscode/c_cpp_properties.json From 8d25b993eb4a14baa9ef1bc30415cddbff865859 Mon Sep 17 00:00:00 2001 From: holtenc Date: Tue, 12 Apr 2022 13:09:10 -0500 Subject: [PATCH 5/5] Update .gitignore Co-authored-by: Joel Challis --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index c8c87b462204..3f646c6b010b 100644 --- a/.gitignore +++ b/.gitignore @@ -91,4 +91,3 @@ user_song_list.h compile_commands.json .clangd/ .cache/ -keyboards/primekb/meridian_rgb/.vscode/c_cpp_properties.json