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
This commit is contained in:
Jack Humbert
GitHub
parent
e5dc2253e2
commit
800ec55dfc
217 changed files with 722 additions and 933 deletions
|
|
@ -23,9 +23,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define CONFIG_H
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
#ifdef SUBPROJECT_rev1
|
||||
#include "rev1/config.h"
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -22,7 +22,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 */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
ifndef QUANTUM_DIR
|
||||
include ../../../../Makefile
|
||||
endif
|
||||
|
|
@ -22,7 +22,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 */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,2 @@
|
|||
CONSOLE_ENABLE = yes
|
||||
TAP_DANCE_ENABLE = yes
|
||||
|
||||
ifndef QUANTUM_DIR
|
||||
include ../../../../Makefile
|
||||
endif
|
||||
TAP_DANCE_ENABLE = yes
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef ORTHODOX_H
|
||||
#define ORTHODOX_H
|
||||
|
||||
#ifdef SUBPROJECT_rev1
|
||||
#ifdef KEYBOARD_orthodox_rev1
|
||||
#include "rev1.h"
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -34,10 +34,10 @@ For further reading on build- and flashing-procedures for split ortholinear skel
|
|||
|
||||
## First Time Setup
|
||||
|
||||
Download or clone the whole firmware and navigate to the keyboards/orthodox directory. Once your dev env is setup, you'll be able to generate the default .hex using:
|
||||
Download or clone the whole firmware and navigate to the root directory. Once your dev env is setup, you'll be able to generate the default .hex using:
|
||||
|
||||
```
|
||||
$ make rev1-default
|
||||
$ make orthodox/rev1:default
|
||||
```
|
||||
|
||||
You will see a lot of output and if everything worked correctly you will see the built hex files in your *root qmk_firmware directory* two levels up:
|
||||
|
|
@ -50,7 +50,7 @@ If you would like to use one of the alternative keymaps, or create your own, cop
|
|||
|
||||
|
||||
```
|
||||
$ make rev1-YOUR_KEYMAP_NAME
|
||||
$ make orthodox/rev1:YOUR_KEYMAP_NAME
|
||||
```
|
||||
|
||||
If everything worked correctly you will see a file:
|
||||
|
|
@ -96,8 +96,8 @@ the two halves, i.e. if your split keyboard has 3 rows in each half, then
|
|||
|
||||
Flashing
|
||||
-------
|
||||
From the `orthodox` directory run `make SUBPROJECT-KEYMAP-avrdude` for automatic serial port resolution and flashing.
|
||||
Example: `make rev2-default-avrdude`
|
||||
From the root directory run `make PROJECT:KEYMAP:avrdude` for automatic serial port resolution and flashing.
|
||||
Example: `make orthodox/rev2:default:avrdude`
|
||||
|
||||
|
||||
Choosing which board to plug the USB cable into (choosing Master)
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#ifndef REV1_CONFIG_H
|
||||
#define REV1_CONFIG_H
|
||||
|
||||
#include "../config.h"
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0xFEED
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#ifndef REV1_H
|
||||
#define REV1_H
|
||||
|
||||
#include "../orthodox.h"
|
||||
#include "orthodox.h"
|
||||
|
||||
//void promicro_bootloader_jmp(bool program);
|
||||
#include "quantum.h"
|
||||
|
|
|
|||
|
|
@ -1,5 +1 @@
|
|||
BACKLIGHT_ENABLE = no
|
||||
|
||||
ifndef QUANTUM_DIR
|
||||
include ../../../Makefile
|
||||
endif
|
||||
BACKLIGHT_ENABLE = no
|
||||
|
|
@ -73,3 +73,5 @@ USE_I2C = yes
|
|||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||
|
||||
CUSTOM_MATRIX = yes
|
||||
|
||||
DEFAULT_FOLDER = orthodox/rev1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue