diff options
| -rw-r--r-- | keyboards/primekb/meridian_rgb/config.h (renamed from keyboards/handwired/obro/config.h) | 6 | ||||
| -rw-r--r-- | keyboards/primekb/meridian_rgb/info.json (renamed from keyboards/handwired/obro/info.json) | 2 | ||||
| -rw-r--r-- | keyboards/primekb/meridian_rgb/keymaps/default/keymap.c (renamed from keyboards/handwired/obro/keymaps/default/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/primekb/meridian_rgb/keymaps/via/keymap.c (renamed from keyboards/handwired/obro/keymaps/via/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/primekb/meridian_rgb/keymaps/via/rules.mk (renamed from keyboards/handwired/obro/keymaps/via/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/primekb/meridian_rgb/meridian_rgb.c (renamed from keyboards/handwired/obro/obro.c) | 2 | ||||
| -rw-r--r-- | keyboards/primekb/meridian_rgb/meridian_rgb.h (renamed from keyboards/handwired/obro/obro.h) | 0 | ||||
| -rw-r--r-- | keyboards/primekb/meridian_rgb/readme.md (renamed from keyboards/handwired/obro/readme.md) | 6 | ||||
| -rw-r--r-- | keyboards/primekb/meridian_rgb/rules.mk (renamed from keyboards/handwired/obro/rules.mk) | 0 | 
9 files changed, 10 insertions, 6 deletions
diff --git a/keyboards/handwired/obro/config.h b/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 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 index cf963b553d..cf963b553d 100644 --- a/keyboards/handwired/obro/keymaps/default/keymap.c +++ b/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 index cf963b553d..cf963b553d 100644 --- a/keyboards/handwired/obro/keymaps/via/keymap.c +++ b/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 index 036bd6d1c3..036bd6d1c3 100644 --- a/keyboards/handwired/obro/keymaps/via/rules.mk +++ b/keyboards/primekb/meridian_rgb/keymaps/via/rules.mk diff --git a/keyboards/handwired/obro/obro.c b/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 index 8cff4ff96d..8cff4ff96d 100644 --- a/keyboards/handwired/obro/obro.h +++ b/keyboards/primekb/meridian_rgb/meridian_rgb.h diff --git a/keyboards/handwired/obro/readme.md b/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 index ee0e024ddb..ee0e024ddb 100644 --- a/keyboards/handwired/obro/rules.mk +++ b/keyboards/primekb/meridian_rgb/rules.mk  | 
