summaryrefslogtreecommitdiffstats
path: root/keyboards/clueboard/17
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/clueboard/17')
-rw-r--r--keyboards/clueboard/17/17.c9
-rw-r--r--keyboards/clueboard/17/17.h23
-rw-r--r--keyboards/clueboard/17/info.json31
-rw-r--r--keyboards/clueboard/17/keymaps/default/keymap.c43
-rw-r--r--keyboards/clueboard/17/readme.md4
-rw-r--r--keyboards/clueboard/17/rules.mk25
6 files changed, 74 insertions, 61 deletions
diff --git a/keyboards/clueboard/17/17.c b/keyboards/clueboard/17/17.c
index f84e3253e9..627aa236dd 100644
--- a/keyboards/clueboard/17/17.c
+++ b/keyboards/clueboard/17/17.c
@@ -12,13 +12,11 @@ void matrix_init_kb(void) {
MCUCR |= (1<<JTD);
};
-void led_set_kb(uint8_t usb_led)
-{
+void led_set_kb(uint8_t usb_led) {
print("led_set\n");
}
-void backlight_init_ports(void)
-{
+void backlight_init_ports(void) {
// Set C7 to output
DDRC |= (1<<7);
@@ -29,8 +27,7 @@ void backlight_init_ports(void)
TCCR4B = 0b00000001;
}
-void backlight_set(uint8_t level)
-{
+void backlight_set(uint8_t level) {
// Determine the PWM level
switch (level)
{
diff --git a/keyboards/clueboard/17/17.h b/keyboards/clueboard/17/17.h
index 5e4a5999e2..af3be4f5a9 100644
--- a/keyboards/clueboard/17/17.h
+++ b/keyboards/clueboard/17/17.h
@@ -19,18 +19,21 @@
*/
// The first section contains all of the arguments
// The second converts the arguments into a two-dimensional array
-#define KEYMAP( \
+#define LAYOUT_numpad_5x4( \
k00, k01, k02, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, \
- k30, k31, k32, k33, \
- k40, k42 \
+ k10, k11, k12, \
+ k20, k21, k22, k13, \
+ k30, k31, k32, \
+ k40, k42, k33 \
) { \
- { k00, k01, k02, k03, }, \
- { k10, k11, k12, k13, }, \
- { k20, k21, k22, KC_NO, }, \
- { k30, k31, k32, k33, }, \
- { k40, KC_NO, k42, KC_NO } \
+ { k00, k01, k02, k03 }, \
+ { k10, k11, k12, k13 }, \
+ { k20, k21, k22, KC_NO }, \
+ { k30, k31, k32, k33 }, \
+ { k40, KC_NO, k42, KC_NO } \
}
+#define LAYOUT LAYOUT_numpad_5x4
+#define KEYMAP LAYOUT_numpad_5x4
+
#endif
diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json
new file mode 100644
index 0000000000..12338ae1d3
--- /dev/null
+++ b/keyboards/clueboard/17/info.json
@@ -0,0 +1,31 @@
+{
+ "keyboard_name": "Clueboard 17% (Cluepad)",
+ "keyboard_folder": "clueboard/17",
+ "url": "",
+ "maintainer": "qmk",
+ "width": 4,
+ "height": 5,
+ "layouts": {
+ "LAYOUT_numpad_5x4": {
+ "layout": [
+ {"label":"Num Lock", "x":0, "y":0},
+ {"label":"/", "x":1, "y":0},
+ {"label":"*", "x":2, "y":0},
+ {"label":"-", "x":3, "y":0},
+ {"label":"7", "x":0, "y":1},
+ {"label":"8", "x":1, "y":1},
+ {"label":"9", "x":2, "y":1},
+ {"label":"4", "x":0, "y":2},
+ {"label":"5", "x":1, "y":2},
+ {"label":"6", "x":2, "y":2},
+ {"label":"+", "x":3, "y":1, "h":2},
+ {"label":"1", "x":0, "y":3},
+ {"label":"2", "x":1, "y":3},
+ {"label":"3", "x":2, "y":3},
+ {"label":"0", "x":0, "y":4, "w":2},
+ {"label":".", "x":2, "y":4},
+ {"label":"Enter", "x":3, "y":3, "h":2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/clueboard/17/keymaps/default/keymap.c b/keyboards/clueboard/17/keymaps/default/keymap.c
index e8f3525a86..65c64e43c4 100644
--- a/keyboards/clueboard/17/keymaps/default/keymap.c
+++ b/keyboards/clueboard/17/keymaps/default/keymap.c
@@ -1,6 +1,4 @@
-#include "17.h"
-
-#include "backlight.h"
+#include QMK_KEYBOARD_H
// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -8,7 +6,6 @@
// entirely and just use numbers.
#define _BL 0
#define _FL 1
-#define _RS 2
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap _BL: (Base Layer) Default Layer
@@ -24,12 +21,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | 0| .| Ent|
* '-------------------'
*/
-[_BL] = KEYMAP(
- LT(_FL, KC_NLCK), KC_PSLS, KC_PAST, KC_PMNS, \
- KC_P7, KC_P8, KC_P9, KC_PPLS, \
- KC_P4, KC_P5, KC_P6, \
- KC_P1, KC_P2, KC_P3, KC_PENT, \
- KC_P0, KC_PDOT),
+ [_BL] = LAYOUT_numpad_5x4(
+ LT(_FL, KC_NLCK), KC_PSLS, KC_PAST, KC_PMNS, \
+ KC_P7, KC_P8, KC_P9, \
+ KC_P4, KC_P5, KC_P6, KC_PPLS, \
+ KC_P1, KC_P2, KC_P3, \
+ KC_P0, KC_PDOT, KC_PENT \
+ ),
/* Keymap _FL: Function Layer
* .-------------------.
@@ -44,22 +42,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | Fn1| | Fn7|
* '-------------------'
*/
-[_FL] = KEYMAP(
- LT(_FL, KC_NLCK), KC_TRNS, KC_TRNS, RGB_TOG, \
- KC_TRNS, RGB_SAI, KC_TRNS, RGB_VAI, \
- RGB_HUD, BL_STEP, RGB_HUI, \
- KC_TRNS, RGB_SAD, KC_TRNS, RGB_VAD, \
- RGB_MOD, KC_TRNS)
-};
-
-/*enum function_id {
-};*/
-
-const uint16_t PROGMEM fn_actions[] = {
+ [_FL] = LAYOUT_numpad_5x4(
+ LT(_FL, KC_NLCK), _______, _______, RGB_TOG, \
+ _______, RGB_SAI, _______, \
+ RGB_HUD, BL_STEP, RGB_HUI, RGB_VAI, \
+ _______, RGB_SAD, _______, \
+ RGB_MOD, _______, RGB_VAD \
+ )
};
-
-void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
- switch (id) {
- }
-}
-
diff --git a/keyboards/clueboard/17/readme.md b/keyboards/clueboard/17/readme.md
index 877adc7842..c183657f96 100644
--- a/keyboards/clueboard/17/readme.md
+++ b/keyboards/clueboard/17/readme.md
@@ -1,6 +1,6 @@
# Clueboard 17% (Formerly Cluepad)
-![Clueboard 17%](https://static1.squarespace.com/static/55c13bdee4b099be5dcb82eb/5842fbdce3df28eae5ec557e/5844fb2cb8a79bbdfd63bad1/1498501250178/IMGP3931.jpg?format=750w)
+![Clueboard 17%](https://i.imgur.com/3XBC5c0.jpg)
A basic 17 key numpad PCB.
@@ -13,4 +13,4 @@ Make example for this keyboard (after setting up your build environment):
make clueboard/17:default
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
+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).
diff --git a/keyboards/clueboard/17/rules.mk b/keyboards/clueboard/17/rules.mk
index 264aba044d..591d40f030 100644
--- a/keyboards/clueboard/17/rules.mk
+++ b/keyboards/clueboard/17/rules.mk
@@ -1,6 +1,4 @@
-
# MCU name
-#MCU = at90usb1287
MCU = atmega32u4
# Processor frequency.
@@ -50,16 +48,13 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
-# comment out to disable the options.
-#
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
-# MOUSEKEY_ENABLE = yes # 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
-NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes # Enable numpad's backlight functionality
-RGBLIGHT_ENABLE = yes
-# MIDI_ENABLE = YES # MIDI controls
-# UNICODE_ENABLE = YES # Unicode
-# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID \ No newline at end of file
+BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
+CONSOLE_ENABLE = yes # Console for debug(+400)
+COMMAND_ENABLE = no # Commands for debug and configuration
+NKRO_ENABLE = yes # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
+MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
+UNICODE_ENABLE = no # Unicode