diff options
| author | fauxpark <fauxpark@gmail.com> | 2021-09-21 20:19:07 +1000 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2021-09-21 20:19:07 +1000 |
| commit | 94572d74b54ff835a9a1e8adda459d4481274453 (patch) | |
| tree | 6168569f18e4e9890fd96e12cc7b389f35c4acd8 /keyboards/ckeys | |
| parent | 20ea5f3fb5ba108153148e57981a7e804fd4be61 (diff) | |
| parent | 6b74e48f81fd22f4b982c686df9c8d1f8efae571 (diff) | |
| download | qmk_firmware-94572d74b54ff835a9a1e8adda459d4481274453.tar.gz qmk_firmware-94572d74b54ff835a9a1e8adda459d4481274453.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/ckeys')
| -rw-r--r-- | keyboards/ckeys/nakey/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/ckeys/obelus/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/ckeys/washington/rules.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/keyboards/ckeys/nakey/rules.mk b/keyboards/ckeys/nakey/rules.mk index 6874585cb..74d76917b 100644 --- a/keyboards/ckeys/nakey/rules.mk +++ b/keyboards/ckeys/nakey/rules.mk | |||
| @@ -18,6 +18,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 18 | NKRO_ENABLE = no # USB Nkey Rollover | 18 | NKRO_ENABLE = no # USB Nkey Rollover |
| 19 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 19 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |
| 20 | UNICODE_ENABLE = no # Unicode | 20 | UNICODE_ENABLE = no # Unicode |
| 21 | AUDIO_ENABLE = no # Audio output on port C6 | 21 | AUDIO_ENABLE = no # Audio output |
| 22 | 22 | ||
| 23 | LAYOUTS = numpad_5x4 | 23 | LAYOUTS = numpad_5x4 |
diff --git a/keyboards/ckeys/obelus/rules.mk b/keyboards/ckeys/obelus/rules.mk index 848947d23..1c2e1e0cc 100644 --- a/keyboards/ckeys/obelus/rules.mk +++ b/keyboards/ckeys/obelus/rules.mk | |||
| @@ -19,6 +19,6 @@ NKRO_ENABLE = no # USB Nkey Rollover | |||
| 19 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 19 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |
| 20 | MIDI_ENABLE = yes # MIDI support | 20 | MIDI_ENABLE = yes # MIDI support |
| 21 | UNICODE_ENABLE = no # Unicode | 21 | UNICODE_ENABLE = no # Unicode |
| 22 | AUDIO_ENABLE = yes # Audio output on port C6 | 22 | AUDIO_ENABLE = yes # Audio output |
| 23 | 23 | ||
| 24 | LAYOUTS = ortho_4x4 | 24 | LAYOUTS = ortho_4x4 |
diff --git a/keyboards/ckeys/washington/rules.mk b/keyboards/ckeys/washington/rules.mk index 2f1219a35..925ee3d16 100644 --- a/keyboards/ckeys/washington/rules.mk +++ b/keyboards/ckeys/washington/rules.mk | |||
| @@ -18,7 +18,7 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 18 | NKRO_ENABLE = no # USB Nkey Rollover | 18 | NKRO_ENABLE = no # USB Nkey Rollover |
| 19 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | 19 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality |
| 20 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | 20 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
| 21 | AUDIO_ENABLE = no # Audio output on port C6 | 21 | AUDIO_ENABLE = no # Audio output |
| 22 | ENCODER_ENABLE = yes # Enable support for encoders | 22 | ENCODER_ENABLE = yes # Enable support for encoders |
| 23 | OLED_ENABLE = yes | 23 | OLED_ENABLE = yes |
| 24 | OLED_DRIVER = SSD1306 # Enable support for OLED displays | 24 | OLED_DRIVER = SSD1306 # Enable support for OLED displays |