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

Eek! keyboard firmware merge into QMK #11020

Merged
merged 54 commits into from
Dec 7, 2020
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
48de68f
create eek
Klackygears Nov 24, 2020
2f63e84
removing old commentsfor old layouts, updating json
Klackygears Nov 24, 2020
08ba2a3
updating readme, config, and rules
Klackygears Nov 24, 2020
599f89e
updating to match formatting
Klackygears Nov 24, 2020
1426113
updating eek! readme
Klackygears Nov 25, 2020
a50980d
Update keyboards/eek/config.h
Klackygears Nov 25, 2020
cabf80c
Update keyboards/eek/eek.c
Klackygears Nov 25, 2020
9f10231
Update keyboards/eek/rules.mk
Klackygears Nov 25, 2020
6074e73
Update keyboards/eek/rules.mk
Klackygears Nov 25, 2020
dccc266
Update keyboards/eek/keymaps/ledtest/rules.mk
Klackygears Nov 25, 2020
60c93e4
removed unneeded files
Klackygears Nov 25, 2020
3513b7b
Merge branch 'eek_qmk' of https://github.com/Klackygears/qmk_firmware…
Klackygears Nov 25, 2020
ab71af0
correcting the ledtest keymap
Klackygears Nov 25, 2020
ed724ad
Update keyboards/eek/keymaps/ledtest/keymap.c
Klackygears Nov 25, 2020
06cbd97
Update keyboards/eek/eek.h
Klackygears Nov 25, 2020
c18b2d7
update keymaps for LAYOUT_split_3x5_3
Klackygears Nov 25, 2020
b505b58
Update keyboards/eek/info.json
Klackygears Nov 26, 2020
5463fb3
Apply suggestions from code review
Klackygears Nov 26, 2020
f702f6e
Apply suggestions from code review
Klackygears Nov 26, 2020
022e241
updating json to non-rotated eek
Klackygears Nov 26, 2020
05e3c54
Merge branch 'eek_qmk' of https://github.com/Klackygears/qmk_firmware…
Klackygears Nov 26, 2020
5f51679
starting to split things out
Klackygears Nov 26, 2020
f0fd2f4
splitting config.h
Klackygears Nov 26, 2020
f2f342f
minor change
Klackygears Nov 26, 2020
d3b98c3
correct Row pins
Klackygears Nov 26, 2020
48aa8c0
correct outdated row pins
Klackygears Nov 26, 2020
f1eb719
Getting this to work
Klackygears Nov 26, 2020
310bfd1
Update keyboards/eek/info.json
Klackygears Nov 27, 2020
fcb2a4d
Update keyboards/eek/config.h
Klackygears Nov 27, 2020
992061c
Update keyboards/eek/keymaps/ledtest/rules.mk
Klackygears Nov 27, 2020
16d2681
fixed typo
Klackygears Nov 27, 2020
c468f7e
Update keyboards/eek/rules.mk
Klackygears Nov 27, 2020
8087dcc
cleaning things up
Klackygears Nov 27, 2020
7085aab
Merge branch 'eek_qmk_subfolders' into eek_qmk
Klackygears Nov 27, 2020
534320b
update readme
Klackygears Nov 27, 2020
b5590a8
Apply suggestions from code review
Klackygears Nov 27, 2020
406aa05
removing extra keymap files
Klackygears Nov 27, 2020
b1a9420
editing readme
Klackygears Nov 27, 2020
4b9637d
Update keyboards/eek/info.json
Klackygears Nov 27, 2020
c666007
Apply suggestions from code review
Klackygears Nov 28, 2020
1a177d0
correcting some rgb matrix issues
Klackygears Nov 30, 2020
b728595
Merge branch 'eek_qmk' of https://github.com/Klackygears/qmk_firmware…
Klackygears Nov 30, 2020
39c709b
correcting the rgbmatrix layout
Klackygears Nov 30, 2020
beca077
updating rgbtest keymap comments and rules.mk
Klackygears Nov 30, 2020
cbd1f77
updated github documentation site
Klackygears Nov 30, 2020
8708e7c
Merge pull request #42 from qmk/master
Klackygears Dec 2, 2020
aae79ac
Merge branch 'master' into eek_qmk
Klackygears Dec 2, 2020
fb07dca
applying suggested changes
Klackygears Dec 2, 2020
14daca0
Apply suggestions from code review
Klackygears Dec 4, 2020
1826f44
removed extra defines
Klackygears Dec 4, 2020
9ff53dc
adding readme back
Klackygears Dec 4, 2020
6985244
Update keyboards/eek/readme.md
Klackygears Dec 7, 2020
52138df
correcting silk_up.h
Klackygears Dec 7, 2020
9053293
updating / correcting layer change keys in keymap
Klackygears Dec 7, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
197 changes: 197 additions & 0 deletions keyboards/eek/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
/*
Copyright 2020 klackygears

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"

/* USB Device descriptor parameter */
#define VENDOR_ID 0x4A53
#define PRODUCT_ID 0x0002
#define DEVICE_VER 0x0004
#define MANUFACTURER klackygears
#define PRODUCT eek!
//#define DESCRIPTION A portable 36 key split layout keyboard
Klackygears marked this conversation as resolved.
Show resolved Hide resolved

/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 10

#define MATRIX_ROW_PINS { E6, B4, B5, B6 }
#if FLIPPED
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, C6, D4 }
#else
#define MATRIX_COL_PINS { D4, C6, B6, B2, B3, B1, F7, F6, F5, F4 }
#endif

#define UNUSED_PINS { D2, D1, D0 }
#define DIODE_DIRECTION COL2ROW


#define RGB_DI_PIN B3
#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 4
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
/*== all animations enable ==*/
#define RGBLIGHT_ANIMATIONS
// /*== or choose animations ==*/
// #define RGBLIGHT_EFFECT_BREATHING
// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
// #define RGBLIGHT_EFFECT_SNAKE
// #define RGBLIGHT_EFFECT_KNIGHT
// #define RGBLIGHT_EFFECT_CHRISTMAS
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
// /*== customize breathing effect ==*/
// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64
// /*==== use exp() and sin() ====*/
// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7
// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255
#endif

#ifdef RGB_MATRIX_ENABLE
#define DRIVER_LED_TOTAL 36
#define RGB_MATRIX_LED_FLUSH_LIMIT 16
#define RGB_MATRIX_STARTUP_VAL 150
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#endif

#ifdef AUDIO_ENABLE
#define B0_AUDIO
#endif

Klackygears marked this conversation as resolved.
Show resolved Hide resolved
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5

/* define if matrix has ghost (lacks anti-ghosting diodes) */
//#define MATRIX_HAS_GHOST

/* number of backlight levels */

Klackygears marked this conversation as resolved.
Show resolved Hide resolved
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
* This is userful for the Windows task manager shortcut (ctrl+shift+esc).
*/
// #define GRAVE_ESC_CTRL_OVERRIDE

/*
* Force NKRO
*
* Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
* state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
* makefile for this to work.)
*
* If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
* until the next keyboard reset.
*
* NKRO may prevent your keystrokes from being detected in the BIOS, but it is
* fully operational during normal computer usage.
*
* For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
* or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
* bootmagic, NKRO mode will always be enabled until it is toggled again during a
* power-up.
*
*/
//#define FORCE_NKRO

/*
* Magic Key Options
*
* Magic keys are hotkey commands that allow control over firmware functions of
* the keyboard. They are best used in combination with the HID Listen program,
* found here: https://www.pjrc.com/teensy/hid_listen.html
*
* The options below allow the magic key functionality to be changed. This is
* useful if your keyboard/keypad is missing keys and you want magic key support.
*
*/

/* key combination for magic key command */
/* defined by default; to change, uncomment and set to the combination you want */
// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))

/* control how magic key switches layers */
//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true
//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false

/* override magic key keymap */
//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
//#define MAGIC_KEY_HELP H
//#define MAGIC_KEY_HELP_ALT SLASH
//#define MAGIC_KEY_DEBUG D
//#define MAGIC_KEY_DEBUG_MATRIX X
//#define MAGIC_KEY_DEBUG_KBD K
//#define MAGIC_KEY_DEBUG_MOUSE M
//#define MAGIC_KEY_VERSION V
//#define MAGIC_KEY_STATUS S
//#define MAGIC_KEY_CONSOLE C
//#define MAGIC_KEY_LAYER0 0
//#define MAGIC_KEY_LAYER0_ALT GRAVE
//#define MAGIC_KEY_LAYER1 1
//#define MAGIC_KEY_LAYER2 2
//#define MAGIC_KEY_LAYER3 3
//#define MAGIC_KEY_LAYER4 4
//#define MAGIC_KEY_LAYER5 5
//#define MAGIC_KEY_LAYER6 6
//#define MAGIC_KEY_LAYER7 7
//#define MAGIC_KEY_LAYER8 8
//#define MAGIC_KEY_LAYER9 9
//#define MAGIC_KEY_BOOTLOADER B
//#define MAGIC_KEY_BOOTLOADER_ALT ESC
//#define MAGIC_KEY_LOCK CAPS
//#define MAGIC_KEY_EEPROM E
//#define MAGIC_KEY_EEPROM_CLEAR BSPACE
//#define MAGIC_KEY_NKRO N
//#define MAGIC_KEY_SLEEP_LED Z

Klackygears marked this conversation as resolved.
Show resolved Hide resolved
/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/

/* disable debug print */
//#define NO_DEBUG

/* disable print */
//#define NO_PRINT

/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION


/* Bootmagic Lite key configuration */
// #define BOOTMAGIC_LITE_ROW 0
// #define BOOTMAGIC_LITE_COLUMN 0
101 changes: 101 additions & 0 deletions keyboards/eek/eek.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
/* Copyright 2020 klackygears
*
* 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/>.
*/
#include "eek.h"

// Optional override functions below.
// You can leave any or all of these undefined.
// These are only required if you want to perform custom actions.




Klackygears marked this conversation as resolved.
Show resolved Hide resolved
#ifdef RGB_MATRIX_ENABLE

// Logical Layout
// Columns
// 0 1 2 3 4
// ROWS
// 4 3 2 1 0 0
// 5 6 7 8 9 1
// 14 13 12 11 10 2
// 15 16 17 3

// Logical Layout v1.3
// Columns
// 0 1 2 3 4 5 6 7 8 9
// ROWS
// 0 1 2 3 4 5 6 7 8 9 0
// 19 18 17 16 15 14 13 12 11 10 1
// 20 21 22 23 24 25 26 27 28 29 2
// 35 34 33 32 31 30 3


led_config_t g_led_config = { {
{ 4, 3, 2, 1, 0, 0, 1, 2, 3, 4 },
{ 5, 6, 7, 8, 9, 9, 8, 7, 6, 5 },
{ 14, 13, 12, 11, 10, 10, 11, 12, 13, 14 },
{ NO_LED, NO_LED, 15, 16, 17, 17, 16, 15, NO_LED, NO_LED }
}, {
{ 93, 13 }, { 77, 7 }, { 62, 0 }, { 46, 0 }, { 31, 0 },
{ 85, 24 }, { 70, 17 }, { 54, 10 }, { 39, 10 }, { 23, 10 },
{ 77, 34 }, { 62, 27 }, { 46, 20 }, { 31, 20 }, { 15, 20 },
{ 39, 34 }, { 54, 37 }, { 70, 44 },
{ 131, 13 }, { 147, 7 }, { 162, 0 }, { 178, 0 }, { 193, 0 },
{ 201, 10 }, { 185, 10 }, { 170, 10 }, { 154, 17 }, { 139, 24 },
{ 147, 34 }, { 162, 27 }, { 178, 20 }, { 193, 20 }, { 209, 20 },
{ 185, 34 }, { 170, 37 }, { 154, 44 },
}, {
4, 4, 4, 4, 4,
4, 4, 4, 4, 4,
4, 4, 4, 4, 4,
1, 1, 1, 4, 4,
4, 4, 4, 4, 4,
4, 4, 4, 4, 4,
4, 4, 4, 1, 1,
1,
} };
#endif

/*

void matrix_init_kb(void) {
// put your keyboard start-up code here
// runs once when the firmware starts up

matrix_init_user();
}

void matrix_scan_kb(void) {
// put your looping keyboard code here
// runs every cycle (a lot)

matrix_scan_user();
}

bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
// put your per-action keyboard code here
// runs for every action, just before processing by the firmware

return process_record_user(keycode, record);
}

void led_set_kb(uint8_t usb_led) {
// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here

led_set_user(usb_led);
}

*/
Klackygears marked this conversation as resolved.
Show resolved Hide resolved
39 changes: 39 additions & 0 deletions keyboards/eek/eek.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/* Copyright 2020 klackygears
*
* 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"

/* This a shortcut to help you visually see your layout.
*
* The first section contains all of the arguments representing the physical
* layout of the board and position of the keys.
*
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/
#define LAYOUT( \
Klackygears marked this conversation as resolved.
Show resolved Hide resolved
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
K32, K33, K34, K35, K36, K37 \
) \
{ \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
{ KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \
}
13 changes: 13 additions & 0 deletions keyboards/eek/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
fauxpark marked this conversation as resolved.
Show resolved Hide resolved
"keyboard_name": "eek!",
"url": "http://www.keyboard-layout-editor.com/#/gists/3e4d0cd1534dd4e4b9f25cf2b36d0d63",
"maintainer": "klackygears",
"width": 13,
"height": 6.25,
"layouts": {
"LAYOUT": {
Klackygears marked this conversation as resolved.
Show resolved Hide resolved
"layout": [{"label":"E", "x":0.5, "y":0.75}, {"label":"W", "x":-0.5, "y":1.1300000000000001}, {"label":"R", "x":1.5, "y":1.1300000000000001}, {"label":"T", "x":2.5, "y":1.25}, {"label":"Q", "x":-1.5, "y":1.6300000000000001}, {"label":"D", "x":0.5, "y":1.75}, {"label":"S", "x":-0.5, "y":2.13}, {"label":"F", "x":1.5, "y":2.13}, {"label":"G", "x":2.5, "y":2.25}, {"label":"A", "x":-1.5, "y":2.63}, {"label":"C", "x":0.5, "y":2.75}, {"label":"X", "x":-0.5, "y":3.13}, {"label":"V", "x":1.5, "y":3.13}, {"label":"B", "x":2.5, "y":3.25}, {"label":"Z", "x":-1.5, "y":3.63}, {"label":"Ctrl", "x":0.5, "y":4}, {"label":"Lower", "x":1.5, "y":4.13}, {"label":"Space", "x":2.5, "y":4.25}, {"label":"I", "x":1.15, "y":3.4}, {"label":"U", "x":0.15, "y":3.78}, {"label":"O", "x":2.15, "y":3.78}, {"label":"Y", "x":-0.85, "y":3.9}, {"label":"P", "x":3.15, "y":4.28}, {"label":"K", "x":1.15, "y":4.4}, {"label":"J", "x":0.15, "y":4.78}, {"label":"L", "x":2.15, "y":4.78}, {"label":"H", "x":-0.85, "y":4.9}, {"label":";", "x":3.15, "y":5.28}, {"label":",", "x":1.15, "y":5.4}, {"label":"M", "x":0.15, "y":5.78}, {"label":".", "x":2.15, "y":5.78}, {"label":"N", "x":-0.85, "y":5.9}, {"label":"/", "x":3.15, "y":6.28}, {"label":"Shift", "x":1.15, "y":6.65}, {"label":"Raise", "x":0.15, "y":6.78}, {"label":"BSpc", "x":-0.85, "y":6.9}]
}
}

}
Loading