aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-02-05 00:20:11 +0000
committerQMK Bot <hello@qmk.fm>2021-02-05 00:20:11 +0000
commit09ddc9fb2f877ecd9828834366677505e5a80a1d (patch)
treee1683b51980e6ce20b38a8458a722de669daf3f5
parent9bc7a856dd8be4e1b770faf1abb736179fe4854f (diff)
parent0bf0644aa2fdc67a700535af42d18b7bbadfb023 (diff)
downloadqmk_firmware-09ddc9fb2f877ecd9828834366677505e5a80a1d.tar.gz
qmk_firmware-09ddc9fb2f877ecd9828834366677505e5a80a1d.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/claw44/keymaps/default/config.h2
-rw-r--r--keyboards/claw44/keymaps/default/keymap.c17
-rw-r--r--keyboards/claw44/keymaps/oled/config.h2
-rw-r--r--keyboards/claw44/keymaps/oled/keymap.c32
-rw-r--r--keyboards/claw44/keymaps/via/config.h21
-rw-r--r--keyboards/claw44/keymaps/via/keymap.c84
-rw-r--r--keyboards/claw44/keymaps/via/rules.mk1
-rw-r--r--keyboards/claw44/rev1/config.h4
-rw-r--r--keyboards/claw44/rev1/readme.md15
9 files changed, 168 insertions, 10 deletions
diff --git a/keyboards/claw44/keymaps/default/config.h b/keyboards/claw44/keymaps/default/config.h
index d2ea02545..98469e4cc 100644
--- a/keyboards/claw44/keymaps/default/config.h
+++ b/keyboards/claw44/keymaps/default/config.h
@@ -1,6 +1,4 @@
1/* 1/*
2This is the c configuration file for the keymap
3
4Copyright 2012 Jun Wako <wakojun@gmail.com> 2Copyright 2012 Jun Wako <wakojun@gmail.com>
5Copyright 2015 Jack Humbert 3Copyright 2015 Jack Humbert
6 4
diff --git a/keyboards/claw44/keymaps/default/keymap.c b/keyboards/claw44/keymaps/default/keymap.c
index 65dbd67d9..e8416b9c6 100644
--- a/keyboards/claw44/keymaps/default/keymap.c
+++ b/keyboards/claw44/keymaps/default/keymap.c
@@ -1,3 +1,18 @@
1/*
2Copyright 2012 Jun Wako <wakojun@gmail.com>
3Copyright 2015 Jack Humbert
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.
8This program is distributed in the hope that it will be useful,
9but WITHOUT ANY WARRANTY; without even the implied warranty of
10MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11GNU General Public License for more details.
12You should have received a copy of the GNU General Public License
13along with this program. If not, see <http://www.gnu.org/licenses/>.
14*/
15
1#include QMK_KEYBOARD_H 16#include QMK_KEYBOARD_H
2 17
3// Each layer gets a name for readability, which is then used in the keymap matrix below. 18// Each layer gets a name for readability, which is then used in the keymap matrix below.
@@ -11,8 +26,6 @@ enum layer_number {
11 _LOWER, 26 _LOWER,
12}; 27};
13 28
14#define KC_ KC_TRNS
15#define KC_RST RESET
16#define KC_L_SPC LT(_LOWER, KC_SPC) // lower 29#define KC_L_SPC LT(_LOWER, KC_SPC) // lower
17#define KC_R_ENT LT(_RAISE, KC_ENT) // raise 30#define KC_R_ENT LT(_RAISE, KC_ENT) // raise
18#define KC_G_JA LGUI_T(KC_LANG1) // cmd or win 31#define KC_G_JA LGUI_T(KC_LANG1) // cmd or win
diff --git a/keyboards/claw44/keymaps/oled/config.h b/keyboards/claw44/keymaps/oled/config.h
index edde2c67c..5379ce677 100644
--- a/keyboards/claw44/keymaps/oled/config.h
+++ b/keyboards/claw44/keymaps/oled/config.h
@@ -1,6 +1,4 @@
1/* 1/*
2This is the c configuration file for the keymap
3
4Copyright 2012 Jun Wako <wakojun@gmail.com> 2Copyright 2012 Jun Wako <wakojun@gmail.com>
5Copyright 2015 Jack Humbert 3Copyright 2015 Jack Humbert
6 4
diff --git a/keyboards/claw44/keymaps/oled/keymap.c b/keyboards/claw44/keymaps/oled/keymap.c
index 0d10c371a..5a5903416 100644
--- a/keyboards/claw44/keymaps/oled/keymap.c
+++ b/keyboards/claw44/keymaps/oled/keymap.c
@@ -1,3 +1,18 @@
1/*
2Copyright 2012 Jun Wako <wakojun@gmail.com>
3Copyright 2015 Jack Humbert
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.
8This program is distributed in the hope that it will be useful,
9but WITHOUT ANY WARRANTY; without even the implied warranty of
10MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11GNU General Public License for more details.
12You should have received a copy of the GNU General Public License
13along with this program. If not, see <http://www.gnu.org/licenses/>.
14*/
15
1#include QMK_KEYBOARD_H 16#include QMK_KEYBOARD_H
2#include <stdio.h> 17#include <stdio.h>
3 18
@@ -10,10 +25,9 @@ enum layer_number {
10 _QWERTY = 0, 25 _QWERTY = 0,
11 _RAISE, 26 _RAISE,
12 _LOWER, 27 _LOWER,
28 _ADJUST,
13}; 29};
14 30
15#define KC_ KC_TRNS
16#define KC_RST RESET
17#define KC_L_SPC LT(_LOWER, KC_SPC) // lower 31#define KC_L_SPC LT(_LOWER, KC_SPC) // lower
18#define KC_R_ENT LT(_RAISE, KC_ENT) // raise 32#define KC_R_ENT LT(_RAISE, KC_ENT) // raise
19#define KC_G_JA LGUI_T(KC_LANG1) // cmd or win 33#define KC_G_JA LGUI_T(KC_LANG1) // cmd or win
@@ -57,6 +71,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
57 RESET , _______, _______, _______, _______, _______, _______, _______ 71 RESET , _______, _______, _______, _______, _______, _______, _______
58 // `--------+--------+--------+--------' `--------+--------+--------+--------' 72 // `--------+--------+--------+--------' `--------+--------+--------+--------'
59 ), 73 ),
74 [_ADJUST] = LAYOUT(
75 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
76 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
77 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
78 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
79 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
80 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
81 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
82 KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
83 // `--------+--------+--------+--------' `--------+--------+--------+--------'
84 ),
60}; 85};
61 86
62#ifdef OLED_DRIVER_ENABLE 87#ifdef OLED_DRIVER_ENABLE
@@ -72,6 +97,9 @@ void render_layer_state(void) {
72 case _LOWER: 97 case _LOWER:
73 oled_write_ln_P(PSTR("Layer: Lower"), false); 98 oled_write_ln_P(PSTR("Layer: Lower"), false);
74 break; 99 break;
100 case _ADJUST:
101 oled_write_ln_P(PSTR("Layer: Adjust"), false);
102 break;
75 default: 103 default:
76 oled_write_ln_P(PSTR("Layer: Undefined"), false); 104 oled_write_ln_P(PSTR("Layer: Undefined"), false);
77 } 105 }
diff --git a/keyboards/claw44/keymaps/via/config.h b/keyboards/claw44/keymaps/via/config.h
new file mode 100644
index 000000000..98469e4cc
--- /dev/null
+++ b/keyboards/claw44/keymaps/via/config.h
@@ -0,0 +1,21 @@
1/*
2Copyright 2012 Jun Wako <wakojun@gmail.com>
3Copyright 2015 Jack Humbert
4
5This program is free software: you can redistribute it and/or modify
6it under the terms of the GNU General Public License as published by
7the Free Software Foundation, either version 2 of the License, or
8(at your option) any later version.
9
10This program is distributed in the hope that it will be useful,
11but WITHOUT ANY WARRANTY; without even the implied warranty of
12MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13GNU General Public License for more details.
14
15You should have received a copy of the GNU General Public License
16along with this program. If not, see <http://www.gnu.org/licenses/>.
17*/
18
19#pragma once
20
21#define MASTER_LEFT
diff --git a/keyboards/claw44/keymaps/via/keymap.c b/keyboards/claw44/keymaps/via/keymap.c
new file mode 100644
index 000000000..5373b7687
--- /dev/null
+++ b/keyboards/claw44/keymaps/via/keymap.c
@@ -0,0 +1,84 @@
1/*
2Copyright 2012 Jun Wako <wakojun@gmail.com>
3Copyright 2015 Jack Humbert
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.
8This program is distributed in the hope that it will be useful,
9but WITHOUT ANY WARRANTY; without even the implied warranty of
10MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11GNU General Public License for more details.
12You should have received a copy of the GNU General Public License
13along with this program. If not, see <http://www.gnu.org/licenses/>.
14*/
15
16#include QMK_KEYBOARD_H
17
18// Each layer gets a name for readability, which is then used in the keymap matrix below.
19// The underscores don't mean anything - you can have a layer called STUFF or any other name.
20// Layer names don't all need to be of the same length, obviously, and you can also skip them
21// entirely and just use numbers.
22
23enum layer_number {
24 _QWERTY = 0,
25 _RAISE,
26 _LOWER,
27 _ADJUST,
28};
29
30#define KC_L_SPC LT(_LOWER, KC_SPC) // lower
31#define KC_R_ENT LT(_RAISE, KC_ENT) // raise
32#define KC_G_JA LGUI_T(KC_LANG1) // cmd or win
33#define KC_G_EN LGUI_T(KC_LANG2) // cmd or win
34#define KC_C_BS LCTL_T(KC_BSPC) // ctrl
35#define KC_A_DEL ALT_T(KC_DEL) // alt
36
37const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
38 [_QWERTY] = LAYOUT(
39 //,--------+--------+---------+--------+---------+--------. ,--------+---------+--------+---------+--------+--------.
40 KC_ESC , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS,
41 //|--------+--------+---------+--------+---------+--------| |--------+---------+--------+---------+--------+--------|
42 KC_TAB , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT,
43 //|--------+--------+---------+--------+---------+--------| |--------+---------+--------+---------+--------+--------|
44 KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
45 //`--------+--------+---------+--------+---------+--------/ \--------+---------+--------+---------+--------+--------'
46 KC_A_DEL, KC_G_EN, KC_L_SPC, KC_C_BS, KC_C_BS, KC_R_ENT, KC_G_JA, KC_A_DEL
47 // `----------+--------+---------+--------' `--------+---------+--------+---------'
48 ),
49
50 [_RAISE] = LAYOUT(
51 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
52 _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE, KC_AT , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
53 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
54 KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
55 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
56 _______, _______, _______, _______, KC_LCBR, KC_LBRC, KC_RBRC, KC_RCBR, _______, _______, _______, _______,
57 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
58 _______, _______, _______, _______, _______, _______, _______, RESET
59 // `--------+--------+--------+--------' `--------+--------+--------+--------'
60 ),
61
62 [_LOWER] = LAYOUT(
63 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
64 KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
65 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
66 _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , _______,
67 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
68 KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
69 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
70 RESET , _______, _______, _______, _______, _______, _______, _______
71 // `--------+--------+--------+--------' `--------+--------+--------+--------'
72 ),
73 [_ADJUST] = LAYOUT(
74 //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
75 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
76 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
77 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
78 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
79 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
80 //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
81 KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
82 // `--------+--------+--------+--------' `--------+--------+--------+--------'
83 ),
84};
diff --git a/keyboards/claw44/keymaps/via/rules.mk b/keyboards/claw44/keymaps/via/rules.mk
new file mode 100644
index 000000000..1e5b99807
--- /dev/null
+++ b/keyboards/claw44/keymaps/via/rules.mk
@@ -0,0 +1 @@
VIA_ENABLE = yes
diff --git a/keyboards/claw44/rev1/config.h b/keyboards/claw44/rev1/config.h
index 2af45a46b..8116b605c 100644
--- a/keyboards/claw44/rev1/config.h
+++ b/keyboards/claw44/rev1/config.h
@@ -19,8 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19#pragma once 19#pragma once
20 20
21/* USB Device descriptor parameter */ 21/* USB Device descriptor parameter */
22#define VENDOR_ID 0xFEED 22#define VENDOR_ID 0x5946 // YF
23#define PRODUCT_ID 0x3060 23#define PRODUCT_ID 0x0001
24#define DEVICE_VER 0x0001 24#define DEVICE_VER 0x0001
25#define MANUFACTURER yfuku 25#define MANUFACTURER yfuku
26#define PRODUCT claw44 26#define PRODUCT claw44
diff --git a/keyboards/claw44/rev1/readme.md b/keyboards/claw44/rev1/readme.md
new file mode 100644
index 000000000..5ad967af8
--- /dev/null
+++ b/keyboards/claw44/rev1/readme.md
@@ -0,0 +1,15 @@
1# Claw44
2
3![Claw44](https://i.imgur.com/5a8iogll.jpg)
4
5A split keyboard with 3x6 vertically staggered keys and 4 thumb keys.
6
7* Keyboard Maintainer: [@yfuku_](https://twitter.com/yfuku_)
8* Hardware Supported: Claw44 PCB, ProMicro
9* Hardware Availability: https://yfuku.booth.pm/
10
11Make example for this keyboard (after setting up your build environment):
12
13 make claw44/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).
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-22 11:23:35 +0000