aboutsummaryrefslogtreecommitdiff
path: root/keyboards/clueboard/card
diff options
context:
space:
mode:
authorskullydazed <skullydazed@users.noreply.github.com>2019-01-23 09:25:32 -0800
committerGitHub <noreply@github.com>2019-01-23 09:25:32 -0800
commitd1f735b6d2739295faf932dbb61e3c8b4c0b2898 (patch)
treeb1fd49248ef518b0252571d1812cd060860a1248 /keyboards/clueboard/card
parent9667c10477fb9bc91b9355dc4969ba8a5769871e (diff)
downloadqmk_firmware-d1f735b6d2739295faf932dbb61e3c8b4c0b2898.tar.gz
qmk_firmware-d1f735b6d2739295faf932dbb61e3c8b4c0b2898.zip
Clueboard refresh (#4902)
* Cluecard: refactor - renamed layout macro KEYMAP to LAYOUT - reformatted layout macro to more closely resemble physical device layout - keymaps now use #include QMK_KEYBOARD_H - config.h files updated to use #pragma once method - deleted outdated QUANTUM_DIR code blocks from rules.mk files - white space changes on rules.mk files (alignment/readability) * Cluecard: Configurator support * Cluecard: readme update - added image - updated Docs links * Clueboard 66% HotSwap: corrected matrix and Configurator data - removed k31 and k84 from LAYOUT - both appear to be unsupported for this PCB according to images on clueboard.co - updated block comment mock-ups to match changes - rebuilt info.json file - delete removed keys from default keymap.c * Clueboard 66% HotSwap: readme update - fix make example - updated Docs links * Clueboard 66% HotSwap: 66_ansi keymap update Updated to use #include QMK_KEYBOARD_H * Clueboard 60% refactor - renamed layout macro KEYMAP to LAYOUT_all - renamed layout macro KEYMAP_AEK to LAYOUT_aek - removed redundant KC_TRNS definitions from keymaps - all keymaps now use #include QMK_KEYBOARD_H * Clueboard 17%: refactor * Clueboard 17%: Configurator support * Clueboard 17%: update Docs links in readme * Cleanup the 2x1800 files * Update Clueboard 60% to standard matrix * Update the clueboard default keymaps * Refresh and update clueboard 17 * Add the 66% hotswap to Clueboard's readme * Clarify the 66% hotswap's readme * change the image to imgur * Update the clueboard 66 to follow modern standards * update clueboard 66_hotswap to follow modern practices * Move the logo to imgur * update clueboard/card to follow modern practices * remove clueboard/66 as a valid make target * Address comments in #4902 * fix user keymaps after the changes
Diffstat (limited to 'keyboards/clueboard/card')
-rw-r--r--keyboards/clueboard/card/card.h17
-rw-r--r--keyboards/clueboard/card/config.h15
-rw-r--r--keyboards/clueboard/card/info.json20
-rw-r--r--keyboards/clueboard/card/keymaps/default/config.h7
-rw-r--r--keyboards/clueboard/card/keymaps/default/keymap.c7
-rw-r--r--keyboards/clueboard/card/keymaps/default/rules.mk13
-rw-r--r--keyboards/clueboard/card/keymaps/rgb_effects/config.h7
-rw-r--r--keyboards/clueboard/card/keymaps/rgb_effects/keymap.c6
-rw-r--r--keyboards/clueboard/card/keymaps/rgb_effects/rules.mk11
-rw-r--r--keyboards/clueboard/card/readme.md4
-rw-r--r--keyboards/clueboard/card/rules.mk71
11 files changed, 61 insertions, 117 deletions
diff --git a/keyboards/clueboard/card/card.h b/keyboards/clueboard/card/card.h
index 3342a0823..a09285eb0 100644
--- a/keyboards/clueboard/card/card.h
+++ b/keyboards/clueboard/card/card.h
@@ -1,22 +1,19 @@
1#ifndef CLUECARD_H 1#pragma once
2#define CLUECARD_H
3 2
4#include "quantum.h" 3#include "quantum.h"
5 4
6// This a shortcut to help you visually see your layout. 5// This a shortcut to help you visually see your layout.
7// The first section contains all of the arguements 6// The first section contains all of the arguements
8// The second converts the arguments into a two-dimensional array 7// The second converts the arguments into a two-dimensional array
9#define KEYMAP( \ 8#define LAYOUT( \
10 k00, k01, k02, \ 9 k00, k01, k02, \
11 k10, k12, \ 10 k10, k12, \
12 k20, k21, k22, \ 11 k20, k21, k22, \
13 k11, \ 12 k11, \
14 k30, k31, k32 \ 13 k30, k31, k32 \
15) { \ 14) { \
16 { k00, k01, k02, }, \ 15 { k00, k01, k02, }, \
17 { k10, k11, k12, }, \ 16 { k10, k11, k12, }, \
18 { k20, k21, k22, }, \ 17 { k20, k21, k22, }, \
19 { k30, k31, k32, } \ 18 { k30, k31, k32, } \
20} 19}
21
22#endif
diff --git a/keyboards/clueboard/card/config.h b/keyboards/clueboard/card/config.h
index 6520eb557..805982121 100644
--- a/keyboards/clueboard/card/config.h
+++ b/keyboards/clueboard/card/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17 17
18#ifndef CONFIG_H 18#pragma once
19#define CONFIG_H
20 19
21#include "config_common.h" 20#include "config_common.h"
22 21
@@ -32,15 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
32#define MATRIX_ROWS 4 31#define MATRIX_ROWS 4
33#define MATRIX_COLS 3 32#define MATRIX_COLS 3
34 33
35/* 34/* Keyboard Matrix Assignments
36 * Keyboard Matrix Assignments
37 *
38 * Change this to how you wired your keyboard
39 * COLS: AVR pins used for columns, left to right
40 * ROWS: AVR pins used for rows, top to bottom
41 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
42 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
43 *
44*/ 35*/
45#define MATRIX_ROW_PINS { F0, F5, F4, B4 } 36#define MATRIX_ROW_PINS { F0, F5, F4, B4 }
46#define MATRIX_COL_PINS { F1, F7, F6 } 37#define MATRIX_COL_PINS { F1, F7, F6 }
@@ -163,5 +154,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
163//#define NO_ACTION_ONESHOT 154//#define NO_ACTION_ONESHOT
164//#define NO_ACTION_MACRO 155//#define NO_ACTION_MACRO
165//#define NO_ACTION_FUNCTION 156//#define NO_ACTION_FUNCTION
166
167#endif
diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json
new file mode 100644
index 000000000..86dbb4faa
--- /dev/null
+++ b/keyboards/clueboard/card/info.json
@@ -0,0 +1,20 @@
1{
2 "keyboard_name": "Cluecard",
3 "keyboard_folder": "clueboard/card",
4 "url": "",
5 "maintainer": "skullydazed",
6 "width": 10,
7 "height": 7,
8 "layouts": {
9 "LAYOUT": {
10 "layout": [
11 {"label":"ON/OFF", "x":0, "y":0}, {"label":"SAT+", "x":4, "y":0}, {"label":"BRIGHT+", "x":8, "y":0},
12 {"label":"HUE-", "x":2, "y":1}, {"label":"HUE+", "x":6, "y":1},
13 {"label":"MODE", "x":0, "y":2}, {"label":"SAT-", "x":4, "y":2}, {"label":"BRIGHT-", "x":8, "y":2},
14 {"label":"LAYER", "x":2, "y":4},
15
16 {"label":"MX1", "x":4, "y":6, "w":2, "h":2}, {"label":"MX2", "x":6, "y":6, "w":2, "h":2}, {"label":"MX3", "x":8, "y":6, "w":2, "h":2}
17 ]
18 }
19 }
20}
diff --git a/keyboards/clueboard/card/keymaps/default/config.h b/keyboards/clueboard/card/keymaps/default/config.h
index 8893d122e..271f48d00 100644
--- a/keyboards/clueboard/card/keymaps/default/config.h
+++ b/keyboards/clueboard/card/keymaps/default/config.h
@@ -1,8 +1,3 @@
1#ifndef CONFIG_USER_H 1#pragma once
2#define CONFIG_USER_H
3
4#include "../../config.h"
5 2
6// place overrides here 3// place overrides here
7
8#endif
diff --git a/keyboards/clueboard/card/keymaps/default/keymap.c b/keyboards/clueboard/card/keymaps/default/keymap.c
index 5fa6ae20a..687343e1b 100644
--- a/keyboards/clueboard/card/keymaps/default/keymap.c
+++ b/keyboards/clueboard/card/keymaps/default/keymap.c
@@ -1,10 +1,7 @@
1#include "card.h" 1#include QMK_KEYBOARD_H
2#ifdef AUDIO_ENABLE
3 #include "audio.h"
4#endif
5 2
6const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7 [0] = KEYMAP( 4 [0] = LAYOUT(
8 RGB_TOG, RGB_SAI, RGB_VAI, \ 5 RGB_TOG, RGB_SAI, RGB_VAI, \
9 RGB_HUD, RGB_HUI, \ 6 RGB_HUD, RGB_HUI, \
10 RGB_MOD, RGB_SAD, RGB_VAD, \ 7 RGB_MOD, RGB_SAD, RGB_VAD, \
diff --git a/keyboards/clueboard/card/keymaps/default/rules.mk b/keyboards/clueboard/card/keymaps/default/rules.mk
index ed7eceea0..3b11f550f 100644
--- a/keyboards/clueboard/card/keymaps/default/rules.mk
+++ b/keyboards/clueboard/card/keymaps/default/rules.mk
@@ -3,16 +3,15 @@
3# the appropriate keymap folder that will get included automatically 3# the appropriate keymap folder that will get included automatically
4# 4#
5BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) 5BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
6MOUSEKEY_ENABLE = no # Mouse keys(+4700) 6MOUSEKEY_ENABLE = no # Mouse keys(+4700)
7EXTRAKEY_ENABLE = no # Audio control and System control(+450) 7EXTRAKEY_ENABLE = no # Audio control and System control(+450)
8CONSOLE_ENABLE = yes # Console for debug(+400) 8CONSOLE_ENABLE = yes # Console for debug(+400)
9COMMAND_ENABLE = yes # Commands for debug and configuration 9COMMAND_ENABLE = yes # Commands for debug and configuration
10NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 10NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
11BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality 11BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
12MIDI_ENABLE = no # MIDI controls 12MIDI_ENABLE = no # MIDI controls
13AUDIO_ENABLE = yes # Audio output on port C6 13AUDIO_ENABLE = yes # Audio output on port C6
14UNICODE_ENABLE = no # Unicode 14UNICODE_ENABLE = no # Unicode
15BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 15BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
16RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. 16RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
17SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 17SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
18
diff --git a/keyboards/clueboard/card/keymaps/rgb_effects/config.h b/keyboards/clueboard/card/keymaps/rgb_effects/config.h
index c6c9342c8..0b2a68f54 100644
--- a/keyboards/clueboard/card/keymaps/rgb_effects/config.h
+++ b/keyboards/clueboard/card/keymaps/rgb_effects/config.h
@@ -1,12 +1,7 @@
1#ifndef CONFIG_USER_H 1#pragma once
2#define CONFIG_USER_H
3
4#include "../../config.h"
5 2
6// place overrides here 3// place overrides here
7#define RGBLIGHT_ANIMATIONS 4#define RGBLIGHT_ANIMATIONS
8#define RGBLIGHT_EFFECT_SNAKE_LENGTH 3 5#define RGBLIGHT_EFFECT_SNAKE_LENGTH 3
9#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2 6#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
10#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 2 7#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 2
11
12#endif
diff --git a/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c b/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
index 15cf5325d..92d39aef5 100644
--- a/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
+++ b/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
@@ -1,12 +1,12 @@
1#include "card.h" 1#include QMK_KEYBOARD_H
2 2
3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4 [0] = KEYMAP( 4 [0] = LAYOUT(
5 RGB_TOG, RGB_SAI, RGB_VAI, \ 5 RGB_TOG, RGB_SAI, RGB_VAI, \
6 RGB_HUD, RGB_HUI, \ 6 RGB_HUD, RGB_HUI, \
7 RGB_MOD, RGB_SAD, RGB_VAD, \ 7 RGB_MOD, RGB_SAD, RGB_VAD, \
8 BL_STEP, \ 8 BL_STEP, \
9 KC_NO, KC_NO, KC_NO \ 9 KC_NO, KC_NO, KC_NO \
10 ) 10 )
11}; 11};
12 12
diff --git a/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk b/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk
index 1418ba1bf..54d74abbe 100644
--- a/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk
+++ b/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk
@@ -3,16 +3,15 @@
3# the appropriate keymap folder that will get included automatically 3# the appropriate keymap folder that will get included automatically
4# 4#
5BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) 5BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
6MOUSEKEY_ENABLE = no # Mouse keys(+4700) 6MOUSEKEY_ENABLE = no # Mouse keys(+4700)
7EXTRAKEY_ENABLE = no # Audio control and System control(+450) 7EXTRAKEY_ENABLE = no # Audio control and System control(+450)
8CONSOLE_ENABLE = yes # Console for debug(+400) 8CONSOLE_ENABLE = yes # Console for debug(+400)
9COMMAND_ENABLE = yes # Commands for debug and configuration 9COMMAND_ENABLE = yes # Commands for debug and configuration
10NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 10NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
11BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality 11BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
12MIDI_ENABLE = no # MIDI controls 12MIDI_ENABLE = no # MIDI controls
13AUDIO_ENABLE = no # Audio output on port C6 13AUDIO_ENABLE = no # Audio output on port C6
14UNICODE_ENABLE = no # Unicode 14UNICODE_ENABLE = no # Unicode
15BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 15BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
16RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. 16RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
17SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 17SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
18
diff --git a/keyboards/clueboard/card/readme.md b/keyboards/clueboard/card/readme.md
index 00d7d285b..20272d236 100644
--- a/keyboards/clueboard/card/readme.md
+++ b/keyboards/clueboard/card/readme.md
@@ -1,5 +1,7 @@
1# Cluecard 1# Cluecard
2 2
3![Cluecard](https://i.imgur.com/dTu0Pzx.jpg)
4
3A simple QMK dev kit. 5A simple QMK dev kit.
4 6
5* Keyboard Maintainer: [Zach White](https://github.com/skullydazed) 7* Keyboard Maintainer: [Zach White](https://github.com/skullydazed)
@@ -10,4 +12,4 @@ Make example for this keyboard (after setting up your build environment):
10 12
11 make clueboard/card:default 13 make clueboard/card:default
12 14
13See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. 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/clueboard/card/rules.mk b/keyboards/clueboard/card/rules.mk
index 2117c8127..37b439e75 100644
--- a/keyboards/clueboard/card/rules.mk
+++ b/keyboards/clueboard/card/rules.mk
@@ -1,70 +1,21 @@
1
2
3# MCU name
4#MCU = at90usb1287
5MCU = atmega32u4 1MCU = atmega32u4
6
7# Processor frequency.
8# This will define a symbol, F_CPU, in all source code files equal to the
9# processor frequency in Hz. You can then use this symbol in your source code to
10# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
11# automatically to create a 32-bit value in your source code.
12#
13# This will be an integer division of F_USB below, as it is sourced by
14# F_USB after it has run through any CPU prescalers. Note that this value
15# does not *change* the processor frequency - it should merely be updated to
16# reflect the processor speed set externally so that the code can use accurate
17# software delays.
18F_CPU = 16000000 2F_CPU = 16000000
19
20
21#
22# LUFA specific
23#
24# Target architecture (see library "Board Types" documentation).
25ARCH = AVR8 3ARCH = AVR8
26
27# Input clock frequency.
28# This will define a symbol, F_USB, in all source code files equal to the
29# input clock frequency (before any prescaling is performed) in Hz. This value may
30# differ from F_CPU if prescaling is used on the latter, and is required as the
31# raw input clock is fed directly to the PLL sections of the AVR for high speed
32# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
33# at the end, this will be done automatically to create a 32-bit value in your
34# source code.
35#
36# If no clock division is performed on the input clock inside the AVR (via the
37# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
38F_USB = $(F_CPU) 4F_USB = $(F_CPU)
39
40# Interrupt driven control endpoint task(+60)
41OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT 5OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
42
43
44# Boot Section Size in *bytes*
45# Teensy halfKay 512
46# Teensy++ halfKay 1024
47# Atmel DFU loader 4096
48# LUFA bootloader 4096
49# USBaspLoader 2048
50OPT_DEFS += -DBOOTLOADER_SIZE=4096 6OPT_DEFS += -DBOOTLOADER_SIZE=4096
51 7
52 8
53# Build Options 9# Build Options
54# change yes to no to disable
55#
56BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) 10BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
57MOUSEKEY_ENABLE = yes # Mouse keys(+4700) 11MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
58EXTRAKEY_ENABLE = yes # Audio control and System control(+450) 12EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
59CONSOLE_ENABLE = yes # Console for debug(+400) 13CONSOLE_ENABLE = yes # Console for debug(+400)
60COMMAND_ENABLE = yes # Commands for debug and configuration 14COMMAND_ENABLE = yes # Commands for debug and configuration
61# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 15NKRO_ENABLE = no # USB Nkey Rollover
62SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 16RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality (+4870)
63# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 17BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality by default
64NKRO_ENABLE = no # USB Nkey Rollover 18MIDI_ENABLE = no # MIDI controls
65RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality (+4870) 19UNICODE_ENABLE = no # Unicode
66BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality by default 20BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
67MIDI_ENABLE = no # MIDI controls 21AUDIO_ENABLE = yes # Audio output on port C6
68UNICODE_ENABLE = no # Unicode
69BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
70AUDIO_ENABLE = yes # Audio output on port C6
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-18 16:55:03 +0000