From 800ec55dfca06b4630acf62cbb5f130c4031e4f1 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sat, 14 Oct 2017 11:32:19 -1000 Subject: Make arguments redo, subproject elimination (#1784) * redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * start to update readmes and keyboards * look in keyboard directories for board.mk * update visualizer rules * fix up some other keyboards/keymaps * fix arm board ld includes * fix board rules * fix up remaining keyboards * reset layout variable * reset keyboard_layouts * fix remainging keymaps/boards * update readmes, docs * add note to makefile error * update readmes * remove planck keymap warnings * update references and docs * test out tarvis build stages * don't use stages for now * don't use stages for now --- keyboards/deltasplit75/config.h | 6 ------ keyboards/deltasplit75/deltasplit75.h | 7 +------ keyboards/deltasplit75/readme.md | 2 +- keyboards/deltasplit75/rules.mk | 32 +++++++++++++++++--------------- keyboards/deltasplit75/subproject.mk | 1 - keyboards/deltasplit75/v2/config.h | 4 ++-- keyboards/deltasplit75/v2/rules.mk | 6 +----- 7 files changed, 22 insertions(+), 36 deletions(-) delete mode 100644 keyboards/deltasplit75/subproject.mk (limited to 'keyboards/deltasplit75') diff --git a/keyboards/deltasplit75/config.h b/keyboards/deltasplit75/config.h index 89d328be64..8a2fbb3b26 100644 --- a/keyboards/deltasplit75/config.h +++ b/keyboards/deltasplit75/config.h @@ -20,10 +20,4 @@ along with this program. If not, see . #include "config_common.h" -#ifdef SUBPROJECT_protosplit - #include "protosplit/config.h" -#endif -#ifdef SUBPROJECT_v2 - #include "v2/config.h" -#endif #endif diff --git a/keyboards/deltasplit75/deltasplit75.h b/keyboards/deltasplit75/deltasplit75.h index 9db16c78c2..79d018c912 100644 --- a/keyboards/deltasplit75/deltasplit75.h +++ b/keyboards/deltasplit75/deltasplit75.h @@ -1,12 +1,7 @@ #ifndef DELTASPLIT75_H #define DELTASPLIT75_H -#ifdef SUBPROJECT_v2 - #include "v2.h" -#endif -#ifdef SUBPROJECT_protosplit - #include "protosplit.h" -#endif +#include "v2.h" #include "quantum.h" diff --git a/keyboards/deltasplit75/readme.md b/keyboards/deltasplit75/readme.md index a1e35e3378..f911f78714 100644 --- a/keyboards/deltasplit75/readme.md +++ b/keyboards/deltasplit75/readme.md @@ -9,7 +9,7 @@ Hardware Availability: Group Buy Make example for this keyboard (after setting up your build environment): - make deltasplit75-v2-default + make deltasplit75/v2:default See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. diff --git a/keyboards/deltasplit75/rules.mk b/keyboards/deltasplit75/rules.mk index 1aee5313c1..e345d61f56 100644 --- a/keyboards/deltasplit75/rules.mk +++ b/keyboards/deltasplit75/rules.mk @@ -55,21 +55,23 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically # -BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -CONSOLE_ENABLE ?= no # Console for debug(+400) -COMMAND_ENABLE ?= yes # Commands for debug and configuration -NKRO_ENABLE ?= no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality -MIDI_ENABLE ?= no # MIDI controls -AUDIO_ENABLE ?= no # Audio output on port C6 -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. -SUBPROJECT_rev1 ?= yes -USE_I2C ?= yes +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SUBPROJECT_rev1 = yes +USE_I2C = yes # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes + +DEFAULT_FOLDER = deltasplit75/v2 \ No newline at end of file diff --git a/keyboards/deltasplit75/subproject.mk b/keyboards/deltasplit75/subproject.mk deleted file mode 100644 index 298067e5d8..0000000000 --- a/keyboards/deltasplit75/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = v2 diff --git a/keyboards/deltasplit75/v2/config.h b/keyboards/deltasplit75/v2/config.h index 0f4b806e2d..b677d09aa9 100644 --- a/keyboards/deltasplit75/v2/config.h +++ b/keyboards/deltasplit75/v2/config.h @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef CONFIG_V2_H +#define CONFIG_V2_H #include "config_common.h" diff --git a/keyboards/deltasplit75/v2/rules.mk b/keyboards/deltasplit75/v2/rules.mk index 80a942d06f..f845616741 100644 --- a/keyboards/deltasplit75/v2/rules.mk +++ b/keyboards/deltasplit75/v2/rules.mk @@ -1,5 +1 @@ -BACKLIGHT_ENABLE = no - -ifndef QUANTUM_DIR - include ../../../Makefile -endif +BACKLIGHT_ENABLE = no \ No newline at end of file -- cgit v1.2.3