Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@drashna
drashna committed Nov 13, 2022
2 parents 6cc9513 + 2e39647 commit 731633e
Show file tree
Hide file tree
Showing 204 changed files with 15,470 additions and 4,218 deletions.
45 changes: 45 additions & 0 deletions keyboards/boardsource/lulu/keymaps/rmeli/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
Copyright 2022 Rocco Meli <@RMeli>
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/>.
*/

#pragma once

#define MASTER_LEFT // Left side is the master
#define SPLIT_LED_STATE_ENABLE

#ifdef RGB_MATRIX_ENABLE
// Configure RGB Matrix
# define RGB_MATRIX_KEYPRESSES // enable keypress effects
# define RGB_MATRIX_LED_FLUSH_LIMIT 16
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
# define RGB_MATRIX_STARTUP_HUE 10
# define RGB_MATRIX_STARTUP_SAT 255
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
// Disable RGB Matrix effects (from lulu/config.h)
# undef ENABLE_RGB_MATRIX_ALPHAS_MODS
# undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
# undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
# undef ENABLE_RGB_MATRIX_BREATHING
# undef ENABLE_RGB_MATRIX_BAND_SAT
# undef ENABLE_RGB_MATRIX_BAND_VAL
// Enable RGB Matrix effects
# define ENABLE_RGB_MATRIX_BREATHING
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
# define ENABLE_RGB_MATRIX_SOLID_COLOR
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
#endif
108 changes: 108 additions & 0 deletions keyboards/boardsource/lulu/keymaps/rmeli/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
/*
Copyright 2022 Cole Smith <cole@boadsource.xyz>
Copyright 2022 Rocco Meli <@RMeli>
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

#include "rmeli.h"

enum layers {
_QWERTY,
_COLEMAK_DH,
_RAISE,
_LOWER,
_ADJUST,
};

#define RAISE MO(_RAISE)
#define LOWER MO(_LOWER)

#define QWY_DF DF(_QWERTY)
#define CMK_DF DF(_COLEMAK_DH)

// clang-format off
#define __________THUMB_LEFT_x4___________ KC_LALT, KC_LGUI, LOWER, KC_SPC
#define __________THUMB_RIGHT_x4__________ KC_ENT, RAISE, KC_LCTL, KC_RGUI
// clang-format on

/* LAYOUT
*
* ,-----------------------------. ,-----------------------------.
* | | | | | | | | | | | | | |
* |----+----+----+----+----+----| |----+----+----+----+----+----|
* | | | | | | | | | | | | | |
* |----+----+----+----+----+----| |----+----+----+----+----+----|
* | | | | | | |-----. ,-----| | | | | | |
* |----+----+----+----+----+----| | | |----+----+----+----+----+----|
* | | | | | | |-----| |-----| | | | | | |
* `----------------------------/ / \ \----------------------------'
* | | | | / / \ \ | | | |
* | | | |/ / \ \ | | | |
* `--------------''-----' '------''--------------'
*/

// Define wrapper for standard LULU layout
#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)

// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[_QWERTY] = LAYOUT_wrapper(
___________________NUMBER_LEFT_x6___________________, ___________________NUMBER_RIGHT_x6__________________,
___________________QWERTY_L1_x6_____________________, ___________________QWERTY_R1_x6_____________________,
___________________QWERTY_L2_x6_____________________, ___________________QWERTY_R2_x6_____________________,
___________________QWERTY_L3_x6_____________________, KC_LBRC, KC_RBRC, ___________________QWERTY_R3_x6_____________________,
__________THUMB_LEFT_x4___________, __________THUMB_RIGHT_x4__________
),

[_COLEMAK_DH] = LAYOUT_wrapper(
___________________NUMBER_LEFT_x6___________________, ___________________NUMBER_RIGHT_x6__________________,
________________COLEMAK_MOD_DH_L1_x6________________, ________________COLEMAK_MOD_DH_R1_x6________________,
________________COLEMAK_MOD_DH_L2_x6________________, ________________COLEMAK_MOD_DH_R2_x6________________,
________________COLEMAK_MOD_DH_L3_x6________________, KC_LBRC, KC_RBRC, ________________COLEMAK_MOD_DH_R3_x6________________,
__________THUMB_LEFT_x4___________, __________THUMB_RIGHT_x4__________
),

[_LOWER] = LAYOUT_wrapper(
____________________FUNC_LEFT_x6____________________, ____________________FUNC_RIGHT_x6___________________,
_______, ______________NUMBER_LEFT_x5_______________, ______________NUMBER_RIGHT_x5______________, _______,
_______, ______________UNICODE_L2_x5________________, ________________NAV_R2_x5__________________, XXXXXXX,
_______, ______________UNICODE_L3_x5________________, _______, _______, ________________NAV_R3_x5__________________, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),

[_RAISE] = LAYOUT_wrapper(
___________________NUMBER_LEFT_x6___________________, ___________________NUMBER_RIGHT_x6__________________,
___________________SYMBOL_LEFT_x6___________________, ___________________SYMBOL_RIGHT_x6__________________,
_______, ____________NAV_VIM_x4____________, XXXXXXX, ____________________SYMBOL_R2_x6____________________,
_______, _________________NONE_5x___________________, _______, _______, ____________________SYMBOL_R3_x6____________________,
_______, _______, _______, _______, _______, _______, _______, _______
),

[_ADJUST] = LAYOUT_wrapper(
QK_BOOT, _________________NONE_5x___________________, ______________________NONE_6x_______________________,
XXXXXXX, _________________NONE_5x___________________, _______________CONFIG_R1_x5________________, QWY_DF,
RGB_TOG, ________________RGB_L2_x5__________________, _______________CONFIG_R2_x5________________, XXXXXXX,
XXXXXXX, ________________RGB_L3_x5__________________, _______, _______, _______________CONFIG_R3_x5________________, CMK_DF,
_______, _______, _______, _______, _______, _______, _______, _______
)
};
// clang-format on

layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}
9 changes: 9 additions & 0 deletions keyboards/boardsource/lulu/keymaps/rmeli/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
TAP_DANCE_ENABLE = yes
AUTO_SHIFT_ENABLE = no // disable auto-shift with home row mods

UNICODEMAP_ENABLE = yes
NKRO_ENABLE = yes
MAGIC_ENABLE = yes

RGBLIGHT_ENABLE = no
RGB_MATRIX_ENABLE = yes
27 changes: 27 additions & 0 deletions keyboards/cannonkeys/serenity/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
Copyright 2015 Jun Wako <wakojun@gmail.com>
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/>.
*/

#pragma once

#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1

#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
#define WS2812_SPI_SCK_PIN B13
29 changes: 29 additions & 0 deletions keyboards/cannonkeys/serenity/halconf.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/* Copyright 2020 QMK
*
* 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/>.
*/

/*
* This file was auto-generated by:
* `qmk chibios-confmigrate -i keyboards/cannonkeys/devastatingtkl/halconf.h -r platforms/chibios/common/configs/halconf.h`
*/

#pragma once

#define HAL_USE_PWM TRUE

#define HAL_USE_SPI TRUE

#include_next <halconf.h>

156 changes: 156 additions & 0 deletions keyboards/cannonkeys/serenity/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
{
"keyboard_name": "Serenity",
"usb": {
"vid": "0xCA04",
"pid": "0x0017",
"device_version": "0.0.1"
},
"url": "https://cannonkeys.com",
"maintainer": "awkannan",
"bootloader": "stm32-dfu",
"processor": "STM32F072",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true,
"backlight": true,
"rgblight": true
},
"debounce": 5,
"matrix_pins": {
"cols": ["B1", "B2", "B10", "B11", "B12", "B14", "A8", "A9", "A10", "A3", "B0", "A2", "A1", "A7", "A0", "B4", "B6", "B7"],
"rows": ["A15", "B3", "B5", "A4", "A5", "F1"]
},
"backlight": {
"breathing": true,
"breathing_period": 5,
"levels": 15,
"pin": "A6"
},
"rgblight": {
"led_count": 12,
"pin": "B15",
"hue_steps": 24,
"saturation_steps": 16,
"brightness_steps": 16,
"animations": {
"alternating": true,
"breathing": true,
"christmas": true,
"knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"rgb_test": true,
"snake": true,
"static_gradient": true,
"twinkle": true
}
},
"indicators": {
"caps_lock": "B9",
"scroll_lock": "F0",
"on_state": 0
},
"layouts": {
"LAYOUT_all": {
"layout": [
{ "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
{ "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0.0 },
{ "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0.0 },
{ "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0.0 },
{ "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0.0 },
{ "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0.0 },
{ "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0.0 },
{ "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0.0 },
{ "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0.0 },
{ "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0.0 },
{ "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0.0 },
{ "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0.0 },
{ "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0.0 },
{ "label": "F13", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
{ "label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0.0 },
{ "label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0.0 },
{ "label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0.0 },
{ "label": "~", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
{ "label": "!", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
{ "label": "@", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
{ "label": "#", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
{ "label": "$", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
{ "label": "%", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
{ "label": "^", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
{ "label": "&", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
{ "label": "*", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
{ "label": "(", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
{ "label": ")", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
{ "label": "_", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
{ "label": "+", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
{ "label": "Bksp", "matrix": [1, 13], "x": 13.0, "y": 1.25 },
{ "label": "Del", "matrix": [1, 14], "x": 14.0, "y": 1.25 },
{ "label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25 },
{ "label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25 },
{ "label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.25 },
{ "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
{ "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
{ "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
{ "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
{ "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
{ "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
{ "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
{ "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
{ "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
{ "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
{ "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
{ "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
{ "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
{ "label": "|", "matrix": [2, 14], "w": 1.5, "x": 13.5, "y": 2.25 },
{ "label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25 },
{ "label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25 },
{ "label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.25 },
{ "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
{ "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
{ "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
{ "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
{ "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
{ "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
{ "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
{ "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
{ "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
{ "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
{ "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
{ "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
{ "label": "|", "matrix": [3, 12], "x": 12.75, "y": 3.25 },
{ "label": "Enter", "matrix": [3, 14], "w": 1.25, "x": 13.75, "y": 3.25 },
{ "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
{ "label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.25 },
{ "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
{ "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
{ "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25 },
{ "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25 },
{ "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25 },
{ "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25 },
{ "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25 },
{ "label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.25 },
{ "label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.25 },
{ "label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.25 },
{ "label": "Shift", "matrix": [4, 12], "w": 1.75, "x": 14.75, "y": 4.25 },
{ "label": "Fn", "matrix": [4, 14], "x": 16.5, "y": 4.25 },
{ "label": "\u2191", "matrix": [4, 16], "x": 18.75, "y": 4.25 },
{ "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
{ "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
{ "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
{ "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
{ "label": "Alt", "matrix": [5, 10], "w": 1.25, "x": 10.0, "y": 5.25 },
{ "label": "Fn", "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
{ "label": "Win", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
{ "label": "Ctrl", "matrix": [5, 14], "w": 1.25, "x": 13.75, "y": 5.25 },
{ "label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25 },
{ "label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25 },
{ "label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25 }
]
}
}
}
Loading

0 comments on commit 731633e

Please sign in to comment.