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

new keyboard: edinburgh41 #19569

Merged
merged 12 commits into from
Jan 26, 2023
Prev Previous commit
Next Next commit
Apply suggestions from code review
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
3 people authored Jan 12, 2023
commit dcc77f079e0963f05123f1c2e3fa9369a495aef0
5 changes: 0 additions & 5 deletions keyboards/edinburgh41/config.h
Original file line number Diff line number Diff line change
@@ -18,11 +18,6 @@

#define DEBOUNCE 5

// bootmagic settings

#define BOOTMAGIC_LITE_ROW 0
#define BOOTMAGIC_LITE_COLUMN 0

// Underglow LED settings

#define RGB_DI_PIN D0
2 changes: 1 addition & 1 deletion keyboards/edinburgh41/edinburgh41.h
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/
#define LAYOUT_edinburgh41( \
#define LAYOUT( \
K00, K01, K02, K03, K04, K05, K30, K31, K32, K33, K34, K35, \
K10, K11, K12, K13, K14, K15, K40, K41, K42, K43, K44, K45, \
K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K54, K55, \
2 changes: 1 addition & 1 deletion keyboards/edinburgh41/info.json
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
"vid": "0xFEED"
},
"layouts": {
"LAYOUT_edinburgh41": {
"LAYOUT": {
"layout": [
{"label":"K00", "x":0, "y":0.54},
{"label":"K01", "x":1, "y":0.36},
12 changes: 6 additions & 6 deletions keyboards/edinburgh41/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -27,28 +27,28 @@ enum layer_names {
#define ADJUST MO(_ADJUST)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_edinburgh41(
[_BASE] = LAYOUT(
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT),
KC_LALT, LOWER, KC_SPC, RAISE, KC_RGUI
),

[_LOWER] = LAYOUT_edinburgh41(
[_LOWER] = LAYOUT(
_______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
_______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_GRV, KC_TILD,
_______, KC_ESC, KC_LGUI, KC_LALT, KC_CAPS, KC_DQUO, KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_PSCR, RSFT_T(KC_SPC),
_______, _______, KC_ENT, _______, _______
),

[_RAISE] = LAYOUT_edinburgh41(
[_RAISE] = LAYOUT(
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
_______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
_______, KC_ESC, KC_RGUI, KC_RALT, KC_CAPS, KC_QUOT, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
_______, _______, KC_BSPC, _______, _______
),

[_ADJUST] = LAYOUT_edinburgh41(
[_ADJUST] = LAYOUT(
RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
@@ -80,7 +80,7 @@ bool returned_to_zero = true;
uint16_t zero_reads = 0;

// set mode depending on layer
layer_state_t layer_state_set_kb(layer_state_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
switch (get_highest_layer(state)) {
schwarzer-geiger marked this conversation as resolved.
Show resolved Hide resolved
case SCROLLING_LAYER:
if (scrolling_mode == false) {
@@ -120,7 +120,7 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
}

// manipulate mouse report based on current mode
report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {

if (cursor_mode) {
mouse_report.x = CURSOR_SPEED * mouse_report.x/100;
12 changes: 6 additions & 6 deletions keyboards/edinburgh41/keymaps/lalit/keymap.c
Original file line number Diff line number Diff line change
@@ -48,28 +48,28 @@ qk_tap_dance_action_t tap_dance_actions[] = {
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_edinburgh41(
[_BASE] = LAYOUT(
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
LT(RAISE, KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, TD(TD_H_DQT), TD(TD_J_QUOTE), KC_K, KC_L, KC_MS_BTN1, KC_ENTER,
LGUI(KC_TAB), KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SCLN,
KC_LCTL, KC_LSFT, KC_NO, KC_SPC, LOWER
),

[_LOWER] = LAYOUT_edinburgh41(
[_LOWER] = LAYOUT(
RGB_TOG, KC_NO, KC_LBRC, KC_RBRC, KC_NO, KC_NO, KC_NO, LGUI(KC_SPC), KC_MINUS, LSFT(KC_EQUAL), KC_NO, LGUI(LSFT(KC_4)),
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
_______, KC_NO, LSFT(KC_LBRC), LSFT(KC_RBRC), KC_NO, KC_NO, KC_NO, KC_EQUAL, KC_BSLS, KC_GRAVE, KC_NO, KC_NO,
_______, _______, KC_NO, _______, _______
),

[_RAISE] = LAYOUT_edinburgh41(
[_RAISE] = LAYOUT(
_______, KC_NO, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
_______, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, KC_NO, UE_UMLAUT, OE_UMLAUT, AE_UMLAUT, SS_UMLAUT, KC_NO,
_______, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
_______, _______, KC_NO, _______, _______
),

[_ADJUST] = LAYOUT_edinburgh41(
[_ADJUST] = LAYOUT(
RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
@@ -131,7 +131,7 @@ bool returned_to_zero = true;
uint16_t zero_reads = 0;

// set mode depending on layer
layer_state_t layer_state_set_kb(layer_state_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
switch (get_highest_layer(state)) {
case SCROLLING_LAYER:
if (scrolling_mode == false) {
@@ -171,7 +171,7 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
}

// manipulate mouse report based on current mode
report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {

if (cursor_mode) {
mouse_report.x = CURSOR_SPEED * mouse_report.x/100;
21 changes: 0 additions & 21 deletions keyboards/edinburgh41/keymaps/lalit/rules.mk
Original file line number Diff line number Diff line change
@@ -1,22 +1 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = caterina

# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
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
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
TAP_DANCE_ENABLE = yes

POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = analog_joystick
2 changes: 1 addition & 1 deletion keyboards/edinburgh41/readme.md
Original file line number Diff line number Diff line change
@@ -24,4 +24,4 @@ Enter the bootloader in 3 ways:

* **Bootmagic reset**: Hold down top left key while plugging keyboard into computer
* **Physical reset button**: Short RST and GND pins
* **Keycode in layout**: Press the key mapped to `RESET` if it is available
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
6 changes: 0 additions & 6 deletions keyboards/edinburgh41/rules.mk
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = caterina

# Build Options
# change yes to no to disable
#