aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2021-10-09 15:31:32 -0700
committerDrashna Jael're <drashna@live.com>2021-10-09 15:31:32 -0700
commitff85eb8ee5c50ea1720b97713e95f2fb67a200ea (patch)
treefc045b5e373bdd5eb5b8839736c1e3d9454ee14c
parent9a20bc1f8f332008e3317b6ac425083d53e6df26 (diff)
parent3c188d98a1aebbabb06c635f91195182aa84fa4d (diff)
downloadqmk_firmware-ff85eb8ee5c50ea1720b97713e95f2fb67a200ea.tar.gz
qmk_firmware-ff85eb8ee5c50ea1720b97713e95f2fb67a200ea.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/dtisaac/cg108/cg108.c17
-rw-r--r--keyboards/dtisaac/cg108/cg108.h49
-rw-r--r--keyboards/dtisaac/cg108/config.h62
-rw-r--r--keyboards/dtisaac/cg108/info.json130
-rw-r--r--keyboards/dtisaac/cg108/keymaps/default/keymap.c27
-rw-r--r--keyboards/dtisaac/cg108/keymaps/default/readme.md1
-rw-r--r--keyboards/dtisaac/cg108/readme.md26
-rw-r--r--keyboards/dtisaac/cg108/rules.mk22
-rw-r--r--keyboards/dtisaac/dosa40rgb/config.h2
-rw-r--r--keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c55
-rw-r--r--keyboards/dtisaac/dosa40rgb/readme.md3
-rw-r--r--keyboards/dtisaac/dosa40rgb/rules.mk2
12 files changed, 339 insertions, 57 deletions
diff --git a/keyboards/dtisaac/cg108/cg108.c b/keyboards/dtisaac/cg108/cg108.c
new file mode 100644
index 000000000..c2a7254aa
--- /dev/null
+++ b/keyboards/dtisaac/cg108/cg108.c
@@ -0,0 +1,17 @@
1/* Copyright 2021 DTIsaac
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include "cg108.h"
diff --git a/keyboards/dtisaac/cg108/cg108.h b/keyboards/dtisaac/cg108/cg108.h
new file mode 100644
index 000000000..353219339
--- /dev/null
+++ b/keyboards/dtisaac/cg108/cg108.h
@@ -0,0 +1,49 @@
1/* Copyright 2021 DTIsaac
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21/* This is a shortcut to help you visually see your layout.
22 *
23 * The first section contains all of the arguments representing the physical
24 * layout of the board and position of the keys.
25 *
26 * The second converts the arguments into a two-dimensional array which
27 * represents the switch matrix.
28 */
29// default keymap: all 117 keys with ANSI Enter
30#define LAYOUT( \
31 K000, K001, K002, K003, K300, K301, K302, K303, K306, K307, K308, K309, K310, K004, K005, K006, K007, K008, K009, K010, \
32 K100, K101, K102, K103, K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K104, K105, K106, K107, K108, K109, K110, \
33 K200, K201, K202, K203, K500, K501, K502, K503, K505, K506, K507, K508, K509, K510, K204, K205, K206, K207, K208, K209, K210, \
34 K800, K801, K802, K803, K600, K601, K602, K603, K606, K607, K608, K609, K610, K807, K808, K809, K810, \
35 K900, K901, K902, K903, K700, K701, K702, K703, K705, K706, K707, K708, K709, K710, K906, K907, K908, K909, K910, \
36 KA00, KA01, KA02, KA03, K804, K805, K806, K604, K605, K904, K905, KA04, KA05, KA06, KA07, KA08, KA09, KA10 \
37) { \
38 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \
39 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \
40 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \
41 { K300, K301, K302, K303, KC_NO, KC_NO, K306, K307, K308, K309, K310 }, \
42 { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410 }, \
43 { K500, K501, K502, K503, KC_NO, K505, K506, K507, K508, K509, K510 }, \
44 { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610 }, \
45 { K700, K701, K702, K703, KC_NO, K705, K706, K707, K708, K709, K710 }, \
46 { K800, K801, K802, K803, K804, K805, K806, K807, K808, K809, K810 }, \
47 { K900, K901, K902, K903, K904, K905, K906, K907, K908, K909, K910 }, \
48 { KA00, KA01, KA02, KA03, KA04, KA05, KA06, KA07, KA08, KA09, KA10 } \
49}
diff --git a/keyboards/dtisaac/cg108/config.h b/keyboards/dtisaac/cg108/config.h
new file mode 100644
index 000000000..7ce2de42b
--- /dev/null
+++ b/keyboards/dtisaac/cg108/config.h
@@ -0,0 +1,62 @@
1/*
2Copyright 2021 DTIsaac
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "config_common.h"
21
22/* USB Device descriptor parameter */
23#define VENDOR_ID 0x4454 // DT
24#define PRODUCT_ID 0x4973 // Is
25#define DEVICE_VER 0x0002
26#define MANUFACTURER DTIsaac
27#define PRODUCT CG108
28
29/* key matrix size */
30#define MATRIX_ROWS 11
31#define MATRIX_COLS 11
32
33/*
34 * Keyboard Matrix Assignments
35 *
36 * Change this to how you wired your keyboard
37 * COLS: AVR pins used for columns, left to right
38 * ROWS: AVR pins used for rows, top to bottom
39 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
40 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
41 *
42 */
43/* key matrix pins */
44#define MATRIX_ROW_PINS { F4, F1, F0, F5, F6, F7, D4, D5, D3, D2, D0 }
45#define MATRIX_COL_PINS { C7, C6, B4, D7, B3, B2, B0, E6, B1, D1, D6 }
46#define UNUSED_PINS
47
48/* COL2ROW, ROW2COL */
49#define DIODE_DIRECTION COL2ROW
50
51#define LED_NUM_LOCK_PIN B5
52#define LED_CAPS_LOCK_PIN B6
53#define LED_SCROLL_LOCK_PIN B7
54#define LED_PIN_ON_STATE 0
55
56/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
57#define DEBOUNCE 5
58
59/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
60#define LOCKING_SUPPORT_ENABLE
61/* Locking resynchronize hack */
62#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/dtisaac/cg108/info.json b/keyboards/dtisaac/cg108/info.json
new file mode 100644
index 000000000..0ecc1764f
--- /dev/null
+++ b/keyboards/dtisaac/cg108/info.json
@@ -0,0 +1,130 @@
1{
2 "keyboard_name": "CG108",
3 "url": "",
4 "maintainer": "daotakisaac",
5 "width": 22.5,
6 "height": 6.5,
7 "layouts": {
8 "LAYOUT": {
9 "layout": [
10 {"label":"K000", "x":0, "y":0},
11 {"label":"K001", "x":2, "y":0},
12 {"label":"K002", "x":3, "y":0},
13 {"label":"K003", "x":4, "y":0},
14 {"label":"K300", "x":5, "y":0},
15 {"label":"K301", "x":6.5, "y":0},
16 {"label":"K302", "x":7.5, "y":0},
17 {"label":"K303", "x":8.5, "y":0},
18 {"label":"K306", "x":9.5, "y":0},
19 {"label":"K307", "x":11, "y":0},
20 {"label":"K308", "x":12, "y":0},
21 {"label":"K309", "x":13, "y":0},
22 {"label":"K310", "x":14, "y":0},
23 {"label":"K004", "x":15.25, "y":0},
24 {"label":"K005", "x":16.25, "y":0},
25 {"label":"K006", "x":17.25, "y":0},
26 {"label":"K007", "x":18.5, "y":0},
27 {"label":"K008", "x":19.5, "y":0},
28 {"label":"K009", "x":20.5, "y":0},
29 {"label":"K010", "x":21.5, "y":0},
30 {"label":"K100", "x":0, "y":1.5},
31 {"label":"K101", "x":1, "y":1.5},
32 {"label":"K102", "x":2, "y":1.5},
33 {"label":"K103", "x":3, "y":1.5},
34 {"label":"K400", "x":4, "y":1.5},
35 {"label":"K401", "x":5, "y":1.5},
36 {"label":"K402", "x":6, "y":1.5},
37 {"label":"K403", "x":7, "y":1.5},
38 {"label":"K404", "x":8, "y":1.5},
39 {"label":"K405", "x":9, "y":1.5},
40 {"label":"K406", "x":10, "y":1.5},
41 {"label":"K407", "x":11, "y":1.5},
42 {"label":"K408", "x":12, "y":1.5},
43 {"label":"K409", "x":13, "y":1.5},
44 {"label":"K410", "x":14, "y":1.5},
45 {"label":"K104", "x":15.25, "y":1.5},
46 {"label":"K105", "x":16.25, "y":1.5},
47 {"label":"K106", "x":17.25, "y":1.5},
48 {"label":"K107", "x":18.5, "y":1.5},
49 {"label":"K108", "x":19.5, "y":1.5},
50 {"label":"K109", "x":20.5, "y":1.5},
51 {"label":"K110", "x":21.5, "y":1.5},
52 {"label":"K200", "x":0, "y":2.5, "w":1.5},
53 {"label":"K201", "x":1.5, "y":2.5},
54 {"label":"K202", "x":2.5, "y":2.5},
55 {"label":"K203", "x":3.5, "y":2.5},
56 {"label":"K500", "x":4.5, "y":2.5},
57 {"label":"K501", "x":5.5, "y":2.5},
58 {"label":"K502", "x":6.5, "y":2.5},
59 {"label":"K503", "x":7.5, "y":2.5},
60 {"label":"K505", "x":8.5, "y":2.5},
61 {"label":"K506", "x":9.5, "y":2.5},
62 {"label":"K507", "x":10.5, "y":2.5},
63 {"label":"K508", "x":11.5, "y":2.5},
64 {"label":"K509", "x":12.5, "y":2.5},
65 {"label":"K510", "x":13.5, "y":2.5, "w":1.5},
66 {"label":"K204", "x":15.25, "y":2.5},
67 {"label":"K205", "x":16.25, "y":2.5},
68 {"label":"K206", "x":17.25, "y":2.5},
69 {"label":"K207", "x":18.5, "y":2.5},
70 {"label":"K208", "x":19.5, "y":2.5},
71 {"label":"K209", "x":20.5, "y":2.5},
72 {"label":"K210", "x":21.5, "y":2.5},
73 {"label":"K800", "x":0, "y":3.5, "w":1.75},
74 {"label":"K801", "x":1.75, "y":3.5},
75 {"label":"K802", "x":2.75, "y":3.5},
76 {"label":"K803", "x":3.75, "y":3.5},
77 {"label":"K600", "x":4.75, "y":3.5},
78 {"label":"K601", "x":5.75, "y":3.5},
79 {"label":"K602", "x":6.75, "y":3.5},
80 {"label":"K603", "x":7.75, "y":3.5},
81 {"label":"K606", "x":8.75, "y":3.5},
82 {"label":"K607", "x":9.75, "y":3.5},
83 {"label":"K608", "x":10.75, "y":3.5},
84 {"label":"K609", "x":11.75, "y":3.5},
85 {"label":"K610", "x":12.75, "y":3.5, "w":2.25},
86 {"label":"K807", "x":18.5, "y":3.5},
87 {"label":"K808", "x":19.5, "y":3.5},
88 {"label":"K809", "x":20.5, "y":3.5},
89 {"label":"K810", "x":21.5, "y":3.5},
90 {"label":"K900", "x":0, "y":4.5, "w":1.25},
91 {"label":"K901", "x":1.25, "y":4.5},
92 {"label":"K902", "x":2.25, "y":4.5},
93 {"label":"K903", "x":3.25, "y":4.5},
94 {"label":"K700", "x":4.25, "y":4.5},
95 {"label":"K701", "x":5.25, "y":4.5},
96 {"label":"K702", "x":6.25, "y":4.5},
97 {"label":"K703", "x":7.25, "y":4.5},
98 {"label":"K705", "x":8.25, "y":4.5},
99 {"label":"K706", "x":9.25, "y":4.5},
100 {"label":"K707", "x":10.25, "y":4.5},
101 {"label":"K708", "x":11.25, "y":4.5},
102 {"label":"K709", "x":12.25, "y":4.5, "w":1.75},
103 {"label":"K710", "x":14, "y":4.5},
104 {"label":"K906", "x":16.25, "y":4.5},
105 {"label":"K907", "x":18.5, "y":4.5},
106 {"label":"K908", "x":19.5, "y":4.5},
107 {"label":"K909", "x":20.5, "y":4.5},
108 {"label":"K910", "x":21.5, "y":4.5},
109 {"label":"KA00", "x":0, "y":5.5, "w":1.5},
110 {"label":"KA01", "x":1.5, "y":5.5},
111 {"label":"KA02", "x":2.5, "y":5.5, "w":1.5},
112 {"label":"KA03", "x":4, "y":5.5},
113 {"label":"K804", "x":5, "y":5.5, "w":2},
114 {"label":"K805", "x":7, "y":5.5},
115 {"label":"K806", "x":8, "y":5.5, "w":2},
116 {"label":"K604", "x":10, "y":5.5},
117 {"label":"K605", "x":11, "y":5.5, "w":1.5},
118 {"label":"K904", "x":12.5, "y":5.5},
119 {"label":"K905", "x":13.5, "y":5.5, "w":1.5},
120 {"label":"KA04", "x":15.25, "y":5.5},
121 {"label":"KA05", "x":16.25, "y":5.5},
122 {"label":"KA06", "x":17.25, "y":5.5},
123 {"label":"KA07", "x":18.5, "y":5.5},
124 {"label":"KA08", "x":19.5, "y":5.5},
125 {"label":"KA09", "x":20.5, "y":5.5},
126 {"label":"KA10", "x":21.5, "y":5.5}
127 ]
128 }
129 }
130}
diff --git a/keyboards/dtisaac/cg108/keymaps/default/keymap.c b/keyboards/dtisaac/cg108/keymaps/default/keymap.c
new file mode 100644
index 000000000..b7658315c
--- /dev/null
+++ b/keyboards/dtisaac/cg108/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
1/* Copyright 2021 DTIsaac
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 [0] = LAYOUT(
20 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,
21 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
22 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
23 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
24 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PCMM, KC_PDOT, KC_PENT
26 )
27}; \ No newline at end of file
diff --git a/keyboards/dtisaac/cg108/keymaps/default/readme.md b/keyboards/dtisaac/cg108/keymaps/default/readme.md
new file mode 100644
index 000000000..48c74775d
--- /dev/null
+++ b/keyboards/dtisaac/cg108/keymaps/default/readme.md
@@ -0,0 +1 @@
# The default keymap for CG108
diff --git a/keyboards/dtisaac/cg108/readme.md b/keyboards/dtisaac/cg108/readme.md
new file mode 100644
index 000000000..3bf38f768
--- /dev/null
+++ b/keyboards/dtisaac/cg108/readme.md
@@ -0,0 +1,26 @@
1# CG108
2
3![CG108](https://i.imgur.com/AUqkNhEh.jpg)
4
5A base full-size keyboard CG108 of DTIsaac
6
7* Keyboard Maintainer: [DTIsaac](https://github.com/daotakisaac)
8* Hardware Supported: CG108 DTIsaac
9
10Make example for this keyboard (after setting up your build environment):
11
12 make dtisaac/cg108:default
13
14Flashing example for this keyboard:
15
16 make dtisaac/cg108:default:flash
17
18See 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).
19
20## Bootloader
21
22Enter the bootloader in 3 ways:
23
24* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
25* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
26* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/dtisaac/cg108/rules.mk b/keyboards/dtisaac/cg108/rules.mk
new file mode 100644
index 000000000..5890068ca
--- /dev/null
+++ b/keyboards/dtisaac/cg108/rules.mk
@@ -0,0 +1,22 @@
1# MCU name
2MCU = atmega32u4
3
4# Bootloader selection
5BOOTLOADER = atmel-dfu
6
7# Build Options
8# change yes to no to disable
9#
10BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
11MOUSEKEY_ENABLE = no # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug
14COMMAND_ENABLE = no # Commands for debug and configuration
15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = yes # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h
index 0ed29bf94..62c8c6e22 100644
--- a/keyboards/dtisaac/dosa40rgb/config.h
+++ b/keyboards/dtisaac/dosa40rgb/config.h
@@ -61,7 +61,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
61#endif 61#endif
62 62
63/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 63/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
64#define DEBOUNCE 5 64//#define DEBOUNCE 5
65 65
66/* disable these deprecated features by default */ 66/* disable these deprecated features by default */
67#define NO_ACTION_MACRO 67#define NO_ACTION_MACRO
diff --git a/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c b/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c
index e25bd5970..19fcb7868 100644
--- a/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c
+++ b/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c
@@ -14,8 +14,6 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#include QMK_KEYBOARD_H 16#include QMK_KEYBOARD_H
17#include "spi_master.h"
18#include "wait.h"
19 17
20// Defines names for use in layer keycodes and the keymap 18// Defines names for use in layer keycodes and the keymap
21enum layer_names { 19enum layer_names {
@@ -28,14 +26,9 @@ enum layer_names {
28enum custom_keycodes { 26enum custom_keycodes {
29 BASE, 27 BASE,
30 L1, 28 L1,
31 BLE_DIS, // Disconnect BLE
32 LED_EN, // Toggle LED
33}; 29};
34 30
35#define L1 MO(_L1) 31#define L1 MO(_L1)
36const uint8_t cm1[] = "AT+GAPSTOPADV";
37const uint8_t cm2[] = "AT+GAPDISCONNECT";
38const uint8_t cm3[] = "ATZ";
39 32
40const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 33const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
41 /* Base */ 34 /* Base */
@@ -52,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
52 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
53 ), 46 ),
54 [_L2] = LAYOUT( 47 [_L2] = LAYOUT(
55 LED_EN, RGB_RMOD, KC_UP, RGB_MOD, RGB_HUI, RGB_VAI, RGB_SAI, RGB_SPI, KC_TRNS, OUT_USB, OUT_BT, BLE_DIS, 48 RGB_TOG, RGB_RMOD, KC_UP, RGB_MOD, RGB_HUI, RGB_VAI, RGB_SAI, RGB_SPI, KC_TRNS, OUT_USB, OUT_BT, KC_TRNS,
56 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, RGB_HUD, RGB_VAD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_BSLS, 49 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, RGB_HUD, RGB_VAD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_BSLS,
57 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
58 KC_TRNS, KC_TRNS, KC_TRNS, KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 51 KC_TRNS, KC_TRNS, KC_TRNS, KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
@@ -74,49 +67,3 @@ void rgb_matrix_indicators_user(void)
74 rgb_matrix_set_color(22, 200, 0, 200); 67 rgb_matrix_set_color(22, 200, 0, 200);
75 } 68 }
76} 69}
77
78void sdep_send(const uint8_t *cmd, uint8_t len) {
79
80 spi_start(ADAFRUIT_BLE_CS_PIN, false, 0, 2);
81 uint8_t cnt = 200;
82 bool ready = false;
83
84 do {
85 ready = spi_write(0x10) != 0xFE;
86 if (ready) {
87 break;
88 }
89 spi_stop();
90 wait_us(25);
91 spi_start(ADAFRUIT_BLE_CS_PIN, false, 0, 2);
92 } while (cnt--);
93
94 if (ready) {
95 spi_write(0x00);
96 spi_write(0x0A);
97 spi_write(len);
98 spi_transmit(cmd, len);
99 }
100
101 spi_stop();
102}
103
104bool process_record_user(uint16_t keycode, keyrecord_t *record) {
105
106 switch (keycode) {
107 case LED_EN:
108 if (record->event.pressed) {
109 DDRB = DDRB ^ 0x20;
110 PORTB &= ~(1 << 5);
111 }
112 return false;
113 case BLE_DIS:
114 if (record->event.pressed) {
115 sdep_send(cm1,sizeof(cm1));
116 sdep_send(cm2,sizeof(cm2));
117 sdep_send(cm3,sizeof(cm3));
118 }
119 return false;
120 }
121 return true;
122} \ No newline at end of file
diff --git a/keyboards/dtisaac/dosa40rgb/readme.md b/keyboards/dtisaac/dosa40rgb/readme.md
index 189dc7b9b..5f288c6b7 100644
--- a/keyboards/dtisaac/dosa40rgb/readme.md
+++ b/keyboards/dtisaac/dosa40rgb/readme.md
@@ -19,7 +19,8 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
19 19
20## Bootloader 20## Bootloader
21 21
22Enter the bootloader in 2 ways: 22Enter the bootloader in 3 ways:
23 23
24* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
24* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead 25* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
25* **Keycode in layout**: Press the key mapped to `RESET` if it is available 26* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/dtisaac/dosa40rgb/rules.mk b/keyboards/dtisaac/dosa40rgb/rules.mk
index 8924c0a41..a76047eb2 100644
--- a/keyboards/dtisaac/dosa40rgb/rules.mk
+++ b/keyboards/dtisaac/dosa40rgb/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = lufa-dfu
7# Build Options 7# Build Options
8# change yes to no to disable 8# change yes to no to disable
9# 9#
10BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite 10BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
11MOUSEKEY_ENABLE = no # Mouse keys 11MOUSEKEY_ENABLE = no # Mouse keys
12EXTRAKEY_ENABLE = no # Audio control and System control 12EXTRAKEY_ENABLE = no # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug 13CONSOLE_ENABLE = no # Console for debug
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-08 09:46:40 +0000