From 215c2119af5281072d5a6efb0308408793cadd08 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Wed, 29 Jun 2016 16:21:41 -0400 Subject: 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 --- keyboards/planck/Makefile | 1 + keyboards/planck/config.h | 8 +++++++- keyboards/planck/keymaps/experimental/config.h | 1 + keyboards/planck/keymaps/yang/Makefile | 1 + keyboards/planck/planck.h | 7 +++++++ keyboards/planck/rev3/Makefile | 5 +++++ keyboards/planck/rev3/config.h | 8 ++++++++ keyboards/planck/rev3/rev3.c | 1 + keyboards/planck/rev3/rev3.h | 6 ++++++ keyboards/planck/rev4/Makefile | 5 +++++ keyboards/planck/rev4/config.h | 8 ++++++++ keyboards/planck/rev4/rev4.c | 1 + keyboards/planck/rev4/rev4.h | 6 ++++++ 13 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 keyboards/planck/rev3/Makefile create mode 100644 keyboards/planck/rev3/config.h create mode 100644 keyboards/planck/rev3/rev3.c create mode 100644 keyboards/planck/rev3/rev3.h create mode 100644 keyboards/planck/rev4/Makefile create mode 100644 keyboards/planck/rev4/config.h create mode 100644 keyboards/planck/rev4/rev4.c create mode 100644 keyboards/planck/rev4/rev4.h (limited to 'keyboards/planck') diff --git a/keyboards/planck/Makefile b/keyboards/planck/Makefile index 08e9205cbf..23944f92ea 100644 --- a/keyboards/planck/Makefile +++ b/keyboards/planck/Makefile @@ -1,4 +1,5 @@ +SUBPROJECT_DEFAULT = rev4 # MCU name #MCU = at90usb1287 diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h index da2b000f63..4dd1d22a95 100644 --- a/keyboards/planck/config.h +++ b/keyboards/planck/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* 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 . //#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 diff --git a/keyboards/planck/keymaps/experimental/config.h b/keyboards/planck/keymaps/experimental/config.h index a9117e0eea..985e250ab5 100644 --- a/keyboards/planck/keymaps/experimental/config.h +++ b/keyboards/planck/keymaps/experimental/config.h @@ -4,5 +4,6 @@ #include "../../config.h" #define LEADER_TIMEOUT 300 +#define BACKLIGHT_BREATHING #endif diff --git a/keyboards/planck/keymaps/yang/Makefile b/keyboards/planck/keymaps/yang/Makefile index f4908d7037..6b18762fa7 100644 --- a/keyboards/planck/keymaps/yang/Makefile +++ b/keyboards/planck/keymaps/yang/Makefile @@ -3,6 +3,7 @@ # 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. +AUDIO_ENABLE = no ifndef QUANTUM_DIR include ../../../../Makefile diff --git a/keyboards/planck/planck.h b/keyboards/planck/planck.h index 81c0e8cb44..8cfee5d1cc 100644 --- a/keyboards/planck/planck.h +++ b/keyboards/planck/planck.h @@ -1,6 +1,13 @@ #ifndef PLANCK_H #define PLANCK_H +#ifdef SUBPROJECT_rev3 + #include "rev3.h" +#endif +#ifdef SUBPROJECT_rev4 + #include "rev4.h" +#endif + #include "quantum.h" #define PLANCK_MIT( \ diff --git a/keyboards/planck/rev3/Makefile b/keyboards/planck/rev3/Makefile new file mode 100644 index 0000000000..5594096823 --- /dev/null +++ b/keyboards/planck/rev3/Makefile @@ -0,0 +1,5 @@ +AUDIO_ENABLE = no # Audio output on port C6 + +ifndef QUANTUM_DIR + include ../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/planck/rev3/config.h b/keyboards/planck/rev3/config.h new file mode 100644 index 0000000000..fa50a5622c --- /dev/null +++ b/keyboards/planck/rev3/config.h @@ -0,0 +1,8 @@ +#ifndef REV3_CONFIG_H +#define REV3_CONFIG_H + +#include "../config.h" + +#define DEVICE_VER 0x0003 + +#endif \ No newline at end of file diff --git a/keyboards/planck/rev3/rev3.c b/keyboards/planck/rev3/rev3.c new file mode 100644 index 0000000000..9ccd1d8803 --- /dev/null +++ b/keyboards/planck/rev3/rev3.c @@ -0,0 +1 @@ +#include "rev3.h" \ No newline at end of file diff --git a/keyboards/planck/rev3/rev3.h b/keyboards/planck/rev3/rev3.h new file mode 100644 index 0000000000..628951d97d --- /dev/null +++ b/keyboards/planck/rev3/rev3.h @@ -0,0 +1,6 @@ +#ifndef REV3_H +#define REV3_H + +#include "../planck.h" + +#endif \ No newline at end of file diff --git a/keyboards/planck/rev4/Makefile b/keyboards/planck/rev4/Makefile new file mode 100644 index 0000000000..01d848e98c --- /dev/null +++ b/keyboards/planck/rev4/Makefile @@ -0,0 +1,5 @@ +AUDIO_ENABLE = yes # Audio output on port C6 + +ifndef QUANTUM_DIR + include ../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/planck/rev4/config.h b/keyboards/planck/rev4/config.h new file mode 100644 index 0000000000..98189fba71 --- /dev/null +++ b/keyboards/planck/rev4/config.h @@ -0,0 +1,8 @@ +#ifndef REV4_CONFIG_H +#define REV4_CONFIG_H + +#include "../config.h" + +#define DEVICE_VER 0x0004 + +#endif \ No newline at end of file diff --git a/keyboards/planck/rev4/rev4.c b/keyboards/planck/rev4/rev4.c new file mode 100644 index 0000000000..98a75d2ed1 --- /dev/null +++ b/keyboards/planck/rev4/rev4.c @@ -0,0 +1 @@ +#include "rev4.h" \ No newline at end of file diff --git a/keyboards/planck/rev4/rev4.h b/keyboards/planck/rev4/rev4.h new file mode 100644 index 0000000000..e4cf1800b8 --- /dev/null +++ b/keyboards/planck/rev4/rev4.h @@ -0,0 +1,6 @@ +#ifndef REV4_H +#define REV4_H + +#include "../planck.h" + +#endif \ No newline at end of file -- cgit v1.2.3