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.

Sign up for GitHub

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

[Keyboard] [Keymap] Update G60BLE folder to allow firmware to use Bluetooth with QMK keymaps #21120

Merged
merged 13 commits into from
Jun 5, 2023
Merged

[Keyboard] [Keymap] Update G60BLE folder to allow firmware to use Bluetooth with QMK keymaps #21120

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d3cecce
added bluetooth code to rules.mk for BT + QMK
will-hedges Jun 2, 2023
aeb58be
added my keymap
will-hedges Jun 2, 2023
9cf5990
reverted licensing, removed VIA_ENABLE from kb rules.mk
will-hedges Jun 3, 2023
59d9f5e
moved tap dance C file to keymap, disabled NKRO at kb level
will-hedges Jun 3, 2023
19889da
Move layers from #define to enum layers
will-hedges Jun 3, 2023
30b4bb4
Update maxtrix diagram description from g60 to g60ble
will-hedges Jun 3, 2023
e8be5fe
added license to my keymap.c
will-hedges Jun 3, 2023
1ff6254
changed layer order, added mod taps
will-hedges Jun 3, 2023
df6c741
added Ctrl + Alt + Del to _WORK
will-hedges Jun 3, 2023
5bd0dd5
added BSLS_DEL tap dance
will-hedges Jun 3, 2023
8f7d6d8
[g60ble/chemicalwill] moved Ctrl+Alt+Del to _FN1, KC_APP back to _WORK
will-hedges Jun 3, 2023
ce21405
added persistent default layer switching
will-hedges Jun 3, 2023
b9655f2
added F8 tap dance
will-hedges Jun 5, 2023
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
Next Next commit
added bluetooth code to rules.mk for BT + QMK 
* copied matrix diagram from g60
* reorganized config.h to better mirror g60
  • Loading branch information
@will-hedges
will-hedges committed Jun 3, 2023
commit d3cecce6074abaca6b7cb761882e6c96a287a657
6 changes: 3 additions & 3 deletions keyboards/bioi/g60/matrix_diagram.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤ └──────┴───┴───┘
│40 │41 │42 │45 │4A │4B │48 │4C │4D │
└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
┌────────┐
│30 │ 2.25u LShift
└────────┘
┌────────┐ ┌─────────────┐
│30 │ 2.25u LShift │3D │ 2.75u RShift
└────────┘ └─────────────┘
┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
│40 │41 │42 │45 │4A │4B │4C │4D │ Standard
└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
Expand Down
13 changes: 7 additions & 6 deletions keyboards/bioi/g60ble/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
#pragma once

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE

/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

/* RGB Underglow */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
Expand All @@ -21,5 +16,11 @@
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

/* key combination for magic key command */
#define KEYBOARD_LOCK_ENABLE
#define MAGIC_KEY_LOCK L
24 changes: 24 additions & 0 deletions keyboards/bioi/g60ble/matrix_diagram.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Matrix Diagram for Basic IO Instruments G60
will-hedges marked this conversation as resolved.
Show resolved Hide resolved

```
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │49 │ │0D │ 2u Backspace
├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ └─┬─────┤
│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ │ │
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌──┴┐2D │ ISO Enter
│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │ │2C │ │
├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌─────┴┬──┴┬───┤
│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3C │ │3D │47 │3C │ 1.75u/1u/1u RShift
├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤ └──────┴───┴───┘
│40 │41 │42 │45 │4A │4B │48 │4C │4D │
└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
┌────────┐ ┌─────────────┐
│30 │ 2.25u LShift │3D │ 2.75u RShift
└────────┘ └─────────────┘
┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
│40 │41 │42 │45 │4A │4B │4C │4D │ Standard
└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
│40 │41 │42 │45 │4B │4C │4D │ Tsangan/WKL/HHKB
└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
```
13 changes: 11 additions & 2 deletions keyboards/bioi/g60ble/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,21 @@ F_CPU = 8000000
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
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 = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes
LTO_ENABLE = yes
BLUETOOTH_ENABLE = yes
BLUETOOTH_DRIVER = custom

VIA_ENABLE = yes # VIA support should be enabled here due to the main() loop will be compiled first.

will-hedges marked this conversation as resolved.
Show resolved Hide resolved
SRC += usart.c ble.c

OPT_DEFS += -DUART_RX1_BUFFER_SIZE=16 -DUART_TX1_BUFFER_SIZE=16
OPT_DEFS += -DUSART1_ENABLED