Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Meridian initial commit #10196

Merged
merged 7 commits into from
Sep 18, 2020
Merged

Meridian initial commit #10196

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e93eda6
Meridian initial commit
holtenc Aug 29, 2020
47b4d76
requested changes
holtenc Aug 29, 2020
2ccfde1
Update keyboards/primekb/meridian/config.h
holtenc Aug 29, 2020
f5ef242
Update keyboards/primekb/meridian/rules.mk
holtenc Aug 29, 2020
95e02e9
made requested changes
holtenc Sep 8, 2020
542e74c
Update meridian.c
holtenc Sep 9, 2020
586fd98
Update keyboards/primekb/meridian/readme.md
holtenc Sep 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion keyboards/primekb/meridian/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"keyboard_name": "Meridian",
"url": "https://www.primekb.com",
"maintainer": "holtenc",
"width": 15,
"width": 16.5,
"height": 5,
"layouts": {
"LAYOUT_unified_bs_rshift": {
Expand Down
2 changes: 1 addition & 1 deletion keyboards/primekb/meridian/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_split_bs_rshift(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC,
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT,
Expand Down
4 changes: 3 additions & 1 deletion keyboards/primekb/meridian/meridian.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "meridian.h"

//Initialize B12 for in-switch caps lock
void keyboard_pre_init_user(void){
void keyboard_pre_init_kb(void){
setPinOutput(B12);
keyboard_pre_init_user();
}

//Initialize all RGB indicators to 'off'
__attribute__((weak))
void keyboard_post_init_user(void) {
rgblight_setrgb_at(0, 0, 0, 0); // [..., 0] = top LED
rgblight_setrgb_at(0, 0, 0, 1); // [..., 1] = middle LED
Expand Down
2 changes: 2 additions & 0 deletions keyboards/primekb/meridian/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# ai03 x PrimeKB Meridian

holtenc marked this conversation as resolved.
Show resolved Hide resolved
![Meridian](https://i.imgur.com/c90ZTJJ.jpg)
holtenc marked this conversation as resolved.
Show resolved Hide resolved

* Keyboard Maintainer: [Holten Campbell](https://github.com/holtenc)
* Hardware Supported: STM32F072CBT6

Expand Down