diff options
| author |  Jack Humbert <jack.humb@gmail.com> | 2016-06-29 16:21:41 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-06-29 16:21:41 -0400 |
| commit | 215c2119af5281072d5a6efb0308408793cadd08 (patch) | |
| tree | 995bb9788a4f40b835d7713af3eb3015e9f43689 /keyboards/planck/config.h | |
| parent | 755b17f8fc0f484261108f912af38430b27e9c95 (diff) | |
| download | qmk_firmware-215c2119af5281072d5a6efb0308408793cadd08.tar.gz | |
Implements subprojects and updates projects for this (#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
Diffstat (limited to 'keyboards/planck/config.h')
| -rw-r--r-- | keyboards/planck/config.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h index da2b000f6..4dd1d22a9 100644 --- a/keyboards/planck/config.h +++ b/keyboards/planck/config.h @@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED #define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 #define MANUFACTURER Ortholinear Keyboards #define PRODUCT The Planck Keyboard #define DESCRIPTION A compact ortholinear keyboard @@ -79,4 +78,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION +#ifdef SUBPROJECT_rev3 + #include "rev3/config.h" +#endif +#ifdef SUBPROJECT_rev4 + #include "rev4/config.h" +#endif + #endif |