forked from qmk/qmk_firmware
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implements subprojects and updates projects for this (qmk#459)
* 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 yang
- Loading branch information
1 parent
825a211
commit 5f021b0
Showing
44 changed files
with
480 additions
and
475 deletions.
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 |
|---|---|---|
| @@ -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: | ||
| - 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: | ||
| - cd keyboards/$KEYBOARD && make all-keymaps | ||
|
|
||
| - make all-keyboards quick AUTOGEN=true | ||
| addons: | ||
| apt: | ||
| packages: | ||
| - avr-libc | ||
| - gcc-avr | ||
| - dfu-programmer | ||
| - avr-libc | ||
| - gcc-avr | ||
| - dfu-programmer | ||
| - pandoc | ||
| after_success: bash util/travis_compiled_push.sh |
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
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 |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
|
|
||
| SUBPROJECT_DEFAULT = rev2 | ||
|
|
||
| # MCU name | ||
| MCU = atmega32u4 | ||
|
|
||
7 changes: 6 additions & 1 deletion
7
keyboards/clueboard1/clueboard1.c → keyboards/clueboard/clueboard.c
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
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,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 |
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
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
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 @@ | ||
| #---------------------------------------------------------------------------- | ||
| # 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 |
2 changes: 1 addition & 1 deletion
2
keyboards/clueboard2/keymaps/max/keymap.c → keyboards/clueboard/keymaps/max/keymap.c
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
2 changes: 1 addition & 1 deletion
2
keyboards/clueboard2/keymaps/skully/keymap.c → keyboards/clueboard/keymaps/skully/keymap.c
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
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,5 @@ | ||
| BACKLIGHT_ENABLE = no | ||
|
|
||
| ifndef QUANTUM_DIR | ||
| include ../../../Makefile | ||
| 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,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 |
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 @@ | ||
| #include "rev1.h" |
Oops, something went wrong.