Skip to content

Commit

Permalink
Merge branch 'master' into juno
Browse files Browse the repository at this point in the history
  • Loading branch information
Junya Ogura committed Nov 28, 2018
2 parents c785fe6 + a495326 commit 1feca4a
Show file tree
Hide file tree
Showing 163 changed files with 4,117 additions and 880 deletions.
4 changes: 2 additions & 2 deletions docs/faq_keymap.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Keycodes are actually defined in [common/keycode.h](https://github.com/qmk/qmk_f

There are 3 standard keyboard layouts in use around the world- ANSI, ISO, and JIS. North America primarily uses ANSI, Europe and Africa primarily use ISO, and Japan uses JIS. Regions not mentioned typically use either ANSI or ISO. The keycodes corresponding to these layouts are shown here:

<!-- Source for this image: http://www.keyboard-layout-editor.com/#/gists/070a530eedaed36a2d77f3f6fd455677 -->
![Keyboard Layout Image](https://i.imgur.com/gvlNUpQ.png)
<!-- Source for this image: http://www.keyboard-layout-editor.com/#/gists/bf431647d1001cff5eff20ae55621e9a -->
![Keyboard Layout Image](https://i.imgur.com/5wsh5wM.png)

## Some Of My Keys Are Swapped Or Not Working

Expand Down
2 changes: 0 additions & 2 deletions docs/feature_rgblight.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ Changing the **Value** sets the overall brightness.
|`RGB_MODE_GRADIENT`|`RGB_M_G` |Static gradient animation mode |
|`RGB_MODE_RGBTEST` |`RGB_M_T` |Red, Green, Blue test animation mode |

?> For backwards compatibility, `RGB_SMOD` is another alias of `RGB_MOD`.

## Configuration

Your RGB lighting can be configured by placing these `#define`s in your `config.h`:
Expand Down
25 changes: 13 additions & 12 deletions docs/keycodes.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,18 +206,19 @@ This is a reference only. Each group of keys links to the page documenting their

## [Quantum Keycodes](quantum_keycodes.md#qmk-keycodes)

|Key |Aliases |Description |
|-------------|-----------|---------------------------------------------------------------------|
|`RESET` | |Put the keyboard into DFU mode for flashing |
|`DEBUG` | |Toggle debug mode |
|`KC_GESC` |`GRAVE_ESC`|Escape when tapped, <code>&#96;</code> when pressed with Shift or GUI|
|`KC_LSPO` | |Left Shift when held, `(` when tapped |
|`KC_RSPC` | |Right Shift when held, `)` when tapped |
|`KC_LEAD` | |The [Leader key](feature_leader_key.md) |
|`KC_LOCK` | |The [Lock key](feature_key_lock.md) |
|`FUNC(n)` |`F(n)` |Call `fn_action(n)` (deprecated) |
|`M(n)` | |Call macro `n` |
|`MACROTAP(n)`| |Macro-tap `n` idk FIXME |
|Key |Aliases |Description |
|---------------|-----------|---------------------------------------------------------------------|
|`RESET` | |Put the keyboard into DFU mode for flashing |
|`DEBUG` | |Toggle debug mode |
|`EEPROM_RESET` |`EEP_RST` |Resets EEPROM state by reinitializing it |
|`KC_GESC` |`GRAVE_ESC`|Escape when tapped, <code>&#96;</code> when pressed with Shift or GUI|
|`KC_LSPO` | |Left Shift when held, `(` when tapped |
|`KC_RSPC` | |Right Shift when held, `)` when tapped |
|`KC_LEAD` | |The [Leader key](feature_leader_key.md) |
|`KC_LOCK` | |The [Lock key](feature_key_lock.md) |
|`FUNC(n)` |`F(n)` |Call `fn_action(n)` (deprecated) |
|`M(n)` | |Call macro `n` |
|`MACROTAP(n)` | |Macro-tap `n` idk FIXME |

## [Audio Keys](feature_audio.md)

Expand Down
2 changes: 1 addition & 1 deletion docs/newbs_testing_debugging.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ Sometimes it's useful to print debug messages from within your [custom code](cus
After that you can use a few different print functions:

* `print("string")`: Print a simple string.
* `sprintf("%s string", var)`: Print a formatted string
* `uprintf("%s string", var)`: Print a formatted string
* `dprint("string")` Print a simple string, but only when debug mode is enabled
* `dprintf("%s string", var)`: Print a formatted string, but only when debug mode is enabled
13 changes: 13 additions & 0 deletions keyboards/40percentclub/4x4/4x4.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,16 @@
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, K2f }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, K3f } \
}

#define LAYOUT_kc_ortho_4x12( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b \
) \
{ \
{ KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0a, KC_##K0b, ___, ___, ___, ___}, \
{ KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1a, KC_##K1b, ___, ___, ___, ___}, \
{ KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2a, KC_##K2b, ___, ___, ___, ___}, \
{ KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3a, KC_##K3b, ___, ___, ___, ___} \
}
3 changes: 1 addition & 2 deletions keyboards/40percentclub/4x4/rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,4 @@ AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)

#FIXME: Community keymap build are currently failing due to missing functionality
#LAYOUTS = ortho_4x4 ortho_4x8 ortho_4x12 ortho_4x16
LAYOUTS = ortho_4x4 ortho_4x8 ortho_4x12 ortho_4x16
3 changes: 1 addition & 2 deletions keyboards/40percentclub/5x5/rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,4 @@ AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)

#FIXME: Community keymap build are currently failing due to missing functionality
#LAYOUTS = ortho_5x5 ortho_5x10 ortho_5x15
LAYOUTS = ortho_5x5 ortho_5x10 ortho_5x15
2 changes: 2 additions & 0 deletions keyboards/40percentclub/foobar/keymaps/default/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@
#pragma once

// place overrides here

#define PERMISSIVE_HOLD
57 changes: 50 additions & 7 deletions keyboards/40percentclub/foobar/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,62 @@
*/
#include QMK_KEYBOARD_H

#define FN1_Q LT(1, KC_Q)
enum foobar_layers {
QWERTY,
FN1,
FN2,
FN3,
FN4,
FN5
};

#define FN1_SPC LT(FN1, KC_SPC)
#define FN2_BSC LT(FN2, KC_BSPC)
#define FN3_C LT(FN3, KC_C)
#define FN4_V LT(FN4, KC_V)
#define FN5_B LT(FN5, KC_B)
#define RALT_N RALT_T(KC_N)
#define LALT_X LALT_T(KC_X)
#define LCTL_Z LCTL_T(KC_Z)
#define RCTL_M RCTL_T(KC_M)
#define LSFT_ENT LSFT_T(KC_ENT)
#define RGUI_ESC RGUI_T(KC_ESC)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_split(
FN1_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_ESC,
KC_Z, KC_X, KC_C, KC_V, KC_BSPC, KC_SPC, KC_B, KC_N, KC_M, KC_ENT
[QWERTY] = LAYOUT_split(
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, RGUI_ESC,
LCTL_Z, LALT_X, FN3_C, FN4_V, FN2_BSC, FN1_SPC, FN5_B, RALT_N, RCTL_M, LSFT_ENT
),

[FN1] = LAYOUT_split(
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
_______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______
),

[FN2] = LAYOUT_split(
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, KC_GRV,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

[FN3] = LAYOUT_split(
_______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
KC_TAB, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_SLSH, KC_SCLN, KC_QUOT,
_______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),

[FN4] = LAYOUT_split(
_______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
KC_TAB, _______, _______, _______, _______, KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

[1] = LAYOUT_split(
[FN5] = LAYOUT_split(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, RESET, _______, _______, _______
_______, _______, _______, _______, _______, RESET, _______, _______, _______, _______
),
};

Expand Down
2 changes: 1 addition & 1 deletion keyboards/bface/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS,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_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,BL_INC, BL_DEC, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
KC_TRNS,KC_TRNS,RGB_SMOD,KC_TRNS,BL_ON, BL_OFF, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,
KC_TRNS,KC_TRNS,RGB_MOD,KC_TRNS,BL_ON, BL_OFF, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
),
/* You can copy this layer as base for a new fn layer * /
Expand Down
4 changes: 1 addition & 3 deletions keyboards/blockey/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
SRC += ws2812.c

# MCU name
#MCU = at90usb1286
MCU = atmega32u4
Expand Down Expand Up @@ -54,7 +52,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
MOUSEKEY_ENABLE = no # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration
Expand Down
6 changes: 3 additions & 3 deletions keyboards/bmini/rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ F_CPU = 12000000

# Bootloader
# This definition is optional, and if your keyboard supports multiple bootloaders of
# different sizes, comment this out, and the correct address will be loaded
# different sizes, comment this out, and the correct address will be loaded
# automatically (+60). See bootloader.mk for all options.
BOOTLOADER = bootloadHID

# build options
BOOTMAGIC_ENABLE = yes
MOUSEKEY_ENABLE = yes
BOOTMAGIC_ENABLE = full
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = yes
CONSOLE_ENABLE = yes
COMMAND_ENABLE = yes
Expand Down
6 changes: 3 additions & 3 deletions keyboards/canoe/rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ F_CPU = 12000000

# Bootloader
# This definition is optional, and if your keyboard supports multiple bootloaders of
# different sizes, comment this out, and the correct address will be loaded
# different sizes, comment this out, and the correct address will be loaded
# automatically (+60). See bootloader.mk for all options.
BOOTLOADER = bootloadHID

# build options
BOOTMAGIC_ENABLE = yes
MOUSEKEY_ENABLE = yes
BOOTMAGIC_ENABLE = full
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = yes
CONSOLE_ENABLE = yes
COMMAND_ENABLE = yes
Expand Down
42 changes: 42 additions & 0 deletions keyboards/converter/ibm_5291/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
Copyright 2018 listofoptions <[email protected]>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#include "config_common.h"

#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6060
#define DEVICE_VER 1
#define MANUFACTURER QMK
#define PRODUCT 5291 keyboard converter
#define DESCRIPTION 5291 keyboard converter

#define MATRIX_ROWS 24
#define MATRIX_COLS 4

#define MATRIX_ROW_PINS {B2, B3, B4, B5, B6}
#define MATRIX_COL_PINS {B0, B1}
#define MATRIX_DATA_PIN D0
#define MATRIX_STROBE_PIN D1
#define LED_PIN D6


/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCING_DELAY 0


3 changes: 3 additions & 0 deletions keyboards/converter/ibm_5291/ibm_5291.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "ibm_5291.h"
#include <avr/io.h>
#include "quantum.h"
69 changes: 69 additions & 0 deletions keyboards/converter/ibm_5291/ibm_5291.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/*
Copyright 2018 listofoptions <[email protected]>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#include "quantum.h"

/*
* ,-------. ,--------------------------------------------------------------------------.
* | F1| F2| |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| BS |NumLck |ScrLck |
* |-------| |--------------------------------------------------------------------------|
* | F3| F4| | Tab | Q| W| E| R| T| Y| U| I| O| P| [| ] | | 7| 8| 9| -|
* |-------| |------------------------------------------------------|Ent|---------------|
* | F5| F6| | Ctrl | A| S| D| F| G| H| J| K| L| ;| '| `| | 4| 5| 6| |
* |-------| |----------------------------------------------------------------------| |
* | F7| F8| |Shif| \| Z| X| C| V| B| N| M| ,| .| /|Shift|PrS| 1| 2| 3| +|
* |-------| |----------------------------------------------------------------------| |
* | F9|F10| | Alt | Space |CapsLck| 0 | . | |
* `-------' `--------------------------------------------------------------------------'
*/

#define LAYOUT_5291( \
KEY_F1,KEY_F2, KEY_ESC, KEY_1, KEY_2,KEY_3,KEY_4,KEY_5,KEY_6,KEY_7,KEY_8,KEY_9, KEY_0, KEY_MIN, KEY_EQU, KEY_BACK, KEY_NLOCK, KEY_SLOCK, \
KEY_F3,KEY_F4, KEY_TAB, KEY_Q, KEY_W,KEY_E,KEY_R,KEY_T,KEY_Y,KEY_U,KEY_I,KEY_O, KEY_P, KEY_LBRC,KEY_RBRC, KEY_PAD7,KEY_PAD8, KEY_PAD9,KEY_PMIN, \
KEY_F5,KEY_F6, KEY_LCTR,KEY_A, KEY_S,KEY_D,KEY_F,KEY_G,KEY_H,KEY_J,KEY_K,KEY_L, KEY_SEMI,KEY_QUOT,KEY_TICK, KEY_ENTR,KEY_PAD4,KEY_PAD5, KEY_PAD6, \
KEY_F7,KEY_F8, KEY_LSFS,KEY_BSLS,KEY_Z,KEY_X,KEY_C,KEY_V,KEY_B,KEY_N,KEY_M,KEY_COMM,KEY_DOT, KEY_SLS,KEY_RSFS, KEY_PAST,KEY_PAD1,KEY_PAD2, KEY_PAD3,KEY_PPLS, \
KEY_F9,KEY_F10, KEY_LALT, KEY_SPACE, KEY_CLOCK, KEY_PAD0, KEY_PDOT \
) \
{ {KEY_Z, KEY_S, KEY_W, KEY_3 }\
, {KEY_X, KEY_D, KEY_E, KEY_4 }\
, {KEY_C, KEY_F, KEY_R, KEY_5 }\
, {KEY_V, KEY_G, KEY_T, KEY_6 }\
, {KEY_B, KEY_H, KEY_Y, KEY_7 }\
, {KEY_N, KEY_J, KEY_U, KEY_8 }\
, {KEY_PAD2, KEY_PAD5,KEY_PAD8,KEY_NLOCK }\
, {KEY_M, KEY_K, KEY_I, KEY_9 }\
, {KEY_COMM, KEY_L, KEY_O, KEY_0 }\
, {KEY_DOT, KEY_SEMI,KEY_P, KEY_MIN }\
, {KEY_SLS, KEY_QUOT,KEY_LBRC,KEY_EQU }\
, {KEY_SPACE, KEY_RSFS,KEY_TICK,KEY_RBRC }\
, {KEY_CLOCK, KEY_PAST,KEY_ENTR,KEY_BACK }\
, {KEY_PAD0, KEY_PAD1,KEY_PAD4,KEY_PAD7 }\
, {KEY_PPLS, KC_NO, KEY_PMIN,KEY_SLOCK }\
, {KEY_PDOT, KEY_PAD3,KEY_PAD6,KEY_PAD9 }\
, {KEY_BSLS, KEY_A, KEY_Q, KEY_2 }\
, {KEY_LALT, KC_NO, KC_NO, KEY_1 }\
, {KEY_F7, KEY_F5, KEY_F3, KEY_F1 }\
, {KEY_F8, KEY_F6, KEY_F4, KEY_F2 }\
, {KC_F10, KC_NO, KC_NO, KC_NO }\
, {KC_F9, KC_NO, KC_NO, KC_NO }\
, {KEY_LSFS, KEY_LCTR,KEY_TAB, KEY_ESC }\
, {KC_NO, KC_NO, KC_NO, KC_NO }\
}

#define LAYOUT LAYOUT_5291
6 changes: 6 additions & 0 deletions keyboards/converter/ibm_5291/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"keyboard_name": "IBM 5291",
"keyboard_folder": "converter/5291",
"url": "https://deskthority.net/wiki/IBM_Model_F#IBM_5291_Keyboard",
"maintainer": "listofoptions",
}
Loading

0 comments on commit 1feca4a

Please sign in to comment.