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/ergodox_infinity/keymaps/rask/README.md | 2 +- keyboards/ergodox_infinity/readme.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'keyboards/ergodox_infinity') diff --git a/keyboards/ergodox_infinity/keymaps/rask/README.md b/keyboards/ergodox_infinity/keymaps/rask/README.md index 99e395323..8a1399430 100644 --- a/keyboards/ergodox_infinity/keymaps/rask/README.md +++ b/keyboards/ergodox_infinity/keymaps/rask/README.md @@ -17,4 +17,4 @@ makes sense. Follow the main Infinity ErgoDox guide but use the following layout: - $ sudo make ergodox_infinity-rask + $ sudo make ergodox_infinity:rask diff --git a/keyboards/ergodox_infinity/readme.md b/keyboards/ergodox_infinity/readme.md index 4ad5990b8..7b8c1df3a 100644 --- a/keyboards/ergodox_infinity/readme.md +++ b/keyboards/ergodox_infinity/readme.md @@ -5,15 +5,15 @@ for the left and right halves seperately. To flash them: - Make sure you are in the top-level qmk_firmware directory - - Build the firmware with `make ergodox_infinity-keymapname` + - Build the firmware with `make ergodox_infinity:keymapname` - Plug in the left hand keyboard only. - Press the program button (back of keyboard, above thumb pad). - - Install the firmware with `sudo make ergodox_infinity-keymapname-dfu-util` + - Install the firmware with `sudo make ergodox_infinity:keymapname:dfu-util` - - Build right hand firmware with `make ergodox_infinity-keymapname MASTER=right` + - Build right hand firmware with `make ergodox_infinity:keymapname MASTER=right` - Plug in the right hand keyboard only. -- cgit v1.2.3-24-g4f1b