Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #1

Merged
merged 43 commits into from
Aug 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
c9e6669
Tidy up encoder in matrix references (#21718)
zvecr Aug 9, 2023
e4716d2
[Keyboard] Update usb.* of `dactyl_lightcycle` (#21462)
dunk2k Aug 12, 2023
dfec8f7
Merge remote-tracking branch 'origin/master' into develop
qmk-bot Aug 12, 2023
75d84e5
[Keyboard] add laneware `raindrop` keyboard (#21277)
dunk2k Aug 12, 2023
0294881
Merge remote-tracking branch 'origin/master' into develop
qmk-bot Aug 12, 2023
a0c99e3
[Keyboard] Add Projectd/65/Projectd_65_ansi (#21520)
gskygithub Aug 12, 2023
6a2c53e
Merge remote-tracking branch 'origin/master' into develop
qmk-bot Aug 12, 2023
3831407
[Keymap] Add Via keymap for CXT Studio (#21675)
puffnfresh Aug 12, 2023
634989d
Merge remote-tracking branch 'origin/master' into develop
qmk-bot Aug 12, 2023
e4e90fa
[Keyboard] fix json for nemui65 (#21629)
spbgzh Aug 12, 2023
43f1f9b
Merge remote-tracking branch 'origin/master' into develop
qmk-bot Aug 12, 2023
6f63857
[Keyboard] Update USB settings for dactyl_maximus (#21666)
dunk2k Aug 12, 2023
1eb70be
Merge remote-tracking branch 'origin/master' into develop
qmk-bot Aug 12, 2023
8d0e9e0
[Keyboard] Add mk47 keyboard (#19797)
jonylee1986 Aug 12, 2023
82764b7
Merge remote-tracking branch 'origin/master' into develop
qmk-bot Aug 12, 2023
e6187b7
correct keymap file name for tkl_f13_jis layout (#21631)
dunk2k Aug 13, 2023
07dc49a
Merge remote-tracking branch 'origin/master' into develop
qmk-bot Aug 13, 2023
3da773d
[Keyboard] Refactor Caticorn PCB (#21644)
HorrorTroll Aug 14, 2023
6f3beae
Kintwin controller for kinesis keyboard, split layout (#21614)
alvicstep Aug 14, 2023
125a903
Fix `keyboard` field for some JSON keymaps (#21752)
fauxpark Aug 14, 2023
fb030a1
Merge remote-tracking branch 'origin/master' into develop
qmk-bot Aug 14, 2023
f3ef90b
[Keyboard] Add Shostudio Arc (#21733)
mechlovin Aug 14, 2023
4f3c25c
Merge remote-tracking branch 'origin/master' into develop
qmk-bot Aug 14, 2023
815cecf
[Keymap] Update rpbaptist crkbd (#21674)
rpbaptist Aug 14, 2023
280a96b
[Keymap] Update andrebrait keymap for GMMK Pro (#21668)
andrebrait Aug 14, 2023
6038023
[Keymap] submitting janat-t planck keymap (#21619)
janat-t Aug 14, 2023
31a9d2d
[keyboard] Graystudio Think6.5 V3 Support Revised (#21560)
edwardslau Aug 14, 2023
0ac8221
Remove invalid config option from kikoslab/kl90 (#21708)
zvecr Aug 15, 2023
dbd847d
[Keyboard] Add Chouchou keyboard (#21699)
dlip Aug 15, 2023
5d2f2af
OLED: driver naming cleanups (#21710)
fauxpark Aug 15, 2023
f38ccaa
Update usb information for dactyl_cc (#21612)
dunk2k Aug 15, 2023
3ece80f
Merge remote-tracking branch 'origin/master' into develop
zvecr Aug 15, 2023
1c069b1
rgblight: driver selection cleanups (#21558)
fauxpark Aug 15, 2023
17906df
[Keyboard] add willoucom/keypad (#21714)
willoucom Aug 15, 2023
ad954fe
Add ScottoErgo Keyboard (#20944)
joe-scotto Aug 16, 2023
8be8d50
Add Scotto34 Keyboard (#20943)
joe-scotto Aug 16, 2023
50ab230
Add ScottoInvader Keyboard (#20941)
joe-scotto Aug 16, 2023
811bebc
Merge remote-tracking branch 'origin/master' into develop
qmk-bot Aug 16, 2023
dea2d94
coarse/cordillera: fix backlight config (#21761)
fauxpark Aug 16, 2023
02272ed
Merge remote-tracking branch 'origin/master' into develop
qmk-bot Aug 16, 2023
190738c
The PoweredByPorridge layout for the Keyboardio Atreus (#21737)
PoweredByPorridge Aug 16, 2023
dc11f08
Merge remote-tracking branch 'origin/master' into develop
qmk-bot Aug 16, 2023
89a30ef
[Keymap] add squigglybob splitkb kyria rev2 keymap (#21751)
squigglybob Aug 17, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 6 additions & 10 deletions builddefs/common_features.mk
Original file line number Diff line number Diff line change
Expand Up @@ -317,14 +317,10 @@ ifneq ($(strip $(FLASH_DRIVER)), none)
endif

RGBLIGHT_ENABLE ?= no
VALID_RGBLIGHT_TYPES := WS2812 APA102 custom

ifeq ($(strip $(RGBLIGHT_CUSTOM_DRIVER)), yes)
RGBLIGHT_DRIVER ?= custom
endif
VALID_RGBLIGHT_TYPES := ws2812 apa102 custom

ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
RGBLIGHT_DRIVER ?= WS2812
RGBLIGHT_DRIVER ?= ws2812

ifeq ($(filter $(RGBLIGHT_DRIVER),$(VALID_RGBLIGHT_TYPES)),)
$(call CATASTROPHIC_ERROR,Invalid RGBLIGHT_DRIVER,RGBLIGHT_DRIVER="$(RGBLIGHT_DRIVER)" is not a valid RGB type)
Expand All @@ -338,11 +334,11 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
RGB_KEYCODES_ENABLE := yes
endif

ifeq ($(strip $(RGBLIGHT_DRIVER)), WS2812)
ifeq ($(strip $(RGBLIGHT_DRIVER)), ws2812)
WS2812_DRIVER_REQUIRED := yes
endif

ifeq ($(strip $(RGBLIGHT_DRIVER)), APA102)
ifeq ($(strip $(RGBLIGHT_DRIVER)), apa102)
APA102_DRIVER_REQUIRED := yes
endif

Expand Down Expand Up @@ -747,8 +743,8 @@ ifeq ($(strip $(HD44780_ENABLE)), yes)
SRC += hd44780.c
endif

VALID_OLED_DRIVER_TYPES := SSD1306 custom
OLED_DRIVER ?= SSD1306
VALID_OLED_DRIVER_TYPES := custom ssd1306
OLED_DRIVER ?= ssd1306
VALID_OLED_TRANSPORT_TYPES := i2c spi custom
OLED_TRANSPORT ?= i2c
ifeq ($(strip $(OLED_ENABLE)), yes)
Expand Down
2 changes: 1 addition & 1 deletion builddefs/show_options.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ HARDWARE_OPTION_NAMES = \
BACKLIGHT_ENABLE \
BACKLIGHT_DRIVER \
RGBLIGHT_ENABLE \
RGBLIGHT_CUSTOM_DRIVER \
RGBLIGHT_DRIVER \
RGB_MATRIX_ENABLE \
RGB_MATRIX_DRIVER \
CIE1931_CURVE \
Expand Down
1 change: 1 addition & 0 deletions data/mappings/info_rules.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"PS2_ENABLE": {"info_key": "ps2.enabled", "value_type": "bool"},
"PS2_MOUSE_ENABLE": {"info_key": "ps2.mouse_enabled", "value_type": "bool"},
"RGB_MATRIX_DRIVER": {"info_key": "rgb_matrix.driver"},
"RGBLIGHT_DRIVER": {"info_key": "rgblight.driver"},
"SECURE_ENABLE": {"info_key": "secure.enabled", "value_type": "bool"},
"SPLIT_KEYBOARD": {"info_key": "split.enabled", "value_type": "bool"},
"SPLIT_TRANSPORT": {"info_key": "split.transport.protocol", "to_c": false},
Expand Down
4 changes: 4 additions & 0 deletions data/schemas/keyboard.jsonschema
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,10 @@
}
},
"brightness_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
"driver": {
"type": "string",
"enum": ["apa102", "custom", "ws2812"]
},
"hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
"layers": {
"type": "object",
Expand Down
8 changes: 4 additions & 4 deletions docs/feature_oled_driver.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ OLED_ENABLE = yes

|OLED Driver |Supported Device |
|-------------------|------------------------------------|
|SSD1306 (default) |For both SSD1306, SH1106, and SH1107|
|`ssd1306` (default)|For both SSD1306, SH1106, and SH1107|

e.g.
```make
OLED_DRIVER = SSD1306
OLED_DRIVER = ssd1306
```

|OLED Transport | |
|---------------|------------------------------------------------|
|i2c (default) | Uses I2C for communication with the OLED panel |
|spi | Uses SPI for communication with the OLED panel |
|`i2c` (default)| Uses I2C for communication with the OLED panel |
|`spi` | Uses SPI for communication with the OLED panel |

e.g.
```make
Expand Down
2 changes: 1 addition & 1 deletion docs/feature_rgblight.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ For APA102 LEDs, add the following to your `rules.mk`:

```make
RGBLIGHT_ENABLE = yes
RGBLIGHT_DRIVER = APA102
RGBLIGHT_DRIVER = apa102
```

At minimum you must define the data pin your LED strip is connected to, and the number of LEDs in the strip, in your `config.h`. For APA102 LEDs, you must also define the clock pin. If your keyboard has onboard RGB LEDs, and you are simply creating a keymap, you usually won't need to modify these.
Expand Down
1 change: 0 additions & 1 deletion keyboards/0xcb/1337/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
LTO_ENABLE = yes
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
1 change: 0 additions & 1 deletion keyboards/0xcb/static/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
LTO_ENABLE = yes
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
2 changes: 0 additions & 2 deletions keyboards/0xcb/tutelpad/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@ NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output

OLED_ENABLE = yes
OLED_DRIVER = SSD1306
1 change: 0 additions & 1 deletion keyboards/10bleoledhub/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
BLUETOOTH_ENABLE = yes
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
ENCODER_ENABLE = yes
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@ WS2812_DRIVER = vendor
ENCODER_ENABLE = yes
ENCODER_MAP_ENABLE = yes
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
1 change: 0 additions & 1 deletion keyboards/1upkeyboards/pi40/rules.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
OLED_ENABLE = yes
OLED_DRIVER = SSD1306

DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0
1 change: 0 additions & 1 deletion keyboards/25keys/cassette42/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
OLED_ENABLE = yes
OLED_DRIVER = SSD1306

SRC += ./common/oled_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ GRAVE_ESC_ENABLE = no
MAGIC_ENABLE = no
ENCODER_MAP_ENABLE = yes
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
WPM_ENABLE = yes
1 change: 0 additions & 1 deletion keyboards/adpenrose/kintsugi/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Encoder functionality
OLED_ENABLE = yes # OLED functionality
OLED_DRIVER = SSD1306
1 change: 0 additions & 1 deletion keyboards/aeboards/ext65/rev1/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
VIA_ENABLE = yes
OLED_ENABLE = yes
# OLED_DRIVER = not a real thing
1 change: 0 additions & 1 deletion keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
VIA_ENABLE = yes
OLED_ENABLE = yes
# OLED_DRIVER = not a real thing
1 change: 0 additions & 1 deletion keyboards/aidansmithdotdev/fine40/rules.mk
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
OLED_DRIVER = SSD1306
1 change: 0 additions & 1 deletion keyboards/aleblazer/zodiark/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
ENCODER_ENABLE = yes
SPLIT_KEYBOARD = yes
LTO_ENABLE = yes
1 change: 0 additions & 1 deletion keyboards/anavi/knob1/rules.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C

OPT_DEFS += -DHAL_USE_I2C=TRUE
1 change: 0 additions & 1 deletion keyboards/anavi/knobs3/rules.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C

OPT_DEFS += -DHAL_USE_I2C=TRUE
1 change: 0 additions & 1 deletion keyboards/anavi/macropad8/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
1 change: 0 additions & 1 deletion keyboards/aplyard/aplx6/rev2/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
UNICODE_ENABLE = yes # Unicode
OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Enable Support for Oled Display
ENCODER_ENABLE = yes # Enable Support for Encoder
1 change: 0 additions & 1 deletion keyboards/arabica37/keymaps/default/rules.mk
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
1 change: 0 additions & 1 deletion keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
WPM_ENABLE = yes
1 change: 0 additions & 1 deletion keyboards/avalanche/v4/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
OLED_ENABLE = yes
OLED_DRIVER = SSD1306

SPLIT_KEYBOARD = yes
1 change: 0 additions & 1 deletion keyboards/basekeys/slice/rev1_rgb/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Disable OLED driver.

LTO_ENABLE = yes
1 change: 0 additions & 1 deletion keyboards/bluebell/swoop/keymaps/kyek/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ LTO_ENABLE = no
EXTRAKEY_ENABLE = no

# ENCODER_ENABLE = no
# OLED_DRIVER_ENABLE = no
# WPM_ENABLE = no

# Enable keyboard underlight functionality
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
1 change: 0 additions & 1 deletion keyboards/bolsa/damapad/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
1 change: 0 additions & 1 deletion keyboards/boston_meetup/2019/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ RGB_MATRIX_ENABLE = no
HAPTIC_ENABLE = yes
HAPTIC_DRIVER = drv2605l
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
2 changes: 0 additions & 2 deletions keyboards/buzzard/rev1/rules.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
OLED_DRIVER = SSD1306

PS2_ENABLE = yes
PS2_DRIVER = interrupt
2 changes: 0 additions & 2 deletions keyboards/cannonkeys/satisfaction75/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
ENCODER_ENABLE = yes
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
#BACKLIGHT_ENABLE = yes

DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1

1 change: 1 addition & 0 deletions keyboards/capsunlocked/cu75/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"levels": 8
},
"rgblight": {
"driver": "custom",
"hue_steps": 10,
"led_count": 24
},
Expand Down
1 change: 0 additions & 1 deletion keyboards/capsunlocked/cu75/keymaps/default/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ NKRO_ENABLE = yes
BACKLIGHT_ENABLE = yes # Disable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = yes # Disable RGB underlight
RGBLIGHT_CUSTOM_DRIVER = yes # RGB code is implemented in lefkeyboards, not WS2812
SLEEP_LED_ENABLE = yes

ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled
Expand Down
1 change: 0 additions & 1 deletion keyboards/capsunlocked/cu75/keymaps/iso/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ NKRO_ENABLE = yes
# BACKLIGHT_ENABLE = no # Disable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Disable RGB underlight
RGBLIGHT_CUSTOM_DRIVER = yes # RGB code is implemented in lefkeyboards, not WS2812
SLEEP_LED_ENABLE = yes

ISSI_ENABLE = no # If the I2C pullup resistors aren't install this must be disabled
Expand Down
7 changes: 7 additions & 0 deletions keyboards/chouchou/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Copyright 2023 Dane Lipscombe (@dlip)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
52 changes: 52 additions & 0 deletions keyboards/chouchou/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"manufacturer": "dlip",
"keyboard_name": "chouchou",
"maintainer": "dlip",
"bootloader": "rp2040",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
},
"matrix_pins": {
"direct": [
["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP26", "GP27", "GP28", "GP29"]
]
},
"processor": "RP2040",
"url": "https://github.com/dlip/chouchou",
"usb": {
"device_version": "1.0.0",
"pid": "0x0117",
"vid": "0xFABE"
},
"layouts": {
"LAYOUT_split_2x4_2": {
"layout": [
{"matrix": [0, 16], "x": 0, "y": 0.88},
{"matrix": [0, 17], "x": 1, "y": 0.38},
{"matrix": [0, 18], "x": 2, "y": 0},
{"matrix": [0, 19], "x": 3, "y": 0.38},
{"matrix": [0, 0], "x": 4, "y": 0.38},
{"matrix": [0, 1], "x": 5, "y": 0},
{"matrix": [0, 2], "x": 6, "y": 0.38},
{"matrix": [0, 3], "x": 7, "y": 0.88},
{"matrix": [0, 12], "x": 0, "y": 1.88},
{"matrix": [0, 13], "x": 1, "y": 1.38},
{"matrix": [0, 14], "x": 2, "y": 1},
{"matrix": [0, 15], "x": 3, "y": 1.38},
{"matrix": [0, 4], "x": 4, "y": 1.38},
{"matrix": [0, 5], "x": 5, "y": 1},
{"matrix": [0, 6], "x": 6, "y": 1.38},
{"matrix": [0, 7], "x": 7, "y": 1.88},
{"matrix": [0, 11], "x": 2, "y": 2.38},
{"matrix": [0, 10], "x": 3, "y": 2.5},
{"matrix": [0, 9], "x": 4, "y": 2.5},
{"matrix": [0, 8], "x": 5, "y": 2.38}
]
}
}
}
11 changes: 11 additions & 0 deletions keyboards/chouchou/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Copyright 2023 Dane Lipscombe (@dlip)
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_split_2x4_2(
KC_A, KC_B, KC_C, KC_D, KC_N, KC_M, KC_L, KC_K,
KC_E, KC_F, KC_G, KC_H, KC_R, KC_Q, KC_P, KC_O,
KC_I, KC_J, KC_T, KC_S
),
};
26 changes: 26 additions & 0 deletions keyboards/chouchou/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Chouchou

![Chouchou](https://i.imgur.com/BYk2n5Ch.jpeg)

Chouchou (Japanese for butterfly) is a minimalist unibody keyboard designed to be used with the [Taipo](https://inkeys.wiki/en/keymaps/taipo) layout.

- [Github repo](https://github.com/dlip/chouchou)
- Keyboard Maintainer: [Dane Lipscombe](https://github.com/dlip)

Make example for this keyboard (after setting up your build environment):

make chouchou:default

Flashing example for this keyboard:

make chouchou:default:flash

See 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).

## Bootloader

Enter the bootloader in 3 ways:

* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
Empty file added keyboards/chouchou/rules.mk
Empty file.
1 change: 0 additions & 1 deletion keyboards/ckeys/washington/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Enable support for encoders
OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Enable support for OLED displays
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": 1,
"author": "skullydazed",
"notes": "",
"keyboard": "clueboard/2x1800/2018",
"keyboard": "clueboard/2x1800/2021",
"keymap": "default",
"layout": "LAYOUT_all",
"layers": [
Expand Down
1 change: 0 additions & 1 deletion keyboards/coarse/cordillera/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#define BACKLIGHT_PWM_DRIVER PWMD1
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1

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