-
-
Notifications
You must be signed in to change notification settings - Fork 39.8k
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
New keyboard: QWERTYYdox #3636
Merged
Merged
New keyboard: QWERTYYdox #3636
Changes from 4 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
7cd8395
Add files via upload
aydenvis 169fb53
Update readme.md
aydenvis 5445e8f
Update readme.md
aydenvis 3debe09
Update readme.md
aydenvis e8ca9a7
Add files via upload
aydenvis fe091e1
Delete split_util.h
aydenvis e759398
Delete split_util.c
aydenvis 87a4532
Delete serial.h
aydenvis 1f130c2
Delete serial.c
aydenvis 924e6c7
Delete matrix.c
aydenvis d9f365c
Delete i2c.h
aydenvis 59bf0de
Delete i2c.c
aydenvis 7535812
Update rules.mk
aydenvis fcff794
Merge pull request #1 from aydenvis/qwertyydox
aydenvis b8d3502
Update config.h
aydenvis fceb148
Update readme.md
aydenvis cb8715d
Update readme.md
aydenvis 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,90 @@ | ||
/* | ||
Copyright 2018 Ayden <aydenvis@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/>. | ||
*/ | ||
|
||
#ifndef REV1_CONFIG_H | ||
#define REV1_CONFIG_H | ||
|
||
#include QMK_KEYBOARD_CONFIG_H | ||
|
||
/* USB Device descriptor parameter */ | ||
#define VENDOR_ID 0xCEEB | ||
#define PRODUCT_ID 0x1256 | ||
#define DEVICE_VER 0x0100 | ||
#define MANUFACTURER AYDENandDAD Youtube | ||
#define PRODUCT QWERTYYdox | ||
#define DESCRIPTION Split 45 percent ergonomic keyboard with two Y keys | ||
|
||
/* key matrix size */ | ||
// Rows are doubled-up | ||
#define MATRIX_ROWS 8 | ||
#define MATRIX_COLS 7 | ||
|
||
// wiring of each half | ||
#define MATRIX_ROW_PINS { B6, B2, B3, B1 } | ||
#define MATRIX_COL_PINS { F7, F6, F5, C6, D7, D4, D1 } | ||
|
||
/* COL2ROW or ROW2COL */ | ||
#define DIODE_DIRECTION COL2ROW | ||
|
||
/* define if matrix has ghost */ | ||
//#define MATRIX_HAS_GHOST | ||
|
||
/* number of backlight levels */ | ||
// #define BACKLIGHT_LEVELS 3 | ||
|
||
/* Set 0 if debouncing isn't needed */ | ||
#define DEBOUNCING_DELAY 5 | ||
|
||
/* 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 | ||
|
||
/* key combination for command */ | ||
#define IS_COMMAND() ( \ | ||
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ | ||
) | ||
|
||
#define BACKLIGHT_PIN E6 | ||
#define BACKLIGHT_LEVELS 5 | ||
|
||
/* ws2812 RGB LED */ | ||
#define RGB_DI_PIN D6 | ||
#define RGBLIGHT_TIMER | ||
#define RGBLED_NUM 12 // Number of LEDs | ||
#define ws2812_PORTREG PORTD | ||
#define ws2812_DDRREG DDRD | ||
|
||
/* | ||
* 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 | ||
|
||
#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,162 @@ | ||
#include <util/twi.h> | ||
#include <avr/io.h> | ||
#include <stdlib.h> | ||
#include <avr/interrupt.h> | ||
#include <util/twi.h> | ||
#include <stdbool.h> | ||
#include "i2c.h" | ||
|
||
#ifdef USE_I2C | ||
|
||
// Limits the amount of we wait for any one i2c transaction. | ||
// Since were running SCL line 100kHz (=> 10μs/bit), and each transactions is | ||
// 9 bits, a single transaction will take around 90μs to complete. | ||
// | ||
// (F_CPU/SCL_CLOCK) => # of μC cycles to transfer a bit | ||
// poll loop takes at least 8 clock cycles to execute | ||
#define I2C_LOOP_TIMEOUT (9+1)*(F_CPU/SCL_CLOCK)/8 | ||
|
||
#define BUFFER_POS_INC() (slave_buffer_pos = (slave_buffer_pos+1)%SLAVE_BUFFER_SIZE) | ||
|
||
volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE]; | ||
|
||
static volatile uint8_t slave_buffer_pos; | ||
static volatile bool slave_has_register_set = false; | ||
|
||
// Wait for an i2c operation to finish | ||
inline static | ||
void i2c_delay(void) { | ||
uint16_t lim = 0; | ||
while(!(TWCR & (1<<TWINT)) && lim < I2C_LOOP_TIMEOUT) | ||
lim++; | ||
|
||
// easier way, but will wait slightly longer | ||
// _delay_us(100); | ||
} | ||
|
||
// Setup twi to run at 100kHz | ||
void i2c_master_init(void) { | ||
// no prescaler | ||
TWSR = 0; | ||
// Set TWI clock frequency to SCL_CLOCK. Need TWBR>10. | ||
// Check datasheets for more info. | ||
TWBR = ((F_CPU/SCL_CLOCK)-16)/2; | ||
} | ||
|
||
// Start a transaction with the given i2c slave address. The direction of the | ||
// transfer is set with I2C_READ and I2C_WRITE. | ||
// returns: 0 => success | ||
// 1 => error | ||
uint8_t i2c_master_start(uint8_t address) { | ||
TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTA); | ||
|
||
i2c_delay(); | ||
|
||
// check that we started successfully | ||
if ( (TW_STATUS != TW_START) && (TW_STATUS != TW_REP_START)) | ||
return 1; | ||
|
||
TWDR = address; | ||
TWCR = (1<<TWINT) | (1<<TWEN); | ||
|
||
i2c_delay(); | ||
|
||
if ( (TW_STATUS != TW_MT_SLA_ACK) && (TW_STATUS != TW_MR_SLA_ACK) ) | ||
return 1; // slave did not acknowledge | ||
else | ||
return 0; // success | ||
} | ||
|
||
|
||
// Finish the i2c transaction. | ||
void i2c_master_stop(void) { | ||
TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO); | ||
|
||
uint16_t lim = 0; | ||
while(!(TWCR & (1<<TWSTO)) && lim < I2C_LOOP_TIMEOUT) | ||
lim++; | ||
} | ||
|
||
// Write one byte to the i2c slave. | ||
// returns 0 => slave ACK | ||
// 1 => slave NACK | ||
uint8_t i2c_master_write(uint8_t data) { | ||
TWDR = data; | ||
TWCR = (1<<TWINT) | (1<<TWEN); | ||
|
||
i2c_delay(); | ||
|
||
// check if the slave acknowledged us | ||
return (TW_STATUS == TW_MT_DATA_ACK) ? 0 : 1; | ||
} | ||
|
||
// Read one byte from the i2c slave. If ack=1 the slave is acknowledged, | ||
// if ack=0 the acknowledge bit is not set. | ||
// returns: byte read from i2c device | ||
uint8_t i2c_master_read(int ack) { | ||
TWCR = (1<<TWINT) | (1<<TWEN) | (ack<<TWEA); | ||
|
||
i2c_delay(); | ||
return TWDR; | ||
} | ||
|
||
void i2c_reset_state(void) { | ||
TWCR = 0; | ||
} | ||
|
||
void i2c_slave_init(uint8_t address) { | ||
TWAR = address << 0; // slave i2c address | ||
// TWEN - twi enable | ||
// TWEA - enable address acknowledgement | ||
// TWINT - twi interrupt flag | ||
// TWIE - enable the twi interrupt | ||
TWCR = (1<<TWIE) | (1<<TWEA) | (1<<TWINT) | (1<<TWEN); | ||
} | ||
|
||
ISR(TWI_vect); | ||
|
||
ISR(TWI_vect) { | ||
uint8_t ack = 1; | ||
switch(TW_STATUS) { | ||
case TW_SR_SLA_ACK: | ||
// this device has been addressed as a slave receiver | ||
slave_has_register_set = false; | ||
break; | ||
|
||
case TW_SR_DATA_ACK: | ||
// this device has received data as a slave receiver | ||
// The first byte that we receive in this transaction sets the location | ||
// of the read/write location of the slaves memory that it exposes over | ||
// i2c. After that, bytes will be written at slave_buffer_pos, incrementing | ||
// slave_buffer_pos after each write. | ||
if(!slave_has_register_set) { | ||
slave_buffer_pos = TWDR; | ||
// don't acknowledge the master if this memory loctaion is out of bounds | ||
if ( slave_buffer_pos >= SLAVE_BUFFER_SIZE ) { | ||
ack = 0; | ||
slave_buffer_pos = 0; | ||
} | ||
slave_has_register_set = true; | ||
} else { | ||
i2c_slave_buffer[slave_buffer_pos] = TWDR; | ||
BUFFER_POS_INC(); | ||
} | ||
break; | ||
|
||
case TW_ST_SLA_ACK: | ||
case TW_ST_DATA_ACK: | ||
// master has addressed this device as a slave transmitter and is | ||
// requesting data. | ||
TWDR = i2c_slave_buffer[slave_buffer_pos]; | ||
BUFFER_POS_INC(); | ||
break; | ||
|
||
case TW_BUS_ERROR: // something went wrong, reset twi state | ||
TWCR = 0; | ||
default: | ||
break; | ||
} | ||
// Reset everything, so we are ready for the next TWI interrupt | ||
TWCR |= (1<<TWIE) | (1<<TWINT) | (ack<<TWEA) | (1<<TWEN); | ||
} | ||
#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,49 @@ | ||
#ifndef I2C_H | ||
#define I2C_H | ||
|
||
#include <stdint.h> | ||
|
||
#ifndef F_CPU | ||
#define F_CPU 16000000UL | ||
#endif | ||
|
||
#define I2C_READ 1 | ||
#define I2C_WRITE 0 | ||
|
||
#define I2C_ACK 1 | ||
#define I2C_NACK 0 | ||
|
||
#define SLAVE_BUFFER_SIZE 0x10 | ||
|
||
// i2c SCL clock frequency | ||
#define SCL_CLOCK 100000L | ||
|
||
extern volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE]; | ||
|
||
void i2c_master_init(void); | ||
uint8_t i2c_master_start(uint8_t address); | ||
void i2c_master_stop(void); | ||
uint8_t i2c_master_write(uint8_t data); | ||
uint8_t i2c_master_read(int); | ||
void i2c_reset_state(void); | ||
void i2c_slave_init(uint8_t address); | ||
|
||
|
||
static inline unsigned char i2c_start_read(unsigned char addr) { | ||
return i2c_master_start((addr << 1) | I2C_READ); | ||
} | ||
|
||
static inline unsigned char i2c_start_write(unsigned char addr) { | ||
return i2c_master_start((addr << 1) | I2C_WRITE); | ||
} | ||
|
||
// from SSD1306 scrips | ||
extern unsigned char i2c_rep_start(unsigned char addr); | ||
extern void i2c_start_wait(unsigned char addr); | ||
extern unsigned char i2c_readAck(void); | ||
extern unsigned char i2c_readNak(void); | ||
extern unsigned char i2c_read(unsigned char ack); | ||
|
||
#define i2c_read(ack) (ack) ? i2c_readAck() : i2c_readNak(); | ||
|
||
#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,16 @@ | ||
{ | ||
"keyboard_name": "QWERTYYdox", | ||
"manufacturer": "aydenvis", | ||
"identifier": "0x1256", | ||
"url": "", | ||
"maintainer": "qmk", | ||
"processor": "atmega32u4", | ||
"width": 14, | ||
"height": 4, | ||
"layouts": { | ||
"LAYOUT": { | ||
"key_count": 53, | ||
"layout": [{"label":"L00", "x":0, "y":0.375}, {"label":"L01", "x":1, "y":0.25}, {"label":"L02", "x":2, "y":0.125}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0.125}, {"label":"L05", "x":5, "y":0.25}, {"label":"L06", "x":6, "y":0.5}, {"label":"R00", "x":9, "y":0.5}, {"label":"R01", "x":10, "y":0.25}, {"label":"R02", "x":11, "y":0.125}, {"label":"R03", "x":12, "y":0}, {"label":"R04", "x":13, "y":0.125}, {"label":"R05", "x":14, "y":0.25}, {"label":"R06", "x":15, "y":0.375}, {"label":"L10", "x":0, "y":1.375}, {"label":"L11", "x":1, "y":1.25}, {"label":"L12", "x":2, "y":1.125}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1.125}, {"label":"L15", "x":5, "y":1.25}, {"label":"L16", "x":6, "y":1.5}, {"label":"R10", "x":9, "y":1.5}, {"label":"R11", "x":10, "y":1.25}, {"label":"R12", "x":11, "y":1.125}, {"label":"R13", "x":12, "y":1}, {"label":"R14", "x":13, "y":1.125}, {"label":"R15", "x":14, "y":1.25}, {"label":"R16", "x":15, "y":1.375}, {"label":"L20", "x":0, "y":2.375}, {"label":"L21", "x":1, "y":2.25}, {"label":"L22", "x":2, "y":2.125}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2.125}, {"label":"L25", "x":5, "y":2.25}, {"label":"L26", "x":6.5, "y":3}, {"label":"R20", "x":8.5, "y":3}, {"label":"R21", "x":10, "y":2.25}, {"label":"R22", "x":11, "y":2.125}, {"label":"R23", "x":12, "y":2}, {"label":"R24", "x":13, "y":2.125}, {"label":"R25", "x":14, "y":2.25}, {"label":"R26", "x":15, "y":2.375}, {"label":"L30", "x":0, "y":3.375}, {"label":"L31", "x":1, "y":3.25}, {"label":"L32", "x":2, "y":3.125}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":5.5, "y":4}, {"label":"L35", "x":6.5, "y":4}, {"label":"R30", "x":8.5, "y":4}, {"label":"R31", "x":9.5, "y":4}, {"label":"R32", "x":12, "y":3}, {"label":"R33", "x":13, "y":3.125}, {"label":"R34", "x":14, "y":3.25}, {"label":"R35", "x":15, "y":3.375}] | ||
} | ||
} | ||
} |
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,48 @@ | ||
/* | ||
Copyright 2018 Ayden <aydenvis@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/>. | ||
*/ | ||
|
||
#ifndef CONFIG_USER_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 the boilerplate with Eg, replace this: #ifndef CONFIG_USER_H
#define CONFIG_USER_H
#include "config_common.h"
with just |
||
#define CONFIG_USER_H | ||
|
||
#include "config_common.h" | ||
|
||
/* Use I2C or Serial, not both */ | ||
|
||
#define USE_SERIAL | ||
// #define USE_I2C | ||
|
||
/* Select hand configuration */ | ||
|
||
// #define MASTER_LEFT | ||
#define MASTER_RIGHT | ||
// #define EE_HANDS | ||
|
||
#undef RGBLED_NUM | ||
#define RGBLIGHT_ANIMATIONS | ||
#define RGBLED_NUM 12 | ||
#define RGBLIGHT_HUE_STEP 8 | ||
#define RGBLIGHT_SAT_STEP 8 | ||
#define RGBLIGHT_VAL_STEP 8 | ||
|
||
#define MOUSEKEY_DELAY 150 | ||
#define MOUSEKEY_INTERVAL 20 | ||
#define MOUSEKEY_MAX_SPEED 10 | ||
#define MOUSEKEY_TIME_TO_MAX 10 | ||
#define MOUSEKEY_WHEEL_MAX_SPEED 8 | ||
#define MOUSEKEY_WHEEL_TIME_TO_MAX 40 | ||
|
||
#endif |
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.
Replace this line with
#include "config_common.h"
. That should fix the compile errers.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.
Done.