Merge remote-tracking branch 'origin/develop' into xap

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
 

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": {

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"

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