-
-
Notifications
You must be signed in to change notification settings - Fork 40.6k
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
added mehkee96 support -JT #3957
Merged
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
#ifndef CONFIG_H | ||
#define CONFIG_H | ||
|
||
/* USB Device descriptor parameter */ | ||
johanntang marked this conversation as resolved.
Show resolved
Hide resolved
|
||
#define VENDOR_ID 0x20A0 | ||
#define PRODUCT_ID 0x422D | ||
#define MANUFACTURER mehkee | ||
#define PRODUCT 96kee | ||
|
||
/* matrix size */ | ||
#define MATRIX_ROWS 8 | ||
#define MATRIX_COLS 15 | ||
|
||
#define RGBLED_NUM 16 | ||
#define RGBLIGHT_ANIMATIONS | ||
|
||
#define NO_UART 1 | ||
#define BOOTLOADHID_BOOTLOADER 1 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This shouldn't be needed, I think. |
||
|
||
/* key combination for command */ | ||
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
/* | ||
Copyright 2016 Luiz Ribeiro <luizribeiro@gmail.com> | ||
|
||
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/>. | ||
*/ | ||
|
||
// Please do not modify this file | ||
|
||
#include <avr/io.h> | ||
#include <util/twi.h> | ||
|
||
#include "i2c.h" | ||
|
||
void i2c_set_bitrate(uint16_t bitrate_khz) { | ||
uint8_t bitrate_div = ((F_CPU / 1000l) / bitrate_khz); | ||
if (bitrate_div >= 16) { | ||
bitrate_div = (bitrate_div - 16) / 2; | ||
} | ||
TWBR = bitrate_div; | ||
} | ||
|
||
void i2c_init(void) { | ||
// set pull-up resistors on I2C bus pins | ||
PORTC |= 0b11; | ||
|
||
i2c_set_bitrate(400); | ||
|
||
// enable TWI (two-wire interface) | ||
TWCR |= (1 << TWEN); | ||
|
||
// enable TWI interrupt and slave address ACK | ||
TWCR |= (1 << TWIE); | ||
TWCR |= (1 << TWEA); | ||
} | ||
|
||
uint8_t i2c_start(uint8_t address) { | ||
// reset TWI control register | ||
TWCR = 0; | ||
|
||
// begin transmission and wait for it to end | ||
TWCR = (1<<TWINT) | (1<<TWSTA) | (1<<TWEN); | ||
while (!(TWCR & (1<<TWINT))); | ||
|
||
// check if the start condition was successfully transmitted | ||
if ((TWSR & 0xF8) != TW_START) { | ||
return 1; | ||
} | ||
|
||
// transmit address and wait | ||
TWDR = address; | ||
TWCR = (1<<TWINT) | (1<<TWEN); | ||
while (!(TWCR & (1<<TWINT))); | ||
|
||
// check if the device has acknowledged the READ / WRITE mode | ||
uint8_t twst = TW_STATUS & 0xF8; | ||
if ((twst != TW_MT_SLA_ACK) && (twst != TW_MR_SLA_ACK)) { | ||
return 1; | ||
} | ||
|
||
return 0; | ||
} | ||
|
||
void i2c_stop(void) { | ||
TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO); | ||
} | ||
|
||
uint8_t i2c_write(uint8_t data) { | ||
TWDR = data; | ||
|
||
// transmit data and wait | ||
TWCR = (1<<TWINT) | (1<<TWEN); | ||
while (!(TWCR & (1<<TWINT))); | ||
|
||
if ((TWSR & 0xF8) != TW_MT_DATA_ACK) { | ||
return 1; | ||
} | ||
|
||
return 0; | ||
} | ||
|
||
uint8_t i2c_send(uint8_t address, uint8_t *data, uint16_t length) { | ||
if (i2c_start(address)) { | ||
return 1; | ||
} | ||
|
||
for (uint16_t i = 0; i < length; i++) { | ||
if (i2c_write(data[i])) { | ||
return 1; | ||
} | ||
} | ||
|
||
i2c_stop(); | ||
|
||
return 0; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/* | ||
Copyright 2016 Luiz Ribeiro <luizribeiro@gmail.com> | ||
|
||
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/>. | ||
*/ | ||
|
||
// Please do not modify this file | ||
|
||
#ifndef __I2C_H__ | ||
#define __I2C_H__ | ||
|
||
void i2c_init(void); | ||
void i2c_set_bitrate(uint16_t bitrate_khz); | ||
uint8_t i2c_send(uint8_t address, uint8_t *data, uint16_t length); | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{ | ||
"keyboard_name": "kee96", | ||
"url": "", | ||
"maintainer": "qmk", | ||
"width": 19, | ||
"height": 6, | ||
"layouts": { | ||
"LAYOUT": { | ||
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Scroll Lock", "x":14, "y":0}, {"label":"Pause", "x":15, "y":0}, {"label":"Insert", "x":16, "y":0}, {"label":"Home", "x":17, "y":0}, {"label":"PgUp", "x":18, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"label":"Num Lock", "x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"-", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"+", "x":18, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"x":18, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Enter", "x":18, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Win", "x":11, "y":5}, {"x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}, {"label":"0", "x":16, "y":5}, {"label":".", "x":17, "y":5}, {"x":18, "y":5}] | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
#include "mehkee96.h" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you replace this include with |
||
|
||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
|
||
/* Layer 0, default layer | ||
____________________________________________________________________________________________________________________________________________________________________________ | ||
| | | | | | | | | | | | | | | | | | | | | ||
| ESC* | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | P SCN | DEL | HOME | END | P Up | P Down | | ||
|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________| | ||
| | | | | | | | | | | | | | | BACK | NUM | | | | | ||
| ~` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | _ - | = + | \ | SPACE | LOCK | / | * | - | | ||
|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________| | ||
| | | | | | | | | | | | [ | ] | | | | | | | ||
| TAB | Q | W | E | R | T | Y | U | I | O | P | { | } | | \ | 7 | 8 | 9 | + | | ||
|____________|________|________|________|________|________|________|________|________|________|________|________|________|_____________|________|________|________|________| | ||
| | | | | | | | | | | ; | ' | | | | | | | ||
| CAPS LOCK | A | S | D | F | G | H | J | K | L | : | " | ENTER | 4 | 5 | 6 | + | | ||
|______________|________|________|________|________|________|________|________|________|________|________|________|____________________|________|________|________|________| | ||
| | | | | | | | | , | . | / | | | | | | | | ||
| SHIFT | Z | X | C | V | B | N | M | < | > | ? | SHIFT | UP | 1 | 2 | 3 | ENTER | | ||
|__________________|________|________|________|________|________|________|________|________|________|________|________________|________|________|________|________|________| | ||
| | | | | | | MO | | | | | | | | ||
| CTRL | LGUI | L ALT | SPACE | R ALT | RGUI | _FN | LEFT | DOWN | RIGHT | 0 | . | ENTER | | ||
|__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________| | ||
*/ | ||
|
||
|
||
|
||
LAYOUT( | ||
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, KC_HOME, KC_END, KC_PGUP, KC_PGDN, | ||
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, | ||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS, | ||
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, | ||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, | ||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT), | ||
|
||
|
||
|
||
/* Layer 1, function layer | ||
____________________________________________________________________________________________________________________________________________________________________________ | ||
| | | | | | | | | | | | | | | VOL | VOL | | | | | ||
| RESET | | | | | | | | | | | | | MUTE | DOWN | UP | | | | | ||
|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________| | ||
| | | | | | | | | | | | | | | | | | | | | ||
| | | | | | | | | | | | | | | | | | | | | ||
|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________| | ||
| | RGB | | RGB | HUE | HUE | SATUR. | SATUR. | VALUE | VALUE | | | | | | | | | | ||
| | TOGGLE | | MODE |INCREASE| DCRSE |INCREASE| DCRSE |INCREASE| DCRSE | | | | | | | | | | ||
|____________|________|________|________|________|________|________|________|________|________|________|________|________|_____________|________|________|________|________| | ||
| BACKLIGHT | | | | | | | | | | | | | | | | | | ||
| TOGGLE | | | | | | | | | | | | | | | | | | ||
|______________|________|________|________|________|________|________|________|________|________|________|________|____________________|________|________|________|________| | ||
| | | | |BACKLHT |BACKLHT |BACKLHT | | | | | | | | | | | | | ||
| | | | | DCRSE |TOGGLE |INCREASE| | | | | | | | | | | | | ||
|_________|________|________|________|________|________|________|________|________|________|________|________|________________|________|________|________|________|________| | ||
| | | | | | | | | | | | | | | ||
| | | | | | | | | | | | | | | ||
|__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________| | ||
BL_TOGG, BL_DEC, BL_INC changes the in-switch LEDs | ||
*/ | ||
|
||
|
||
LAYOUT( | ||
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, | ||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
_______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, | ||
BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
_______ , _______, _______, BL_DEC, BL_TOGG, BL_INC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), | ||
}; | ||
|
||
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
return MACRO_NONE; | ||
} | ||
|
||
void matrix_init_user(void) { | ||
} | ||
|
||
void matrix_scan_user(void) { | ||
} | ||
|
||
bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
return true; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you could replace the include guard (the ifndef, define, and endif at the end) with just
#pragma once
?It's simpler, and less prone to user error, so if you could make this switch?