* non-working commit * working * subprojects implemented for planck * pass a subproject variable through to c * consolidates clueboard revisions * thanks for letting me know about conflicts.. * turn off audio for yang's * corrects starting paths for subprojects * messing around with travis * semicolon * travis script * travis script * script for travis * correct directory (probably), amend files to commit * remove origin before adding * git pull, correct syntax * git checkout * git pull origin branch * where are we? * where are we? * merging * force things to happen * adds commit message, adds add * rebase, no commit message * rebase branch * idk! * try just pull * fetch - merge * specify repo branch * checkout * goddammit * merge? idk * pls * after all * don't split up keyboards * syntax * adds quick for all-keyboards * trying out new script * script update * lowercase * all keyboards * stop replacing compiled.hex automatically * adds if statement * skip automated build branches * forces push to automated build branch * throw an add in there * upstream? * adds AUTOGEN * ignore all .hex files again * testing out new repo * global ident * generate script, keyboard_keymap.hex * skip generation for now, print pandoc info, submodule update * try trusty * and sudo * try generate * updates subprojects to keyboards * no idea * updates to keyboards * cleans up clueboard stuff * setup to use local readme * updates cluepad, planck experimental * remove extra led.c [ci skip] * disable power up for now * config files updates * makefile updates * .h file updates, config tuning * disable audio for yangpull/461/head
@ -1,39 +1,21 @@ | |||||
os: | |||||
- linux | |||||
language: | |||||
- c | |||||
compiler: | |||||
- avr-gcc | |||||
os: linux | |||||
dist: trusty | |||||
sudo: required | |||||
language: c | |||||
compiler: avr-gcc | |||||
branches: | |||||
except: | |||||
- /^.*-automated-build$/ | |||||
env: | env: | ||||
- KEYBOARD=alps64 | |||||
- KEYBOARD=arrow_pad | |||||
- KEYBOARD=atomic | |||||
- KEYBOARD=atreus | |||||
- KEYBOARD=bantam44 | |||||
- KEYBOARD=clueboard1 | |||||
- KEYBOARD=clueboard2 | |||||
- KEYBOARD=cluepad | |||||
- KEYBOARD=ergodox_ez | |||||
- KEYBOARD=gh60 | |||||
- KEYBOARD=hhkb | |||||
- KEYBOARD=jd45 | |||||
- KEYBOARD=kc60 | |||||
- KEYBOARD=phantom | |||||
- KEYBOARD=planck | |||||
- KEYBOARD=preonic | |||||
- KEYBOARD=retro_refit | |||||
- KEYBOARD=satan | |||||
- KEYBOARD=sixkeyboard | |||||
global: | |||||
- secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM= | |||||
script: | script: | ||||
- cd keyboards/$KEYBOARD && make all-keymaps | |||||
- make all-keyboards quick AUTOGEN=true | |||||
addons: | addons: | ||||
apt: | apt: | ||||
packages: | packages: | ||||
- avr-libc | |||||
- gcc-avr | |||||
- dfu-programmer | |||||
- avr-libc | |||||
- gcc-avr | |||||
- dfu-programmer | |||||
- pandoc | |||||
after_success: bash util/travis_compiled_push.sh |
@ -1,4 +1,5 @@ | |||||
SUBPROJECT_DEFAULT = rev2 | |||||
# MCU name | # MCU name | ||||
MCU = atmega32u4 | MCU = atmega32u4 |
@ -1,4 +1,9 @@ | |||||
#include "clueboard1.h" | |||||
#include "clueboard.h" | |||||
void led_init_ports() { | |||||
// * Set our LED pins as output | |||||
DDRB |= (1<<4); | |||||
} | |||||
void led_set_kb(uint8_t usb_led) { | void led_set_kb(uint8_t usb_led) { | ||||
DDRF |= (1<<0); | DDRF |= (1<<0); |
@ -0,0 +1,13 @@ | |||||
#ifndef CLUEBOARD_H | |||||
#define CLUEBOARD_H | |||||
#ifdef SUBPROJECT_rev1 | |||||
#include "rev1.h" | |||||
#endif | |||||
#ifdef SUBPROJECT_rev2 | |||||
#include "rev2.h" | |||||
#endif | |||||
#include "quantum.h" | |||||
#endif |
@ -0,0 +1,49 @@ | |||||
#---------------------------------------------------------------------------- | |||||
# On command line: | |||||
# | |||||
# make all = Make software. | |||||
# | |||||
# make clean = Clean out built project files. | |||||
# | |||||
# make coff = Convert ELF to AVR COFF. | |||||
# | |||||
# make extcoff = Convert ELF to AVR Extended COFF. | |||||
# | |||||
# make program = Download the hex file to the device. | |||||
# Please customize your programmer settings(PROGRAM_CMD) | |||||
# | |||||
# make teensy = Download the hex file to the device, using teensy_loader_cli. | |||||
# (must have teensy_loader_cli installed). | |||||
# | |||||
# make dfu = Download the hex file to the device, using dfu-programmer (must | |||||
# have dfu-programmer installed). | |||||
# | |||||
# make flip = Download the hex file to the device, using Atmel FLIP (must | |||||
# have Atmel FLIP installed). | |||||
# | |||||
# make dfu-ee = Download the eeprom file to the device, using dfu-programmer | |||||
# (must have dfu-programmer installed). | |||||
# | |||||
# make flip-ee = Download the eeprom file to the device, using Atmel FLIP | |||||
# (must have Atmel FLIP installed). | |||||
# | |||||
# make debug = Start either simulavr or avarice as specified for debugging, | |||||
# with avr-gdb or avr-insight as the front end for debugging. | |||||
# | |||||
# make filename.s = Just compile filename.c into the assembler code only. | |||||
# | |||||
# make filename.i = Create a preprocessed source file for use in submitting | |||||
# bug reports to the GCC project. | |||||
# | |||||
# To rebuild project do "make clean" then "make all". | |||||
#---------------------------------------------------------------------------- | |||||
# Build Options | |||||
# change to "no" to disable the options, or define them in the makefile.mk in | |||||
# the appropriate keymap folder that will get included automatically | |||||
# | |||||
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | |||||
ifndef QUANTUM_DIR | |||||
include ../../../../Makefile | |||||
endif |
@ -1,4 +1,4 @@ | |||||
#include "clueboard2.h" | |||||
#include "clueboard.h" | |||||
// Used for SHIFT_ESC | // Used for SHIFT_ESC | ||||
#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) | #define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) |
@ -1,4 +1,4 @@ | |||||
#include "clueboard2.h" | |||||
#include "clueboard.h" | |||||
// Used for SHIFT_ESC | // Used for SHIFT_ESC | ||||
#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) | #define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) |
@ -0,0 +1,5 @@ | |||||
BACKLIGHT_ENABLE = no | |||||
ifndef QUANTUM_DIR | |||||
include ../../../Makefile | |||||
endif |
@ -0,0 +1,37 @@ | |||||
#ifndef REV2_CONFIG_H | |||||
#define REV2_CONFIG_H | |||||
#include "../config.h" | |||||
#define PRODUCT_ID 0x2301 | |||||
#define DEVICE_VER 0x0003 | |||||
/* key matrix size */ | |||||
#define MATRIX_ROWS 5 | |||||
#define MATRIX_COLS 16 | |||||
// ROWS: Top to bottom, COLS: Left to right | |||||
/* Column pin configuration | |||||
* col: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | |||||
* pin: B3 F1 F4 F5 F6 C7 C6 B6 B5 B4 D7 D6 D4 F7 B0 B1 | |||||
*/ | |||||
#define MATRIX_COL_PINS { B3, F1, F4, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, F7, B0, B1 } | |||||
/* Row pin configuration | |||||
* row: 0 1 2 3 4 | |||||
* pin: D1 D0 D2 D5 D3 | |||||
*/ | |||||
#define MATRIX_ROW_PINS { D1, D0, D2, D5, D3 } | |||||
#define UNUSED_PINS | |||||
/* Underlight configuration | |||||
*/ | |||||
#define ws2812_PORTREG PORTB | |||||
#define ws2812_DDRREG DDRB | |||||
#define ws2812_pin 2 | |||||
#define RGBLED_NUM 14 // Number of LEDs | |||||
#define RGBLIGHT_HUE_STEP 10 | |||||
#define RGBLIGHT_SAT_STEP 17 | |||||
#define RGBLIGHT_VAL_STEP 17 | |||||
#endif |
@ -0,0 +1 @@ | |||||
#include "rev1.h" |
@ -0,0 +1,5 @@ | |||||
BACKLIGHT_ENABLE = yes | |||||
ifndef QUANTUM_DIR | |||||
include ../../../Makefile | |||||
endif |
@ -0,0 +1,40 @@ | |||||
#ifndef REV2_CONFIG_H | |||||
#define REV2_CONFIG_H | |||||
#include "../config.h" | |||||
#define PRODUCT_ID 0x2320 | |||||
#define DEVICE_VER 0x0001 | |||||
/* key matrix size */ | |||||
#define MATRIX_ROWS 10 | |||||
#define MATRIX_COLS 8 | |||||
// ROWS: Top to bottom, COLS: Left to right | |||||
/* Row pin configuration | |||||
* row: 0 1 2 3 4 5 6 7 8 9 | |||||
* pin: B2 C7 C6 B6 B5 B0 B3 D5 D3 D2 | |||||
*/ | |||||
#define MATRIX_ROW_PINS { B2, C7, C6, B6, B5, B0, B3, D5, D3, D2 } | |||||
/* Column pin configuration | |||||
* col: 0 1 2 3 4 5 6 7 | |||||
* pin: F0 F1 F4 F5 F6 F7 E6 B1 | |||||
*/ | |||||
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, E6, B1 } | |||||
#define UNUSED_PINS | |||||
/* Backlight configuration | |||||
*/ | |||||
#define BACKLIGHT_LEVELS 1 | |||||
/* Underlight configuration | |||||
*/ | |||||
#define ws2812_PORTREG PORTD | |||||
#define ws2812_DDRREG DDRD | |||||
#define ws2812_pin 7 | |||||
#define RGBLED_NUM 14 // Number of LEDs | |||||
#define RGBLIGHT_HUE_STEP 10 | |||||
#define RGBLIGHT_SAT_STEP 17 | |||||
#define RGBLIGHT_VAL_STEP 17 | |||||
#endif |
@ -0,0 +1,47 @@ | |||||
#include "rev2.h" | |||||
#include <avr/io.h> | |||||
#include "backlight.h" | |||||
#include "print.h" | |||||
void matrix_init_kb(void) { | |||||
// put your keyboard start-up code here | |||||
// runs once when the firmware starts up | |||||
matrix_init_user(); | |||||
led_init_ports(); | |||||
// JTAG disable for PORT F. write JTD bit twice within four cycles. | |||||
MCUCR |= (1<<JTD); | |||||
MCUCR |= (1<<JTD); | |||||
} | |||||
void matrix_scan_kb(void) { | |||||
matrix_scan_user(); | |||||
} | |||||
void backlight_init_ports(void) { | |||||
print("init_backlight_pin()\n"); | |||||
// Set our LED pins as output | |||||
DDRD |= (1<<6); // Esc | |||||
DDRB |= (1<<7); // Page Up | |||||
DDRD |= (1<<4); // Arrows | |||||
// Set our LED pins low | |||||
PORTD &= ~(1<<6); // Esc | |||||
PORTB &= ~(1<<7); // Page Up | |||||
PORTD &= ~(1<<4); // Arrows | |||||
} | |||||
void backlight_set(uint8_t level) { | |||||
if ( level == 0 ) { | |||||
// Turn off light | |||||
PORTD |= (1<<6); // Esc | |||||
PORTB |= (1<<7); // Page Up | |||||
PORTD |= (1<<4); // Arrows | |||||
} else { | |||||
// Turn on light | |||||
PORTD &= ~(1<<6); // Esc | |||||
PORTB &= ~(1<<7); // Page Up | |||||
PORTD &= ~(1<<4); // Arrows | |||||
} | |||||
} |
@ -1,184 +0,0 @@ | |||||
#include "clueboard1.h" | |||||
#ifdef RGBLIGHT_ENABLE | |||||
#include "rgblight.h" | |||||
#endif | |||||
// Used for SHIFT_ESC | |||||
#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) | |||||
// 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. | |||||
// Layer names don't all need to be of the same length, obviously, and you can also skip them | |||||
// 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 | |||||
* ,--------------------------------------------------------------------------. ,----. | |||||
* |Esc~| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| BS| |PGUP| | |||||
* |--------------------------------------------------------------------------| |----| | |||||
* | Tab| Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |PGDN| | |||||
* |--------------------------------------------------------------------------| `----' | |||||
* |Capslck| A| S| D| F| G| H| J| K| L| ;| '| # | Ent| | |||||
* |-----------------------------------------------------------------------------. | |||||
* |Shift| BS| Z| X| C| V| B| N| M| ,| .| /| BS|Shift| UP| | |||||
* |------------------------------------------------------------------------|----|----. | |||||
* | Ctrl| Gui| Alt| MHen| Space| Space| Hen| Alt| Ctrl| _FL|LEFT|DOWN|RGHT| | |||||
* `----------------------------------------------------------------------------------' | |||||
*/ | |||||
[_BL] = KEYMAP( | |||||
F(0), 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_GRV, KC_BSPC, KC_PGUP, \ | |||||
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_PGDN, \ | |||||
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_NUHS, KC_ENT, \ | |||||
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, KC_UP, \ | |||||
KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC,KC_SPC, KC_HENK, KC_RALT, KC_RCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT), | |||||
/* Keymap _FL: Function Layer | |||||
* ,--------------------------------------------------------------------------. ,----. | |||||
* | `| F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12| | Del| |BLIN| | |||||
* |--------------------------------------------------------------------------| |----| | |||||
* | | | | | | | | |PScr|SLck|Paus| | | | |BLDE| | |||||
* |--------------------------------------------------------------------------| `----' | |||||
* | | | _RS| | | | | | | | | | | | | |||||
* |-----------------------------------------------------------------------------. | |||||
* | | | | | | | | | | | | | | |PGUP| | |||||
* |------------------------------------------------------------------------|----|----. | |||||
* | | | | | | | | | | _FL|HOME|PGDN| END| | |||||
* `----------------------------------------------------------------------------------' | |||||
*/ | |||||
[_FL] = KEYMAP( | |||||
KC_GRV, 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_TRNS, KC_DEL, BL_STEP, \ | |||||
KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ | |||||
KC_TRNS, KC_TRNS, MO(_RS),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ | |||||
KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, \ | |||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FL), KC_HOME, KC_PGDN, KC_END), | |||||
/* Keymap _RS: Reset layer | |||||
* ,--------------------------------------------------------------------------. ,----. | |||||
* | | | | | | | | | | | | | | | | | | | |||||
* |--------------------------------------------------------------------------| |----| | |||||
* | | | | |RESET| | | | | | | | | | | | | |||||
* |--------------------------------------------------------------------------| `----' | |||||
* | | | _RS| | | | | | | | | | | | | |||||
* |-----------------------------------------------------------------------------. | |||||
* | | | | | | | | | | | | | | | | | |||||
* |------------------------------------------------------------------------|----|----. | |||||
* | | | | | | | | | | _FL| | | | | |||||
* `----------------------------------------------------------------------------------' | |||||
*/ | |||||
[_RS] = KEYMAP( | |||||
#ifdef RGBLIGHT_ENABLE | |||||
KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, F(1), F(7), \ | |||||
KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,RESET, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, F(8), \ | |||||
KC_TRNS, KC_TRNS, MO(_RS),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ | |||||
MO(_FL), KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FL), F(5), \ | |||||
KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, F(2), F(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, F(4), F(6), F(3)), | |||||
#else | |||||
KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ | |||||
KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,RESET, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ | |||||
KC_TRNS, KC_TRNS, MO(_RS),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ | |||||
KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ | |||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FL), KC_TRNS, KC_TRNS, KC_TRNS), | |||||
#endif | |||||
}; | |||||
enum function_id { | |||||
SHIFT_ESC, | |||||
#ifdef RGBLIGHT_ENABLE | |||||
RGBLED_TOGGLE, | |||||
RGBLED_STEP_MODE, | |||||
RGBLED_INCREASE_HUE, | |||||
RGBLED_DECREASE_HUE, | |||||
RGBLED_INCREASE_SAT, | |||||
RGBLED_DECREASE_SAT, | |||||
RGBLED_INCREASE_VAL, | |||||
RGBLED_DECREASE_VAL | |||||
#endif | |||||
}; | |||||
const uint16_t PROGMEM fn_actions[] = { | |||||
[0] = ACTION_FUNCTION(SHIFT_ESC), | |||||
#ifdef RGBLIGHT_ENABLE | |||||
[1] = ACTION_FUNCTION(RGBLED_TOGGLE), | |||||
[2] = ACTION_FUNCTION(RGBLED_STEP_MODE), | |||||
[3] = ACTION_FUNCTION(RGBLED_INCREASE_HUE), | |||||
[4] = ACTION_FUNCTION(RGBLED_DECREASE_HUE), | |||||
[5] = ACTION_FUNCTION(RGBLED_INCREASE_SAT), | |||||
[6] = ACTION_FUNCTION(RGBLED_DECREASE_SAT), | |||||
[7] = ACTION_FUNCTION(RGBLED_INCREASE_VAL), | |||||
[8] = ACTION_FUNCTION(RGBLED_DECREASE_VAL), | |||||
#endif | |||||
}; | |||||
void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||||
static uint8_t shift_esc_shift_mask; | |||||
switch (id) { | |||||
case SHIFT_ESC: | |||||
shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK; | |||||
if (record->event.pressed) { | |||||
if (shift_esc_shift_mask) { | |||||
add_key(KC_GRV); | |||||
send_keyboard_report(); | |||||
} else { | |||||
add_key(KC_ESC); | |||||
send_keyboard_report(); | |||||
} | |||||
} else { | |||||
if (shift_esc_shift_mask) { | |||||
del_key(KC_GRV); | |||||
send_keyboard_report(); | |||||
} else { | |||||
del_key(KC_ESC); | |||||
send_keyboard_report(); | |||||
} | |||||
} | |||||
break; | |||||
//led operations | |||||
#ifdef RGBLIGHT_ENABLE | |||||
case RGBLED_TOGGLE: | |||||
if (record->event.pressed) { | |||||
rgblight_toggle(); | |||||
} | |||||
break; | |||||
case RGBLED_INCREASE_HUE: | |||||
if (record->event.pressed) { | |||||
rgblight_increase_hue(); | |||||
} | |||||
break; | |||||
case RGBLED_DECREASE_HUE: | |||||
if (record->event.pressed) { | |||||
rgblight_decrease_hue(); | |||||
} | |||||
break; | |||||
case RGBLED_INCREASE_SAT: | |||||
if (record->event.pressed) { | |||||
rgblight_increase_sat(); | |||||
} | |||||
break; | |||||
case RGBLED_DECREASE_SAT: | |||||
if (record->event.pressed) { | |||||
rgblight_decrease_sat(); | |||||
} | |||||
break; | |||||
case RGBLED_INCREASE_VAL: | |||||
if (record->event.pressed) { | |||||
rgblight_increase_val(); | |||||
} | |||||
break; | |||||
case RGBLED_DECREASE_VAL: | |||||
if (record->event.pressed) { | |||||
rgblight_decrease_val(); | |||||
} | |||||
break; | |||||
case RGBLED_STEP_MODE: | |||||
if (record->event.pressed) { | |||||
rgblight_step(); | |||||
} | |||||
break; | |||||
#endif | |||||
} | |||||
} |
@ -1,99 +0,0 @@ | |||||
/* | |||||
Copyright 2012 Jun Wako <wakojun@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_H | |||||
#define CONFIG_H | |||||
#include "config_common.h" | |||||
/* USB Device descriptor parameter */ | |||||
#define VENDOR_ID 0xC1ED | |||||
#define PRODUCT_ID 0x2320 | |||||
#define DEVICE_VER 0x0001 | |||||
#define MANUFACTURER Clueboard | |||||
#define PRODUCT Clueboard with RGB Underlighting | |||||
#define DESCRIPTION QMK keyboard firmware for Clueboard | |||||
/* key matrix size */ | |||||
#define MATRIX_ROWS 10 | |||||
#define MATRIX_COLS 8 | |||||
// ROWS: Top to bottom, COLS: Left to right | |||||
/* Row pin configuration | |||||
* row: 0 1 2 3 4 5 6 7 8 9 | |||||
* pin: B2 C7 C6 B6 B5 B0 B3 D5 D3 D2 | |||||
*/ | |||||
#define MATRIX_ROW_PINS { B2, C7, C6, B6, B5, B0, B3, D5, D3, D2 } | |||||
/* Column pin configuration | |||||
* col: 0 1 2 3 4 5 6 7 | |||||
* pin: F0 F1 F4 F5 F6 F7 E6 B1 | |||||
*/ | |||||
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, E6, B1 } | |||||
#define UNUSED_PINS | |||||
/* COL2ROW or ROW2COL */ | |||||
#define DIODE_DIRECTION COL2ROW | |||||
/* define if matrix has ghost */ | |||||
//#define MATRIX_HAS_GHOST | |||||
/* 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)) \ | |||||
) | |||||
/* Backlight configuration | |||||
*/ | |||||
#define BACKLIGHT_LEVELS 1 | |||||
/* Underlight configuration | |||||
*/ | |||||
#define ws2812_PORTREG PORTD | |||||
#define ws2812_DDRREG DDRD | |||||
#define ws2812_pin 7 | |||||
#define RGBLED_NUM 14 // Number of LEDs | |||||
#define RGBLIGHT_HUE_STEP 10 | |||||
#define RGBLIGHT_SAT_STEP 17 | |||||
#define RGBLIGHT_VAL_STEP 17 | |||||
/* | |||||
* 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 |
@ -1,11 +0,0 @@ | |||||
# Build Options | |||||
# change to "no" to disable the options, or define them in the Makefile in | |||||
# the appropriate keymap folder that will get included automatically | |||||
# | |||||
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | |||||
ifndef QUANTUM_DIR | |||||
include ../../../../Makefile | |||||
endif |
@ -1,54 +0,0 @@ | |||||
#include <avr/io.h> | |||||
#include "backlight.h" | |||||
#include "led.h" | |||||
#include "print.h" | |||||
int pwm_level; | |||||
void led_set_kb(uint8_t usb_led) | |||||
{ | |||||
print("led_set\n"); | |||||
} | |||||
void init_backlight_pin(void) | |||||
{ | |||||
// Set C7 to output | |||||
DDRC |= (1<<7); | |||||
// Initialize the timer | |||||
TC4H = 0x03; | |||||
OCR4C = 0xFF; | |||||
TCCR4A = 0b10000010; | |||||
TCCR4B = 0b00000001; | |||||
} | |||||
void backlight_set(uint8_t level) | |||||
{ | |||||
// Determine the PWM level | |||||
switch (level) | |||||
{ | |||||
case 0: | |||||
// 33% | |||||
pwm_level = 0x54; | |||||
break; | |||||
case 1: | |||||
// 66% | |||||
pwm_level = 0xA8; | |||||
break; | |||||
case 2: | |||||
// 100% | |||||
pwm_level = 0xFF; | |||||
break; | |||||
case 3: | |||||
// 0% | |||||
pwm_level = 0x00; | |||||
break; | |||||
default: | |||||
xprintf("Unknown level: %d\n", level); | |||||
} | |||||
// Write the PWM level to the timer | |||||
TC4H = pwm_level >> 8; | |||||
OCR4A = 0xFF & pwm_level; | |||||
} |
@ -1,15 +1,60 @@ | |||||
#include "cluepad.h" | #include "cluepad.h" | ||||
int pwm_level; | |||||
void matrix_init_kb(void) { | void matrix_init_kb(void) { | ||||
// put your keyboard start-up code here | // put your keyboard start-up code here | ||||
// runs once when the firmware starts up | // runs once when the firmware starts up | ||||
matrix_init_user(); | matrix_init_user(); | ||||
#ifdef BACKLIGHT_ENABLE | |||||
init_backlight_pin(); | |||||
#endif | |||||
// JTAG disable for PORT F. write JTD bit twice within four cycles. | // JTAG disable for PORT F. write JTD bit twice within four cycles. | ||||
MCUCR |= (1<<JTD); | MCUCR |= (1<<JTD); | ||||
MCUCR |= (1<<JTD); | MCUCR |= (1<<JTD); | ||||
}; | }; | ||||
void led_set_kb(uint8_t usb_led) | |||||
{ | |||||
print("led_set\n"); | |||||
} | |||||
void backlight_init_ports(void) | |||||
{ | |||||
// Set C7 to output | |||||
DDRC |= (1<<7); | |||||
// Initialize the timer | |||||
TC4H = 0x03; | |||||
OCR4C = 0xFF; | |||||
TCCR4A = 0b10000010; | |||||
TCCR4B = 0b00000001; | |||||
} | |||||
void backlight_set(uint8_t level) | |||||
{ | |||||
// Determine the PWM level | |||||
switch (level) | |||||
{ | |||||
case 0: | |||||
// 33% | |||||
pwm_level = 0x54; | |||||
break; | |||||
case 1: | |||||
// 66% | |||||
pwm_level = 0xA8; | |||||
break; | |||||
case 2: | |||||
// 100% | |||||
pwm_level = 0xFF; | |||||
break; | |||||
case 3: | |||||
// 0% | |||||
pwm_level = 0x00; | |||||
break; | |||||
default: | |||||
xprintf("Unknown level: %d\n", level); | |||||
} | |||||
// Write the PWM level to the timer | |||||
TC4H = pwm_level >> 8; | |||||
OCR4A = 0xFF & pwm_level; | |||||
} |
@ -0,0 +1,5 @@ | |||||
AUDIO_ENABLE = no # Audio output on port C6 | |||||
ifndef QUANTUM_DIR | |||||
include ../../../Makefile | |||||
endif |
@ -0,0 +1,8 @@ | |||||
#ifndef REV3_CONFIG_H | |||||
#define REV3_CONFIG_H | |||||
#include "../config.h" | |||||
#define DEVICE_VER 0x0003 | |||||
#endif |
@ -0,0 +1 @@ | |||||
#include "rev3.h" |
@ -0,0 +1,6 @@ | |||||
#ifndef REV3_H | |||||
#define REV3_H | |||||
#include "../planck.h" | |||||
#endif |
@ -0,0 +1,5 @@ | |||||
AUDIO_ENABLE = yes # Audio output on port C6 | |||||
ifndef QUANTUM_DIR | |||||
include ../../../Makefile | |||||
endif |
@ -0,0 +1,8 @@ | |||||
#ifndef REV4_CONFIG_H | |||||
#define REV4_CONFIG_H | |||||
#include "../config.h" | |||||
#define DEVICE_VER 0x0004 | |||||
#endif |
@ -0,0 +1 @@ | |||||
#include "rev4.h" |
@ -0,0 +1,6 @@ | |||||
#ifndef REV4_H | |||||
#define REV4_H | |||||
#include "../planck.h" | |||||
#endif |
@ -0,0 +1,23 @@ | |||||
#!/bin/bash | |||||
set -o errexit -o nounset | |||||
rev=$(git rev-parse --short HEAD) | |||||
git config --global user.name "Travis CI" | |||||
git config --global user.email "jack.humb+travis.ci@gmail.com" | |||||
find . -name ".build" | xargs rm -rf | |||||
cd .. | |||||
git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git | |||||
cd qmk.fm | |||||
git submodule update --init --recursive | |||||
rm -rf keyboard | |||||
rm -rf keyboards | |||||
cp -r ../qmk_firmware/keyboards . | |||||
cp ../qmk_firmware/readme.md qmk_readme.md | |||||
./generate.sh | |||||
git add -A | |||||
git commit -m "generated from qmk_firmware/$TRAVIS_BRANCH@${rev}" | |||||
git push |