Skip to content

Commit

Permalink
Merge branch 'qmk:master' into PR-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
cheekcheek authored Aug 30, 2023
2 parents 126fb78 + 9614c3a commit 2af6233
Show file tree
Hide file tree
Showing 23 changed files with 434 additions and 27 deletions.
40 changes: 40 additions & 0 deletions keyboards/cannonkeys/meetuppad2023/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"manufacturer": "CannonKeys",
"keyboard_name": "Meetup Pad 2023",
"maintainer": "awkannan",
"bootloader": "stm32-dfu",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"matrix_pins": {
"cols": ["B11", "B10", "B2", "B0"],
"rows": ["B1", "A7"]
},
"processor": "STM32F072",
"url": "https://cannonkeys.com",
"usb": {
"device_version": "0.0.1",
"pid": "0x2023",
"vid": "0xCA04"
},
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [1, 0], "x": 0, "y": 0},
{"matrix": [0, 0], "x": 1, "y": 0},
{"matrix": [1, 1], "x": 0, "y": 1},
{"matrix": [0, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 0, "y": 2},
{"matrix": [0, 2], "x": 1, "y": 2},
{"matrix": [1, 3], "x": 0, "y": 3},
{"matrix": [0, 3], "x": 1, "y": 3}
]
}
}
}
20 changes: 20 additions & 0 deletions keyboards/cannonkeys/meetuppad2023/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright 2023 Andrew Kannan
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_1, KC_2,
KC_3, KC_4,
KC_5, KC_6,
KC_7, MO(1)
),

[1] = LAYOUT(
QK_BOOT, KC_8,
KC_9, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS
)
};
35 changes: 35 additions & 0 deletions keyboards/cannonkeys/meetuppad2023/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// Copyright 2023 Andrew Kannan
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

enum custom_keycodes {
MYMACRO = QK_KB_0,
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
MYMACRO, KC_1,
KC_2, KC_3,
KC_4, KC_5,
KC_6, MO(1)
),

[1] = LAYOUT(
QK_BOOT, KC_7,
KC_8, KC_9,
KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS
)
};

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case MYMACRO:
if (record->event.pressed) {
SEND_STRING("I went to the CannonKeys 2023 meetup and all I got was this macropad");
}
break;
}
return true;
};
1 change: 1 addition & 0 deletions keyboards/cannonkeys/meetuppad2023/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
18 changes: 18 additions & 0 deletions keyboards/cannonkeys/meetuppad2023/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# CannonKeys Meetup Pad 2023

* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
* Hardware Supported: STM32F072CBT6

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

make cannonkeys/meetuppad2023:default

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).

## Bootloader

Enter the bootloader in 3 ways:

* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top right on this board) and plug in the keyboard
* **Physical reset button**: Swap the boot switch on the back of the PCB to "1" and hit the reset button
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
2 changes: 2 additions & 0 deletions keyboards/cannonkeys/meetuppad2023/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
2 changes: 1 addition & 1 deletion keyboards/chosfox/cf81/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};

#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
Expand Down
2 changes: 1 addition & 1 deletion keyboards/chosfox/cf81/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};

#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
Expand Down
9 changes: 6 additions & 3 deletions keyboards/doio/kb16/kb16.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
// OLED animation
#include "./lib/logo.h"

// Default timeout for displaying boot logo.
#ifndef OLED_LOGO_TIMEOUT
#define OLED_LOGO_TIMEOUT 5000
#endif

#ifdef OLED_ENABLE
uint16_t startup_timer;

Expand All @@ -32,16 +37,14 @@
bool oled_task_kb(void) {
static bool finished_logo = false;

if ((timer_elapsed(startup_timer) < 5000) && !finished_logo) {
if ((timer_elapsed(startup_timer) < OLED_LOGO_TIMEOUT) && !finished_logo) {
render_logo();
} else {
finished_logo = true;

if (!oled_task_user()) {
return false;
}
}

return true;
}
#endif
Expand Down
10 changes: 8 additions & 2 deletions keyboards/ferris/keymaps/test/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ void matrix_init_user(void) {
//debug_mouse=true;
}

// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_P0, DB_TOGG, KC_P2, KC_P3)
[0] = LAYOUT(
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
KC_1, KC_2, KC_3, KC_4
)
};

// clang-format on
6 changes: 6 additions & 0 deletions keyboards/idank/sweeq/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Copyright 2023 Idan Kamara (@idank)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#define MASTER_RIGHT
80 changes: 80 additions & 0 deletions keyboards/idank/sweeq/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"url": "https://github.com/idank/keyboards/tree/main/sweeq",
"maintainer": "idank",
"keyboard_name": "Sweeq",
"manufacturer": "idank",
"development_board": "promicro",
"usb": {
"vid": "0xC3AB",
"pid": "0x3139",
"device_version": "0.0.1"
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"matrix_pins": {
"cols": [ "F4", "F5", "F6", "F7", "B1" ],
"rows": [ "D4", "C6", "D7", "E6" ]
},
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
"soft_serial_pin": "D2"
},
"community_layouts": ["split_3x5_2"],
"layout_aliases": {
"LAYOUT": "LAYOUT_split_3x5_2"
},
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [
{"x": 0, "y": 0.93, "matrix": [0, 0]},
{"x": 1, "y": 0.31, "matrix": [0, 1]},
{"x": 2, "y": 0, "matrix": [0, 2]},
{"x": 3, "y": 0.28, "matrix": [0, 3]},
{"x": 4, "y": 0.42, "matrix": [0, 4]},

{"x": 7, "y": 0.42, "matrix": [4, 4]},
{"x": 8, "y": 0.28, "matrix": [4, 3]},
{"x": 9, "y": 0, "matrix": [4, 2]},
{"x": 10, "y": 0.31, "matrix": [4, 1]},
{"x": 11, "y": 0.93, "matrix": [4, 0]},

{"x": 0, "y": 1.93, "matrix": [1, 0]},
{"x": 1, "y": 1.31, "matrix": [1, 1]},
{"x": 2, "y": 1, "matrix": [1, 2]},
{"x": 3, "y": 1.28, "matrix": [1, 3]},
{"x": 4, "y": 1.42, "matrix": [1, 4]},

{"x": 7, "y": 1.42, "matrix": [5, 4]},
{"x": 8, "y": 1.28, "matrix": [5, 3]},
{"x": 9, "y": 1, "matrix": [5, 2]},
{"x": 10, "y": 1.31, "matrix": [5, 1]},
{"x": 11, "y": 1.93, "matrix": [5, 0]},

{"x": 0, "y": 2.93, "matrix": [2, 0]},
{"x": 1, "y": 2.31, "matrix": [2, 1]},
{"x": 2, "y": 2, "matrix": [2, 2]},
{"x": 3, "y": 2.28, "matrix": [2, 3]},
{"x": 4, "y": 2.42, "matrix": [2, 4]},

{"x": 7, "y": 2.42, "matrix": [6, 4]},
{"x": 8, "y": 2.28, "matrix": [6, 3]},
{"x": 9, "y": 2, "matrix": [6, 2]},
{"x": 10, "y": 2.31, "matrix": [6, 1]},
{"x": 11, "y": 2.93, "matrix": [6, 0]},

{"x": 3.5, "y": 3.75, "matrix": [3, 3]},
{"x": 4.5, "y": 4, "matrix": [3, 4]},

{"x": 6.5, "y": 4, "matrix": [7, 4]},
{"x": 7.5, "y": 3.75, "matrix": [7, 3]}
]
}
}
}
21 changes: 21 additions & 0 deletions keyboards/idank/sweeq/keymaps/default/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright 2023 Idan Kamara (@idank)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once
// Set the mouse settings to a comfortable speed/accuracy trade-off,
// assuming a screen refresh rate of 60 Htz or higher
// The default is 50. This makes the mouse ~3 times faster and more accurate
#define MOUSEKEY_INTERVAL 16
// The default is 20. Since we made the mouse about 3 times faster with the previous setting,
// give it more time to accelerate to max speed to retain precise control over short distances.
#define MOUSEKEY_TIME_TO_MAX 40
// The default is 300. Let's try and make this as low as possible while keeping the cursor responsive
#define MOUSEKEY_DELAY 100
// It makes sense to use the same delay for the mouseweel
#define MOUSEKEY_WHEEL_DELAY 100
// The default is 100
#define MOUSEKEY_WHEEL_INTERVAL 50
// The default is 40
#define MOUSEKEY_WHEEL_TIME_TO_MAX 100

#define QUICK_TAP_TERM 0
Loading

0 comments on commit 2af6233

Please sign in to comment.