drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Make arguments redo, subproject elimination (#1784)

Browse source 
* 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
This commit is contained in:
Jack Humbert 2017-10-14 11:32:19 -10:00 • committed by GitHub
parent e5dc2253e2
commit 800ec55dfc
217 changed files with 722 additions and 933 deletions
Download patch file Download diff file Expand all files Collapse all files

2
keyboards/nyquist/config.h
View file

@ -20,6 +20,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#include QMK_SUBPROJECT_CONFIG_H
#endif // CONFIG_H

2
keyboards/nyquist/keymaps/default/config.h
View file

@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef CONFIG_USER_H
#define CONFIG_USER_H
#include "../../config.h"
#include "config_common.h"
/* Use I2C or Serial, not both */

2
keyboards/nyquist/keymaps/hexwire/config.h
View file

@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef CONFIG_USER_H
#define CONFIG_USER_H
#include "../../config.h"
#include "config_common.h"
/* Use I2C or Serial, not both */

4
keyboards/nyquist/nyquist.h
View file

@ -1,7 +1,9 @@
#ifndef NYQUIST_H
#define NYQUIST_H
#include QMK_SUBPROJECT_H
#ifdef KEYBOARD_nyquist_rev1
#include "rev1.h"
#endif
#include "quantum.h"

4
keyboards/nyquist/readme.md
View file

@ -9,11 +9,11 @@ Hardware Availability: [Keebio](https://keeb.io)
Make example for this keyboard (after setting up your build environment):
make nyquist-rev1-default
make nyquist/rev1:default
Example of flashing this keyboard:
make nyquist-rev1-default-avrdude
make nyquist/rev1:default:avrdude
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.

2
keyboards/nyquist/rev1/rev1.c
View file

@ -1,4 +1,4 @@
#include QMK_SUBPROJECT_H
#include "rev1.h"
#ifdef AUDIO_ENABLE
float tone_startup[][2] = SONG(STARTUP_SOUND);

2
keyboards/nyquist/rev1/rev1.h
View file

@ -1,7 +1,7 @@
#ifndef REV1_H
#define REV1_H
#include QMK_KEYBOARD_H
#include "nyquist.h"
//void promicro_bootloader_jmp(bool program);
#include "quantum.h"

4
keyboards/nyquist/rules.mk
View file

@ -74,4 +74,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
CUSTOM_MATRIX = yes
LAYOUTS = ortho_5x12
LAYOUTS = ortho_5x12
DEFAULT_FOLDER = nyquist/rev1

1
keyboards/nyquist/subproject.mk
View file

@ -1 +0,0 @@
SUBPROJECT_DEFAULT = rev1