diff options
Diffstat (limited to 'keyboards/primekb/prime_e')
-rw-r--r-- | keyboards/primekb/prime_e/config.h | 4 | ||||
-rw-r--r-- | keyboards/primekb/prime_e/info.json | 5 | ||||
-rw-r--r-- | keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/primekb/prime_e/keymaps/gwillad/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/primekb/prime_e/keymaps/madhatter/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/primekb/prime_e/keymaps/milestogo/config.h | 1 | ||||
-rw-r--r-- | keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/primekb/prime_e/keymaps/via/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/primekb/prime_e/rgb/config.h | 5 | ||||
-rw-r--r-- | keyboards/primekb/prime_e/rgb/info.json | 7 | ||||
-rw-r--r-- | keyboards/primekb/prime_e/std/config.h | 5 | ||||
-rw-r--r-- | keyboards/primekb/prime_e/std/info.json | 7 |
12 files changed, 23 insertions, 21 deletions
diff --git a/keyboards/primekb/prime_e/config.h b/keyboards/primekb/prime_e/config.h index 343a9dc0bf..f1bd0090c7 100644 --- a/keyboards/primekb/prime_e/config.h +++ b/keyboards/primekb/prime_e/config.h @@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5052 -#define MANUFACTURER PrimeKB - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/primekb/prime_e/info.json b/keyboards/primekb/prime_e/info.json index ee83f1bcbc..25f14ee9ce 100644 --- a/keyboards/primekb/prime_e/info.json +++ b/keyboards/primekb/prime_e/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "Prime_E", + "manufacturer": "PrimeKB", "url": "https://www.primekb.com", "maintainer": "holtenc", + "usb": { + "vid": "0x5052" + }, "layouts": { "LAYOUT": { "layout": [{"x":0,"y":0,"w":1,"h":1}, {"x":1,"y":0,"w":1,"h":1}, {"x":2,"y":0,"w":1,"h":1}, {"x":3,"y":0,"w":1,"h":1}, {"x":4,"y":0,"w":1,"h":1}, {"x":5,"y":0,"w":1,"h":1}, {"x":7,"y":0,"w":1,"h":1}, {"x":8,"y":0,"w":1,"h":1}, {"x":9,"y":0,"w":1,"h":1}, {"x":10,"y":0,"w":1,"h":1}, {"x":11,"y":0,"w":1,"h":1}, {"x":12,"y":0,"w":1,"h":1}, {"x":13,"y":0,"w":1,"h":1}, diff --git a/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c b/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c index a92fcbfec6..29b2f3214b 100644 --- a/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c +++ b/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT( \ - QM_MAKE, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, \ + QM_MAKE, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______ \ diff --git a/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c b/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c index 7b10be8c01..5dbdc4cfc8 100644 --- a/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c +++ b/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c b/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c index 099d6e0325..e02cedcec9 100644 --- a/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c +++ b/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_ENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/primekb/prime_e/keymaps/milestogo/config.h b/keyboards/primekb/prime_e/keymaps/milestogo/config.h index 24a42bb185..c3f9e43415 100644 --- a/keyboards/primekb/prime_e/keymaps/milestogo/config.h +++ b/keyboards/primekb/prime_e/keymaps/milestogo/config.h @@ -30,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Keyboard Matrix Assignments */ #define MATRIX_ROW_PINS { E6, C7, B5, B4, C6 } #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4, D5, D3, D2, D1, D0, B6, D7} -#define UNUSED_PINS // Babble config #define USE_BABBLEPASTE diff --git a/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c b/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c index 7724c2b435..3ad641179a 100644 --- a/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c +++ b/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_RALT, KC_RCTL ), [_FUNC] = LAYOUT( - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_INS, KC_TRNS, KC_TRNS, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_RSFT, KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_RALT, KC_RCTL diff --git a/keyboards/primekb/prime_e/keymaps/via/keymap.c b/keyboards/primekb/prime_e/keymaps/via/keymap.c index 195f845cc2..2d1d003d51 100644 --- a/keyboards/primekb/prime_e/keymaps/via/keymap.c +++ b/keyboards/primekb/prime_e/keymaps/via/keymap.c @@ -108,7 +108,7 @@ void led_set_user(uint8_t usb_led) { //function for layer indicator LED layer_state_t layer_state_set_user(layer_state_t state) { - if (biton32(state) == 1) { + if (get_highest_layer(state) == 1) { writePinHigh(B3); } else { writePinLow(B3); diff --git a/keyboards/primekb/prime_e/rgb/config.h b/keyboards/primekb/prime_e/rgb/config.h index a562ffba81..89cf43902c 100644 --- a/keyboards/primekb/prime_e/rgb/config.h +++ b/keyboards/primekb/prime_e/rgb/config.h @@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0052 -#define DEVICE_VER 0x0001 -#define PRODUCT Prime_E RGB - #define RGB_DI_PIN B7 #define RGBLED_NUM 8 #define RGBLIGHT_ANIMATIONS diff --git a/keyboards/primekb/prime_e/rgb/info.json b/keyboards/primekb/prime_e/rgb/info.json new file mode 100644 index 0000000000..1d40389e87 --- /dev/null +++ b/keyboards/primekb/prime_e/rgb/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Prime_E RGB", + "usb": { + "pid": "0x0052", + "device_version": "0.0.1" + } +} diff --git a/keyboards/primekb/prime_e/std/config.h b/keyboards/primekb/prime_e/std/config.h index a711e35b21..d6b242e08e 100644 --- a/keyboards/primekb/prime_e/std/config.h +++ b/keyboards/primekb/prime_e/std/config.h @@ -19,10 +19,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0051 -#define DEVICE_VER 0x0001 -#define PRODUCT Prime_E - #define BACKLIGHT_PIN B7 #define BACKLIGHT_LEVELS 5 diff --git a/keyboards/primekb/prime_e/std/info.json b/keyboards/primekb/prime_e/std/info.json new file mode 100644 index 0000000000..04f8842546 --- /dev/null +++ b/keyboards/primekb/prime_e/std/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Prime_E", + "usb": { + "pid": "0x0051", + "device_version": "0.0.1" + } +} |