aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkakunpc <15257475+kakunpc@users.noreply.github.com>2019-12-12 03:40:00 +0900
committerDrashna Jaelre <drashna@live.com>2019-12-11 10:40:00 -0800
commitccda62616d422ae6df810b6fd68fc8e61002e278 (patch)
treede1fa90894cd6bd780ac6c28d0dd1c830b5d9e53
parent698d0dbda8a4b081103b4a382baa1f99e3f77ceb (diff)
downloadqmk_firmware-ccda62616d422ae6df810b6fd68fc8e61002e278.tar.gz
qmk_firmware-ccda62616d422ae6df810b6fd68fc8e61002e278.zip
[Keyboard] update angel64 (#7545)
* add angel64 rev1 * update angel64 * fix keymap.c
Diffstat
-rw-r--r--keyboards/angel64/alpha/alpha.c (renamed from keyboards/angel64/angel64.c)2
-rw-r--r--keyboards/angel64/alpha/alpha.h (renamed from keyboards/angel64/angel64.h)0
-rw-r--r--keyboards/angel64/alpha/config.h (renamed from keyboards/angel64/config.h)2
-rw-r--r--keyboards/angel64/alpha/info.json (renamed from keyboards/angel64/info.json)2
-rw-r--r--keyboards/angel64/alpha/keymaps/default/config.h (renamed from keyboards/angel64/keymaps/default/config.h)0
-rw-r--r--keyboards/angel64/alpha/keymaps/default/keymap.c60
-rw-r--r--keyboards/angel64/alpha/keymaps/default/readme.md (renamed from keyboards/angel64/keymaps/default/readme.md)0
-rw-r--r--keyboards/angel64/alpha/matrix.c (renamed from keyboards/angel64/matrix.c)0
-rw-r--r--keyboards/angel64/alpha/readme.md15
-rw-r--r--keyboards/angel64/alpha/rules.mk0
-rw-r--r--keyboards/angel64/keymaps/default/keymap.c58
-rw-r--r--keyboards/angel64/readme.md8
-rw-r--r--keyboards/angel64/rev1/config.h242
-rw-r--r--keyboards/angel64/rev1/info.json12
-rw-r--r--keyboards/angel64/rev1/keymaps/default/config.h19
-rw-r--r--keyboards/angel64/rev1/keymaps/default/keymap.c34
-rw-r--r--keyboards/angel64/rev1/keymaps/default/readme.md1
-rw-r--r--keyboards/angel64/rev1/keymaps/kakunpc/config.h19
-rw-r--r--keyboards/angel64/rev1/keymaps/kakunpc/keymap.c195
-rw-r--r--keyboards/angel64/rev1/keymaps/kakunpc/readme.md1
-rw-r--r--keyboards/angel64/rev1/matrix.c287
-rw-r--r--keyboards/angel64/rev1/readme.md15
-rw-r--r--keyboards/angel64/rev1/rev1.c51
-rw-r--r--keyboards/angel64/rev1/rev1.h48
-rw-r--r--keyboards/angel64/rev1/rules.mk0
-rw-r--r--keyboards/angel64/rules.mk3
26 files changed, 1009 insertions, 65 deletions
diff --git a/keyboards/angel64/angel64.c b/keyboards/angel64/alpha/alpha.c
index d26c3608b..3d2d1de77 100644
--- a/keyboards/angel64/angel64.c
+++ b/keyboards/angel64/alpha/alpha.c
@@ -13,7 +13,7 @@
13 * You should have received a copy of the GNU General Public License 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/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#include "angel64.h" 16#include "alpha.h"
17 17
18// Optional override functions below. 18// Optional override functions below.
19// You can leave any or all of these undefined. 19// You can leave any or all of these undefined.
diff --git a/keyboards/angel64/angel64.h b/keyboards/angel64/alpha/alpha.h
index 6c0898a56..6c0898a56 100644
--- a/keyboards/angel64/angel64.h
+++ b/keyboards/angel64/alpha/alpha.h
diff --git a/keyboards/angel64/config.h b/keyboards/angel64/alpha/config.h
index fb683bc15..f10f9b091 100644
--- a/keyboards/angel64/config.h
+++ b/keyboards/angel64/alpha/config.h
@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
21 21
22/* USB Device descriptor parameter */ 22/* USB Device descriptor parameter */
23#define VENDOR_ID 0xFEED 23#define VENDOR_ID 0xFEED
24#define PRODUCT_ID 0x0000 24#define PRODUCT_ID 0x0A64
25#define DEVICE_VER 0x0001 25#define DEVICE_VER 0x0001
26#define MANUFACTURER kakunpc 26#define MANUFACTURER kakunpc
27#define PRODUCT angel64 27#define PRODUCT angel64
diff --git a/keyboards/angel64/info.json b/keyboards/angel64/alpha/info.json
index 2bcd0c9ea..3d1d85b36 100644
--- a/keyboards/angel64/info.json
+++ b/keyboards/angel64/alpha/info.json
@@ -1,5 +1,5 @@
1{ 1{
2 "keyboard_name": "angel64", 2 "keyboard_name": "angel64_alpha",
3 "url": "https://kakunpc.booth.pm/", 3 "url": "https://kakunpc.booth.pm/",
4 "maintainer": "kakunpc", 4 "maintainer": "kakunpc",
5 "width": 14, 5 "width": 14,
diff --git a/keyboards/angel64/keymaps/default/config.h b/keyboards/angel64/alpha/keymaps/default/config.h
index bf1149ebc..bf1149ebc 100644
--- a/keyboards/angel64/keymaps/default/config.h
+++ b/keyboards/angel64/alpha/keymaps/default/config.h
diff --git a/keyboards/angel64/alpha/keymaps/default/keymap.c b/keyboards/angel64/alpha/keymaps/default/keymap.c
new file mode 100644
index 000000000..7e880e18c
--- /dev/null
+++ b/keyboards/angel64/alpha/keymaps/default/keymap.c
@@ -0,0 +1,60 @@
1/* Copyright 2019 kakunpc
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
18enum layers{
19 BASE = 0,
20 COMMAND
21};
22
23#define KC_COMMAND LT(COMMAND,KC_SPC)
24
25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26 [BASE] = LAYOUT(
27 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,
28 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,
29 LCTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
30 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT,
31 KC_TAB, KC_LALT, KC_LGUI, KC_COMMAND, KC_SPC, KC_COMMAND, KC_APP, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL),
32 [COMMAND] = LAYOUT(
33 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_BSPC,
34 KC_NO, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
35 KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
36 KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
37 KC_NO, KC_NO, KC_NO, _______, KC_NO, _______, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
38};
39
40#ifdef OLED_DRIVER_ENABLE
41void oled_task_user(void) {
42 oled_write_P(PSTR("Layer: "), false);
43 switch (biton32(layer_state)) {
44 case BASE:
45 oled_write_P(PSTR("Default\n"), false);
46 break;
47 case COMMAND:
48 oled_write_P(PSTR("COMMAND\n"), false);
49 break;
50 default:
51 // Or use the write_ln shortcut over adding 'n' to the end of your string
52 oled_write_ln_P(PSTR("Undefined"), false);
53 }
54
55 // Host Keyboard LED Status
56 oled_write_P(IS_HOST_LED_ON(USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR(" "), false);
57 oled_write_P(IS_HOST_LED_ON(USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false);
58 oled_write_P(IS_HOST_LED_ON(USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false);
59}
60#endif
diff --git a/keyboards/angel64/keymaps/default/readme.md b/keyboards/angel64/alpha/keymaps/default/readme.md
index f4cd48f2e..f4cd48f2e 100644
--- a/keyboards/angel64/keymaps/default/readme.md
+++ b/keyboards/angel64/alpha/keymaps/default/readme.md
diff --git a/keyboards/angel64/matrix.c b/keyboards/angel64/alpha/matrix.c
index e06fc15dc..e06fc15dc 100644
--- a/keyboards/angel64/matrix.c
+++ b/keyboards/angel64/alpha/matrix.c
diff --git a/keyboards/angel64/alpha/readme.md b/keyboards/angel64/alpha/readme.md
new file mode 100644
index 000000000..d646edeb7
--- /dev/null
+++ b/keyboards/angel64/alpha/readme.md
@@ -0,0 +1,15 @@
1# angel64
2
3![angel64](https://i.gyazo.com/6e2ea6c58d3253c496dc0518f2641ff9.jpg)
4
5Keyboard for tablets.
6
7* Keyboard Maintainer: [kakunpc](https://github.com/kakunpc)
8* Hardware Supported: angel64_alpha, promicro
9* Hardware Availability: booth([@kakunpc](https://kakunpc.booth.pm/))
10
11Make example for this keyboard (after setting up your build environment):
12
13 make angel64/alpha:default
14
15See 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).
diff --git a/keyboards/angel64/alpha/rules.mk b/keyboards/angel64/alpha/rules.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/keyboards/angel64/alpha/rules.mk
diff --git a/keyboards/angel64/keymaps/default/keymap.c b/keyboards/angel64/keymaps/default/keymap.c
deleted file mode 100644
index 50ca64fde..000000000
--- a/keyboards/angel64/keymaps/default/keymap.c
+++ /dev/null
@@ -1,58 +0,0 @@
1/* Copyright 2019 kakunpc
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
18enum layers{
19 BASE = 0,
20 COMMAND
21};
22
23#define KC_COMMAND LT(COMMAND,KC_SPC)
24
25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26 [BASE] = LAYOUT(
27 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 ,
28 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,
29 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
30 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT,
31 KC_LCTL, KC_LALT, KC_LGUI, KC_COMMAND, KC_SPC, KC_COMMAND, KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL
32 ),
33 [COMMAND] = LAYOUT(
34 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_BSPC ,
35 KC_NO, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
36 KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
37 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,
38 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
39 )
40};
41
42bool process_record_user(uint16_t keycode, keyrecord_t *record) {
43 return true;
44}
45
46void matrix_init_user(void) {
47}
48
49void matrix_scan_user(void) {
50
51}
52
53void led_set_user(uint8_t usb_led) {
54
55}
56
57void keyboard_post_init_user(void) {
58}
diff --git a/keyboards/angel64/readme.md b/keyboards/angel64/readme.md
index b56592cbb..791620144 100644
--- a/keyboards/angel64/readme.md
+++ b/keyboards/angel64/readme.md
@@ -1,12 +1,12 @@
1# angel64 1# angel64
2 2
3![angel64](https://i.gyazo.com/6e2ea6c58d3253c496dc0518f2641ff9.jpg) 3![angel64](https://i.gyazo.com/d114d4b1789009dbe8c910eaeb3295c5.jpg)
4 4
5Keyboard for tablets. 5Keyboard for tablets.
6 6
7Keyboard Maintainer: [kakunpc](https://github.com/kakunpc) 7* Keyboard Maintainer: [kakunpc](https://github.com/kakunpc)
8Hardware Supported: angel64_alpha, promicro 8* Hardware Supported: angel64_alpha, angel64_rev1, promicro
9Hardware Availability: booth([@kakunpc](https://kakunpc.booth.pm/)) 9* Hardware Availability: booth([@kakunpc](https://kakunpc.booth.pm/))
10 10
11Make example for this keyboard (after setting up your build environment): 11Make example for this keyboard (after setting up your build environment):
12 12
diff --git a/keyboards/angel64/rev1/config.h b/keyboards/angel64/rev1/config.h
new file mode 100644
index 000000000..f10f9b091
--- /dev/null
+++ b/keyboards/angel64/rev1/config.h
@@ -0,0 +1,242 @@
1/*
2Copyright 2019 kakunpc
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 0xFEED
24#define PRODUCT_ID 0x0A64
25#define DEVICE_VER 0x0001
26#define MANUFACTURER kakunpc
27#define PRODUCT angel64
28#define DESCRIPTION A custom keyboard
29
30/* key matrix size */
31#define MATRIX_ROWS 12
32#define MATRIX_COLS 6
33
34/*
35 * Keyboard Matrix Assignments
36 *
37*/
38#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
39#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
40#define UNUSED_PINS
41
42/*
43 * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
44 */
45#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
46
47// #define BACKLIGHT_PIN B7
48// #define BACKLIGHT_BREATHING
49// #define BACKLIGHT_LEVELS 3
50
51#define RGB_DI_PIN D3
52#ifdef RGB_DI_PIN
53 #define RGBLED_NUM 64
54 #define RGBLIGHT_HUE_STEP 8
55 #define RGBLIGHT_SAT_STEP 8
56 #define RGBLIGHT_VAL_STEP 8
57 #define RGBLIGHT_LIMIT_VAL 25 /* The maximum brightness level */
58 #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
59 /*== all animations enable ==*/
60 #define RGBLIGHT_ANIMATIONS
61// /*== or choose animations ==*/
62// #define RGBLIGHT_EFFECT_BREATHING
63// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
64// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
65// #define RGBLIGHT_EFFECT_SNAKE
66// #define RGBLIGHT_EFFECT_KNIGHT
67// #define RGBLIGHT_EFFECT_CHRISTMAS
68// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
69// #define RGBLIGHT_EFFECT_RGB_TEST
70// #define RGBLIGHT_EFFECT_ALTERNATING
71// /*== customize breathing effect ==*/
72// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
73// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64
74// /*==== use exp() and sin() ====*/
75// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7
76// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255
77#endif
78
79/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
80#define DEBOUNCE 5
81
82/* define if matrix has ghost (lacks anti-ghosting diodes) */
83//#define MATRIX_HAS_GHOST
84
85/* number of backlight levels */
86
87/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
88#define LOCKING_SUPPORT_ENABLE
89/* Locking resynchronize hack */
90#define LOCKING_RESYNC_ENABLE
91
92/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
93 * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
94 */
95// #define GRAVE_ESC_CTRL_OVERRIDE
96
97/*
98 * Force NKRO
99 *
100 * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
101 * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
102 * makefile for this to work.)
103 *
104 * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
105 * until the next keyboard reset.
106 *
107 * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
108 * fully operational during normal computer usage.
109 *
110 * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
111 * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
112 * bootmagic, NKRO mode will always be enabled until it is toggled again during a
113 * power-up.
114 *
115 */
116//#define FORCE_NKRO
117
118/*
119 * Magic Key Options
120 *
121 * Magic keys are hotkey commands that allow control over firmware functions of
122 * the keyboard. They are best used in combination with the HID Listen program,
123 * found here: https://www.pjrc.com/teensy/hid_listen.html
124 *
125 * The options below allow the magic key functionality to be changed. This is
126 * useful if your keyboard/keypad is missing keys and you want magic key support.
127 *
128 */
129
130/* key combination for magic key command */
131/* defined by default; to change, uncomment and set to the combination you want */
132// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
133
134/* control how magic key switches layers */
135//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
136//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true
137//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
138
139/* override magic key keymap */
140//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
141//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
142//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
143//#define MAGIC_KEY_HELP H
144//#define MAGIC_KEY_HELP_ALT SLASH
145//#define MAGIC_KEY_DEBUG D
146//#define MAGIC_KEY_DEBUG_MATRIX X
147//#define MAGIC_KEY_DEBUG_KBD K
148//#define MAGIC_KEY_DEBUG_MOUSE M
149//#define MAGIC_KEY_VERSION V
150//#define MAGIC_KEY_STATUS S
151//#define MAGIC_KEY_CONSOLE C
152//#define MAGIC_KEY_LAYER0 0
153//#define MAGIC_KEY_LAYER0_ALT GRAVE
154//#define MAGIC_KEY_LAYER1 1
155//#define MAGIC_KEY_LAYER2 2
156//#define MAGIC_KEY_LAYER3 3
157//#define MAGIC_KEY_LAYER4 4
158//#define MAGIC_KEY_LAYER5 5
159//#define MAGIC_KEY_LAYER6 6
160//#define MAGIC_KEY_LAYER7 7
161//#define MAGIC_KEY_LAYER8 8
162//#define MAGIC_KEY_LAYER9 9
163//#define MAGIC_KEY_BOOTLOADER B
164//#define MAGIC_KEY_BOOTLOADER_ALT ESC
165//#define MAGIC_KEY_LOCK CAPS
166//#define MAGIC_KEY_EEPROM E
167//#define MAGIC_KEY_EEPROM_CLEAR BSPACE
168//#define MAGIC_KEY_NKRO N
169//#define MAGIC_KEY_SLEEP_LED Z
170
171/*
172 * Feature disable options
173 * These options are also useful to firmware size reduction.
174 */
175
176/* disable debug print */
177//#define NO_DEBUG
178
179/* disable print */
180//#define NO_PRINT
181
182/* disable action features */
183//#define NO_ACTION_LAYER
184//#define NO_ACTION_TAPPING
185//#define NO_ACTION_ONESHOT
186//#define NO_ACTION_MACRO
187//#define NO_ACTION_FUNCTION
188
189/*
190 * MIDI options
191 */
192
193/* Prevent use of disabled MIDI features in the keymap */
194//#define MIDI_ENABLE_STRICT 1
195
196/* enable basic MIDI features:
197 - MIDI notes can be sent when in Music mode is on
198*/
199//#define MIDI_BASIC
200
201/* enable advanced MIDI features:
202 - MIDI notes can be added to the keymap
203 - Octave shift and transpose
204 - Virtual sustain, portamento, and modulation wheel
205 - etc.
206*/
207//#define MIDI_ADVANCED
208
209/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
210//#define MIDI_TONE_KEYCODE_OCTAVES 1
211
212/*
213 * HD44780 LCD Display Configuration
214 */
215/*
216#define LCD_LINES 2 //< number of visible lines of the display
217#define LCD_DISP_LENGTH 16 //< visibles characters per line of the display
218
219#define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode
220
221#if LCD_IO_MODE
222#define LCD_PORT PORTB //< port for the LCD lines
223#define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0
224#define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1
225#define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2
226#define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3
227#define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0
228#define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1
229#define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2
230#define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3
231#define LCD_RS_PORT LCD_PORT //< port for RS line
232#define LCD_RS_PIN 3 //< pin for RS line
233#define LCD_RW_PORT LCD_PORT //< port for RW line
234#define LCD_RW_PIN 2 //< pin for RW line
235#define LCD_E_PORT LCD_PORT //< port for Enable line
236#define LCD_E_PIN 1 //< pin for Enable line
237#endif
238*/
239
240/* Bootmagic Lite key configuration */
241// #define BOOTMAGIC_LITE_ROW 0
242// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/angel64/rev1/info.json b/keyboards/angel64/rev1/info.json
new file mode 100644
index 000000000..34378f813
--- /dev/null
+++ b/keyboards/angel64/rev1/info.json
@@ -0,0 +1,12 @@
1{
2 "keyboard_name": "angel64_rev1",
3 "url": "https://kakunpc.booth.pm/",
4 "maintainer": "kakunpc",
5 "width": 15,
6 "height": 5,
7 "layouts": {
8 "LAYOUT": {
9 "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":2}, {"label":"A", "x":2, "y":2}, {"label":"S", "x":3, "y":2}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"H", "x":7, "y":2}, {"label":"J", "x":8, "y":2}, {"label":"K", "x":9, "y":2}, {"label":"L", "x":10, "y":2}, {"label":":", "x":11, "y":2}, {"label":"\"", "x":12, "y":2}, {"label":"Enter", "x":13, "y":2, "w":2}, {"label":"Shift", "x":0, "y":3, "w":2.5}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":"<", "x":9.5, "y":3}, {"label":">", "x":10.5, "y":3}, {"label":"?", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.5}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Alt", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":2.75, "y":4, "w":1.5}, {"x":4.25, "y":4}, {"x":5.25, "y":4, "w":1.5}, {"x":6.75, "y":4, "w":1.5}, {"x":8.25, "y":4, "w":1.5}, {"x":9.75, "y":4}, {"label":"Alt", "x":10.75, "y":4, "w":1.5}, {"label":"Menu", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
10 }
11 }
12}
diff --git a/keyboards/angel64/rev1/keymaps/default/config.h b/keyboards/angel64/rev1/keymaps/default/config.h
new file mode 100644
index 000000000..bf1149ebc
--- /dev/null
+++ b/keyboards/angel64/rev1/keymaps/default/config.h
@@ -0,0 +1,19 @@
1/* Copyright 2019 kakunpc
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// place overrides here
diff --git a/keyboards/angel64/rev1/keymaps/default/keymap.c b/keyboards/angel64/rev1/keymaps/default/keymap.c
new file mode 100644
index 000000000..905387ac9
--- /dev/null
+++ b/keyboards/angel64/rev1/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
1/* Copyright 2019 kakunpc
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_all(
20 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,
21 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,
22 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,
23 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
24 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_APP, KC_RCTL),
25};
26
27#ifdef OLED_DRIVER_ENABLE
28void oled_task_user(void) {
29 // Host Keyboard LED Status
30 oled_write_P(IS_HOST_LED_ON(USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR(" "), false);
31 oled_write_P(IS_HOST_LED_ON(USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false);
32 oled_write_P(IS_HOST_LED_ON(USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false);
33}
34#endif
diff --git a/keyboards/angel64/rev1/keymaps/default/readme.md b/keyboards/angel64/rev1/keymaps/default/readme.md
new file mode 100644
index 000000000..f4cd48f2e
--- /dev/null
+++ b/keyboards/angel64/rev1/keymaps/default/readme.md
@@ -0,0 +1 @@
# The default keymap for angel64 \ No newline at end of file
diff --git a/keyboards/angel64/rev1/keymaps/kakunpc/config.h b/keyboards/angel64/rev1/keymaps/kakunpc/config.h
new file mode 100644
index 000000000..bf1149ebc
--- /dev/null
+++ b/keyboards/angel64/rev1/keymaps/kakunpc/config.h
@@ -0,0 +1,19 @@
1/* Copyright 2019 kakunpc
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// place overrides here
diff --git a/keyboards/angel64/rev1/keymaps/kakunpc/keymap.c b/keyboards/angel64/rev1/keymaps/kakunpc/keymap.c
new file mode 100644
index 000000000..6f70dd72c
--- /dev/null
+++ b/keyboards/angel64/rev1/keymaps/kakunpc/keymap.c
@@ -0,0 +1,195 @@
1/* Copyright 2019 kakunpc
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#define USE_LED_RIPPLE_EFFECT
17// #define RANDOM_RIPPLE_EFFECT
18
19#include QMK_KEYBOARD_H
20#include "lufa.h"
21
22#ifdef USE_LED_RIPPLE_EFFECT
23struct keybuf {
24 char col, row;
25 char frame;
26};
27struct keybuf keybufs[256];
28unsigned char keybuf_begin, keybuf_end;
29
30unsigned char r = 0;
31unsigned char g = 112;
32unsigned char b = 255;
33int col, row;
34#endif
35
36
37enum layers{
38 BASE = 0,
39 COMMAND
40};
41
42#define KC_COMMAND_NUM LT(COMMAND,KC_F13)
43#define KC_COMMAND_KANA LT(COMMAND,KC_F14)
44#define KC_COMMAND LT(COMMAND,KC_SPC)
45
46const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
47 [BASE] = LAYOUT_all(
48 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,
49 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,
50 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_ENT,
51 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
52 KC_LCTL, KC_LALT, KC_LGUI, KC_COMMAND_NUM, KC_SPC, KC_SPC, KC_SPC, KC_COMMAND_KANA, KC_RALT, MO(COMMAND),KC_RCTL),
53 [COMMAND] = LAYOUT_all(
54 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_BSPC,
55 KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
56 KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
57 KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
58 KC_LCTL, KC_NO, KC_NO, _______, KC_NO, RGB_MOD, KC_NO, _______, KC_NO, _______, KC_NO),
59};
60
61
62bool process_record_user(uint16_t keycode, keyrecord_t *record) {
63#ifdef USE_LED_RIPPLE_EFFECT
64 col = record->event.key.col;
65 row = record->event.key.row;
66 if (record->event.pressed) {
67 int end = keybuf_end;
68 keybufs[end].col = col;
69 keybufs[end].row = row;
70 keybufs[end].frame = 0;
71 keybuf_end ++;
72 }
73#endif
74 return true;
75}
76
77void keyboard_post_init_user(void) {
78#ifdef USE_LED_RIPPLE_EFFECT
79 rgblight_enable_noeeprom();
80 rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
81#endif
82}
83
84#ifdef USE_LED_RIPPLE_EFFECT
85int scan_count = -10;
86int keys[] = { 14, 14, 13, 12, 11 };
87int keys_sum[] = { 0, 14, 28, 41, 53 };
88unsigned char rgb[14][5][3];
89int row_max = 12;
90int ToIndex(char _col, char _row) {
91 return (_col * row_max) + _row;
92}
93
94void led_ripple_effect(void){
95 if (scan_count == -1) {
96 rgblight_enable_noeeprom();
97 rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
98 } else if (scan_count >= 0 && scan_count < 5) {
99 for (unsigned char c=keybuf_begin; c!=keybuf_end; c++) {
100 int i = c;
101 // FIXME:
102
103 int index = ToIndex(keybufs[i].col,keybufs[i].row);
104 int coll = 0;
105 for(int s = 4; s >= 0; --s){
106 if( index >= keys_sum[s]){
107 coll = s;
108 break;
109 }
110 }
111 int roww = MAX(0,index - keys_sum[coll]);
112
113 int y = scan_count;
114 int dist_y = abs(y - coll);
115 for (int x=0; x<keys[y]; x++) {
116 int dist = abs(x - roww) + dist_y;
117 if (dist <= keybufs[i].frame) {
118 int elevation = MAX(0, (8 + dist - keybufs[i].frame)) << 2;
119 if (elevation) {
120 if ((rgb[x][y][0] != 255) && r) { rgb[x][y][0] = MIN(255, elevation + rgb[x][y][0]); }
121 if ((rgb[x][y][1] != 255) && g) { rgb[x][y][1] = MIN(255, elevation + rgb[x][y][1]); }
122 if ((rgb[x][y][2] != 255) && b) { rgb[x][y][2] = MIN(255, elevation + rgb[x][y][2]); }
123 }
124 }
125 }
126 }
127 } else if (scan_count == 5) {
128 for (unsigned char c=keybuf_begin; c!=keybuf_end; c++) {
129 int i = c;
130 if (keybufs[i].frame < 64) {
131 keybufs[i].frame ++;
132 } else {
133 keybuf_begin ++;
134 }
135 }
136 } else if (scan_count >= 6 && scan_count <= 10) {
137 int y = scan_count - 6;
138 for (int x=0; x<keys[y]; x++) {
139 int at = keys_sum[y] + x;
140 led[at].r = rgb[x][y][0];
141 led[at].g = rgb[x][y][1];
142 led[at].b = rgb[x][y][2];
143 }
144 rgblight_set();
145 } else if (scan_count == 11) {
146 memset(rgb, 0, sizeof(rgb));
147 }
148 scan_count++;
149 if (scan_count >= 12) { scan_count = 0; }
150}
151
152#endif
153
154void matrix_scan_user(void) {
155#ifdef USE_LED_RIPPLE_EFFECT
156#ifdef RANDOM_RIPPLE_EFFECT
157 static int timer = 0;
158 static int timeout = 300;
159 timer++;
160 if(timer > timeout){
161 int end = keybuf_end;
162 col = rand() % 6;
163 row = rand() % 12;
164 keybufs[end].col = col;
165 keybufs[end].row = row;
166 keybufs[end].frame = 0;
167 keybuf_end ++;
168 timer = rand() % timeout;
169 }
170#endif
171 led_ripple_effect();
172#endif
173}
174
175#ifdef OLED_DRIVER_ENABLE
176void oled_task_user(void) {
177 oled_write_P(PSTR("Layer: "), false);
178 switch (biton32(layer_state)) {
179 case BASE:
180 oled_write_P(PSTR("Default\n"), false);
181 break;
182 case COMMAND:
183 oled_write_P(PSTR("COMMAND\n"), false);
184 break;
185 default:
186 // Or use the write_ln shortcut over adding 'n' to the end of your string
187 oled_write_ln_P(PSTR("Undefined"), false);
188 }
189
190 // Host Keyboard LED Status
191 oled_write_P(IS_HOST_LED_ON(USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR(" "), false);
192 oled_write_P(IS_HOST_LED_ON(USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false);
193 oled_write_P(IS_HOST_LED_ON(USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false);
194}
195#endif
diff --git a/keyboards/angel64/rev1/keymaps/kakunpc/readme.md b/keyboards/angel64/rev1/keymaps/kakunpc/readme.md
new file mode 100644
index 000000000..ca7d7961f
--- /dev/null
+++ b/keyboards/angel64/rev1/keymaps/kakunpc/readme.md
@@ -0,0 +1 @@
# The kakunpc keymap for angel64
diff --git a/keyboards/angel64/rev1/matrix.c b/keyboards/angel64/rev1/matrix.c
new file mode 100644
index 000000000..e06fc15dc
--- /dev/null
+++ b/keyboards/angel64/rev1/matrix.c
@@ -0,0 +1,287 @@
1/*
2Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
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#include <stdint.h>
18#include <stdbool.h>
19#include "wait.h"
20#include "print.h"
21#include "debug.h"
22#include "util.h"
23#include "matrix.h"
24#include "debounce.h"
25#include "quantum.h"
26
27#if (MATRIX_COLS <= 8)
28# define print_matrix_header() print("\nr/c 01234567\n")
29# define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
30# define matrix_bitpop(i) bitpop(matrix[i])
31# define ROW_SHIFTER ((uint8_t)1)
32#elif (MATRIX_COLS <= 16)
33# define print_matrix_header() print("\nr/c 0123456789ABCDEF\n")
34# define print_matrix_row(row) print_bin_reverse16(matrix_get_row(row))
35# define matrix_bitpop(i) bitpop16(matrix[i])
36# define ROW_SHIFTER ((uint16_t)1)
37#elif (MATRIX_COLS <= 32)
38# define print_matrix_header() print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
39# define print_matrix_row(row) print_bin_reverse32(matrix_get_row(row))
40# define matrix_bitpop(i) bitpop32(matrix[i])
41# define ROW_SHIFTER ((uint32_t)1)
42#endif
43
44#ifdef MATRIX_MASKED
45 extern const matrix_row_t matrix_mask[];
46#endif
47
48static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
49static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
50
51/* matrix state(1:on, 0:off) */
52static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values
53static matrix_row_t matrix[MATRIX_ROWS]; //debounced values
54
55__attribute__ ((weak))
56void matrix_init_quantum(void) {
57 matrix_init_kb();
58}
59
60__attribute__ ((weak))
61void matrix_scan_quantum(void) {
62 matrix_scan_kb();
63}
64
65__attribute__ ((weak))
66void matrix_init_kb(void) {
67 matrix_init_user();
68}
69
70__attribute__ ((weak))
71void matrix_scan_kb(void) {
72 matrix_scan_user();
73}
74
75__attribute__ ((weak))
76void matrix_init_user(void) {
77}
78
79__attribute__ ((weak))
80void matrix_scan_user(void) {
81}
82
83inline
84uint8_t matrix_rows(void) {
85 return MATRIX_ROWS;
86}
87
88inline
89uint8_t matrix_cols(void) {
90 return MATRIX_COLS;
91}
92
93//Deprecated.
94bool matrix_is_modified(void)
95{
96 if (debounce_active()) return false;
97 return true;
98}
99
100inline
101bool matrix_is_on(uint8_t row, uint8_t col)
102{
103 return (matrix[row] & ((matrix_row_t)1<<col));
104}
105
106inline
107matrix_row_t matrix_get_row(uint8_t row)
108{
109 // Matrix mask lets you disable switches in the returned matrix data. For example, if you have a
110 // switch blocker installed and the switch is always pressed.
111#ifdef MATRIX_MASKED
112 return matrix[row] & matrix_mask[row];
113#else
114 return matrix[row];
115#endif
116}
117
118void matrix_print(void)
119{
120 print_matrix_header();
121
122 for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
123 phex(row); print(": ");
124 print_matrix_row(row);
125 print("\n");
126 }
127}
128
129uint8_t matrix_key_count(void)
130{
131 uint8_t count = 0;
132 for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
133 count += matrix_bitpop(i);
134 }
135 return count;
136}
137
138static void select_row(uint8_t row)
139{
140 setPinOutput(row_pins[row]);
141 writePinLow(row_pins[row]);
142}
143
144static void unselect_row(uint8_t row)
145{
146 setPinInputHigh(row_pins[row]);
147}
148
149static void unselect_rows(void)
150{
151 for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
152 setPinInputHigh(row_pins[x]);
153 }
154}
155
156static void select_col(uint8_t col)
157{
158 setPinOutput(col_pins[col]);
159 writePinLow(col_pins[col]);
160}
161
162static void unselect_col(uint8_t col)
163{
164 setPinInputHigh(col_pins[col]);
165}
166
167static void unselect_cols(void)
168{
169 for(uint8_t x = 0; x < MATRIX_COLS; x++) {
170 setPinInputHigh(col_pins[x]);
171 }
172}
173
174static void init_pins(void) {
175 unselect_rows();
176 unselect_cols();
177 for (uint8_t x = 0; x < MATRIX_COLS; x++) {
178 setPinInputHigh(col_pins[x]);
179 }
180 for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
181 setPinInputHigh(row_pins[x]);
182 }
183}
184
185static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
186{
187 // Store last value of row prior to reading
188 matrix_row_t last_row_value = current_matrix[current_row];
189
190 // Clear data in matrix row
191 current_matrix[current_row] = 0;
192
193 // Select row and wait for row selecton to stabilize
194 select_row(current_row);
195 wait_us(30);
196
197 // For each col...
198 for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
199
200 // Select the col pin to read (active low)
201 uint8_t pin_state = readPin(col_pins[col_index]);
202
203 // Populate the matrix row with the state of the col pin
204 current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index);
205 }
206
207 // Unselect row
208 unselect_row(current_row);
209
210 return (last_row_value != current_matrix[current_row]);
211}
212
213static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
214{
215 bool matrix_changed = false;
216
217 // Select col and wait for col selecton to stabilize
218 select_col(current_col);
219 wait_us(30);
220
221 // For each row...
222 for(uint8_t row_index = 0; row_index < MATRIX_ROWS/2; row_index++)
223 {
224 uint8_t tmp = row_index + MATRIX_ROWS/2;
225 // Store last value of row prior to reading
226 matrix_row_t last_row_value = current_matrix[tmp];
227
228 // Check row pin state
229 if (readPin(row_pins[row_index]) == 0)
230 {
231 // Pin LO, set col bit
232 current_matrix[tmp] |= (ROW_SHIFTER << current_col);
233 }
234 else
235 {
236 // Pin HI, clear col bit
237 current_matrix[tmp] &= ~(ROW_SHIFTER << current_col);
238 }
239
240 // Determine if the matrix changed state
241 if ((last_row_value != current_matrix[tmp]) && !(matrix_changed))
242 {
243 matrix_changed = true;
244 }
245 }
246
247 // Unselect col
248 unselect_col(current_col);
249
250 return matrix_changed;
251}
252
253void matrix_init(void) {
254
255 // initialize key pins
256 init_pins();
257
258 // initialize matrix state: all keys off
259 for (uint8_t i=0; i < MATRIX_ROWS; i++) {
260 raw_matrix[i] = 0;
261 matrix[i] = 0;
262 }
263
264 debounce_init(MATRIX_ROWS);
265
266 matrix_init_quantum();
267}
268
269uint8_t matrix_scan(void)
270{
271 bool changed = false;
272
273 // Set row, read cols
274 for (uint8_t current_row = 0; current_row < MATRIX_ROWS / 2; current_row++) {
275 changed |= read_cols_on_row(raw_matrix, current_row);
276 }
277 //else
278 // Set col, read rows
279 for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
280 changed |= read_rows_on_col(raw_matrix, current_col);
281 }
282
283 debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
284
285 matrix_scan_quantum();
286 return (uint8_t)changed;
287}
diff --git a/keyboards/angel64/rev1/readme.md b/keyboards/angel64/rev1/readme.md
new file mode 100644
index 000000000..4ce77807c
--- /dev/null
+++ b/keyboards/angel64/rev1/readme.md
@@ -0,0 +1,15 @@
1# angel64
2
3![angel64](https://i.gyazo.com/d114d4b1789009dbe8c910eaeb3295c5.jpg)
4
5Keyboard for tablets.
6
7* Keyboard Maintainer: [kakunpc](https://github.com/kakunpc)
8* Hardware Supported: angel64_rev1, promicro
9* Hardware Availability: booth([@kakunpc](https://kakunpc.booth.pm/))
10
11Make example for this keyboard (after setting up your build environment):
12
13 make angel64/rev1:default
14
15See 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).
diff --git a/keyboards/angel64/rev1/rev1.c b/keyboards/angel64/rev1/rev1.c
new file mode 100644
index 000000000..f97e6caed
--- /dev/null
+++ b/keyboards/angel64/rev1/rev1.c
@@ -0,0 +1,51 @@
1/* Copyright 2019 kakunpc
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 "rev1.h"
17
18// Optional override functions below.
19// You can leave any or all of these undefined.
20// These are only required if you want to perform custom actions.
21
22/*
23
24void matrix_init_kb(void) {
25 // put your keyboard start-up code here
26 // runs once when the firmware starts up
27
28 matrix_init_user();
29}
30
31void matrix_scan_kb(void) {
32 // put your looping keyboard code here
33 // runs every cycle (a lot)
34
35 matrix_scan_user();
36}
37
38bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
39 // put your per-action keyboard code here
40 // runs for every action, just before processing by the firmware
41
42 return process_record_user(keycode, record);
43}
44
45void led_set_kb(uint8_t usb_led) {
46 // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
47
48 led_set_user(usb_led);
49}
50
51*/
diff --git a/keyboards/angel64/rev1/rev1.h b/keyboards/angel64/rev1/rev1.h
new file mode 100644
index 000000000..f4335601a
--- /dev/null
+++ b/keyboards/angel64/rev1/rev1.h
@@ -0,0 +1,48 @@
1/* Copyright 2019 kakunpc
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#pragma once
17
18#include "quantum.h"
19
20/* This a shortcut to help you visually see your layout.
21 *
22 * The first section contains all of the arguments representing the physical
23 * layout of the board and position of the keys.
24 *
25 * The second converts the arguments into a two-dimensional array which
26 * represents the switch matrix.
27 */
28#define LAYOUT_all( \
29 k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \
30 k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, \
31 k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, \
32 k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, \
33 k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64\
34) \
35{ \
36 { k01, k13, k25, k37, k49, k61 }, \
37 { k02, k14, k26, k38, k50, k62 }, \
38 { k03, k15, k27, k39, k51, k63 }, \
39 { k04, k16, k28, k40, k52, k64 }, \
40 { k05, k17, k29, k41, k53, KC_NO }, \
41 { k06, k18, k30, k42, k54, KC_NO }, \
42 { k07, k19, k31, k43, k55, KC_NO }, \
43 { k08, k20, k32, k44, k56, KC_NO }, \
44 { k09, k21, k33, k45, k57, KC_NO }, \
45 { k10, k22, k34, k46, k58, KC_NO }, \
46 { k11, k23, k35, k47, k59, KC_NO }, \
47 { k12, k24, k36, k48, k60, KC_NO } \
48}
diff --git a/keyboards/angel64/rev1/rules.mk b/keyboards/angel64/rev1/rules.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/keyboards/angel64/rev1/rules.mk
diff --git a/keyboards/angel64/rules.mk b/keyboards/angel64/rules.mk
index 4242ac2ee..0f2b29096 100644
--- a/keyboards/angel64/rules.mk
+++ b/keyboards/angel64/rules.mk
@@ -31,6 +31,9 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
31AUDIO_ENABLE = no # Audio output on port C6 31AUDIO_ENABLE = no # Audio output on port C6
32FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches 32FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
33HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) 33HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)
34OLED_DRIVER_ENABLE = yes
34CUSTOM_MATRIX = yes 35CUSTOM_MATRIX = yes
35 36
36SRC += matrix.c 37SRC += matrix.c
38
39DEFAULT_FOLDER = angel64/rev1
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 06:04:48 +0000