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.

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

Add VIA support to Prime_M. Clean up all files #8247

Merged
merged 30 commits into from
Mar 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f5fc330
Add VIA support for Prime_L
holtenc Feb 23, 2020
dfd1369
Update keyboards/primekb/prime_l/v1/config.h
holtenc Feb 23, 2020
11f9df2
Add prime_exl_plus keyboard
holtenc Feb 23, 2020
a575be2
Merge branch 'master' of https://github.com/holtenc/qmk_firmware
holtenc Feb 23, 2020
42f60e7
Temporary removal of prime_exl_plus
holtenc Feb 23, 2020
498a6c2
Add Prime_EXL Plus, including VIA support
holtenc Feb 24, 2020
72711de
Merge branch 'master' of https://github.com/qmk/qmk_firmware
holtenc Feb 24, 2020
eb3c192
Update keyboards/handwired/prime_exl_plus/readme.md
holtenc Feb 24, 2020
2e2de83
Update keyboards/handwired/prime_exl_plus/readme.md
holtenc Feb 24, 2020
14aec00
Update keyboards/handwired/prime_exl_plus/readme.md
holtenc Feb 24, 2020
e369698
Update keyboards/handwired/prime_exl_plus/rules.mk
holtenc Feb 24, 2020
4f7df3f
Update keyboards/handwired/prime_exl_plus/info.json
holtenc Feb 24, 2020
f1f2d1c
Update keyboards/handwired/prime_exl_plus/info.json
holtenc Feb 25, 2020
56e9c99
Update keyboards/handwired/prime_exl_plus/info.json
holtenc Feb 25, 2020
97a8556
Update keymap.c
holtenc Feb 25, 2020
1de6a36
Merge branch 'master' of https://github.com/holtenc/qmk_firmware
holtenc Feb 25, 2020
8dc7605
correct spacing of keymaps and layout macro. move indicator logic fro…
holtenc Feb 25, 2020
f69069f
further corrections to keymaps and layout macro.
holtenc Feb 25, 2020
e853390
Update keyboards/handwired/prime_exl_plus/prime_exl_plus.c
holtenc Feb 25, 2020
6bc9866
Update keyboards/handwired/prime_exl_plus/prime_exl_plus.c
holtenc Feb 25, 2020
93ecdbb
Update keyboards/handwired/prime_exl_plus/prime_exl_plus.c
holtenc Feb 25, 2020
3ecf2a0
Update keyboards/handwired/prime_exl_plus/prime_exl_plus.c
holtenc Feb 25, 2020
f1d88fd
Update prime_exl_plus.c
holtenc Feb 25, 2020
ec9201c
small edit to prime_exl_plus.c
holtenc Feb 25, 2020
97436d1
Add via support to Prime_M and clean things up
holtenc Feb 25, 2020
81dc1db
Merge branch 'master' of https://github.com/qmk/qmk_firmware
holtenc Feb 25, 2020
bb10db7
Update rules.mk
holtenc Feb 26, 2020
4963077
Update keyboards/primekb/prime_m/readme.md
holtenc Feb 29, 2020
d04ef66
Update keyboards/primekb/prime_m/readme.md
holtenc Feb 29, 2020
42d210c
Update keyboards/primekb/prime_m/config.h
holtenc Feb 29, 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
5 changes: 3 additions & 2 deletions keyboards/primekb/prime_m/config.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
Copyright 2018 Jumail Mundekkat
Copyright 2020 Holten Campbell

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -20,8 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x4024
#define VENDOR_ID 0x5052 // "PR"
#define PRODUCT_ID 0x504D // "PM"
#define DEVICE_VER 0x0001
#define MANUFACTURER PrimeKB
#define PRODUCT Prime_M
Expand Down
19 changes: 0 additions & 19 deletions keyboards/primekb/prime_m/keymaps/default/config.h

This file was deleted.

40 changes: 0 additions & 40 deletions keyboards/primekb/prime_m/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@
*/
#include QMK_KEYBOARD_H

// Defines the keycodes used by our macros in process_record_user
enum custom_keycodes {
QMKBEST = SAFE_RANGE,
QMKURL
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_ortho_5x6(
KC_ESC, KC_LPRN, KC_RPRN, KC_PSLS, KC_PAST, LT(2, KC_BSPC),
Expand All @@ -46,37 +40,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, KC_MUTE, KC_VOLD
)
};

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case QMKBEST:
if (record->event.pressed) {
// when keycode QMKBEST is pressed
SEND_STRING("QMK is the best thing ever!");
} else {
// when keycode QMKBEST is released
}
break;
case QMKURL:
if (record->event.pressed) {
// when keycode QMKURL is pressed
SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
} else {
// when keycode QMKURL is released
}
break;
}
return true;
}

void matrix_init_user(void) {

}

void matrix_scan_user(void) {

}

void led_set_user(uint8_t usb_led) {

}
2 changes: 1 addition & 1 deletion keyboards/primekb/prime_m/keymaps/default/readme.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# The default keymap for prime_m
# The default keymap for Prime_M
19 changes: 0 additions & 19 deletions keyboards/primekb/prime_m/keymaps/numpad/config.h

This file was deleted.

2 changes: 1 addition & 1 deletion keyboards/primekb/prime_m/keymaps/numpad/readme.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# The default keymap for prime_m
# The numpad keymap for Prime_M
51 changes: 51 additions & 0 deletions keyboards/primekb/prime_m/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/* Copyright 2020 Holten Campbell
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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 QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_ortho_5x6(
KC_ESC, KC_LPRN, KC_RPRN, KC_PSLS, KC_PAST, LT(2, KC_BSPC),
KC_F1, KC_F2, KC_P7, KC_P8, KC_P9, KC_DEL,
KC_F3, KC_F4, KC_P4, KC_P5, KC_P6, KC_PMNS,
KC_F5, KC_F6, KC_P1, KC_P2, KC_P3, KC_PPLS,
KC_LCTL, KC_LALT, TO(1), KC_P0, KC_PDOT, KC_PENT
),

[1] = LAYOUT_ortho_5x6(
KC_ESC, KC_1, KC_2, KC_3, KC_4, LT(2, KC_F9),
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,
KC_LCTL, KC_LALT, TO(0), KC_P, KC_H, KC_SPC
),

[2] = LAYOUT_ortho_5x6(
BL_TOGG, BL_STEP, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, KC_VOLU,
_______, _______, _______, _______, KC_MUTE, KC_VOLD
),

[3] = LAYOUT_ortho_5x6(
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______
)

};
1 change: 1 addition & 0 deletions keyboards/primekb/prime_m/keymaps/via/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# The VIA keymap for Prime_M
1 change: 1 addition & 0 deletions keyboards/primekb/prime_m/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
28 changes: 1 addition & 27 deletions keyboards/primekb/prime_m/prime_m.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* Copyright 2018 Jumail Mundekkat
* Copyright 2020 Holten Campbell
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -14,30 +15,3 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "prime_m.h"

void matrix_init_kb(void) {
// put your keyboard start-up code here
// runs once when the firmware starts up

matrix_init_user();
}

void matrix_scan_kb(void) {
// put your looping keyboard code here
// runs every cycle (a lot)

matrix_scan_user();
}

bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
// put your per-action keyboard code here
// runs for every action, just before processing by the firmware

return process_record_user(keycode, record);
}

void led_set_kb(uint8_t usb_led) {
// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here

led_set_user(usb_led);
}
7 changes: 4 additions & 3 deletions keyboards/primekb/prime_m/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@

The Prime_M is a premium input device that is designed to be flexible so that it can cover many needs. The case is milled from a solid block of aluminum and features an integrated switch plate, which is 4.75mm thick yet designed to allow MX style switches to properly snap in. The bottom cover is machine from solid brass and is pre-drilled/countersunk for use with optional feet to give the device a slight tilt.

Keyboard Maintainer: [MxBlue](https://github.com/MxBlu)
Hardware Supported: Prime_M PCB, ATMega32u2
Hardware Availability: [GB Post](https://geekhack.org/index.php?topic=91821.0), [B-Stock Listing](https://www.primekb.com/products/prime_m)
* Keyboard Maintainer: [holtenc](https://github.com/holtenc), [MxBlue](https://github.com/MxBlu)
* Hardware Supported: Prime_M PCB, ATMega32u2
* Hardware Availability: [GB Post](https://geekhack.org/index.php?topic=91821.0), [B-Stock Listing](https://www.primekb.com/products/prime_m)

Make example for this keyboard (after setting up your build environment):

make primekb/prime_m:default
make primekb/prime_m:via

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).
24 changes: 12 additions & 12 deletions keyboards/primekb/prime_m/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ BOOTLOADER = atmel-dfu
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
MIDI_ENABLE = no # MIDI support
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
HD44780_ENABLE = no # Enable support for HD44780 based LCDs
NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
MIDI_ENABLE = no # MIDI support
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
HD44780_ENABLE = no # Enable support for HD44780 based LCDs

LAYOUTS = ortho_5x6 numpad_5x6