diff options
author | Fred Sundvik <fsundvik@gmail.com> | 2016-08-27 23:14:27 +0300 |
---|---|---|
committer | Fred Sundvik <fsundvik@gmail.com> | 2016-08-27 23:55:33 +0300 |
commit | 8ab9c5c55a0f90266b1c70e40fc034065ad027de (patch) | |
tree | e3488612b8e452ee44f28b271f001009e27350a5 /keyboards | |
parent | f815b4871ebc5cc2f8d1a306eceec68c0a973a4c (diff) | |
download | qmk_firmware-8ab9c5c55a0f90266b1c70e40fc034065ad027de.tar.gz qmk_firmware-8ab9c5c55a0f90266b1c70e40fc034065ad027de.zip |
Rename infinity_chibios to infinity60, and add readme
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/infinity60/MEMO.txt (renamed from keyboards/infinity_chibios/MEMO.txt) | 0 | ||||
-rw-r--r-- | keyboards/infinity60/Makefile (renamed from keyboards/infinity_chibios/Makefile) | 0 | ||||
-rw-r--r-- | keyboards/infinity60/bootloader_defs.h (renamed from keyboards/infinity_chibios/bootloader_defs.h) | 0 | ||||
-rw-r--r-- | keyboards/infinity60/chconf.h (renamed from keyboards/infinity_chibios/chconf.h) | 0 | ||||
-rw-r--r-- | keyboards/infinity60/config.h (renamed from keyboards/infinity_chibios/config.h) | 9 | ||||
-rw-r--r-- | keyboards/infinity60/halconf.h (renamed from keyboards/infinity_chibios/halconf.h) | 0 | ||||
-rw-r--r-- | keyboards/infinity60/infinity60.c (renamed from keyboards/infinity_chibios/infinity_chibios.c) | 2 | ||||
-rw-r--r-- | keyboards/infinity60/infinity60.h (renamed from keyboards/infinity_chibios/infinity_chibios.h) | 0 | ||||
-rw-r--r-- | keyboards/infinity60/keymaps/default/keymap.c (renamed from keyboards/infinity_chibios/keymaps/default/keymap.c) | 2 | ||||
-rwxr-xr-x | keyboards/infinity60/keymaps/depariel/keymap.c (renamed from keyboards/infinity_chibios/keymaps/depariel/keymap.c) | 2 | ||||
-rw-r--r-- | keyboards/infinity60/keymaps/hasu/keymap.c (renamed from keyboards/infinity_chibios/keymaps/hasu/keymap.c) | 2 | ||||
-rw-r--r-- | keyboards/infinity60/led.c (renamed from keyboards/infinity_chibios/led.c) | 0 | ||||
-rw-r--r-- | keyboards/infinity60/matrix.c (renamed from keyboards/infinity_chibios/matrix.c) | 0 | ||||
-rw-r--r-- | keyboards/infinity60/mcuconf.h (renamed from keyboards/infinity_chibios/mcuconf.h) | 0 | ||||
-rw-r--r-- | keyboards/infinity60/readme.md | 29 | ||||
-rw-r--r-- | keyboards/infinity60/rules.mk (renamed from keyboards/infinity_chibios/rules.mk) | 0 |
16 files changed, 37 insertions, 9 deletions
diff --git a/keyboards/infinity_chibios/MEMO.txt b/keyboards/infinity60/MEMO.txt index e2886aa002..e2886aa002 100644 --- a/keyboards/infinity_chibios/MEMO.txt +++ b/keyboards/infinity60/MEMO.txt diff --git a/keyboards/infinity_chibios/Makefile b/keyboards/infinity60/Makefile index 4e2a6f00fd..4e2a6f00fd 100644 --- a/keyboards/infinity_chibios/Makefile +++ b/keyboards/infinity60/Makefile diff --git a/keyboards/infinity_chibios/bootloader_defs.h b/keyboards/infinity60/bootloader_defs.h index c67153be60..c67153be60 100644 --- a/keyboards/infinity_chibios/bootloader_defs.h +++ b/keyboards/infinity60/bootloader_defs.h diff --git a/keyboards/infinity_chibios/chconf.h b/keyboards/infinity60/chconf.h index 43c845739a..43c845739a 100644 --- a/keyboards/infinity_chibios/chconf.h +++ b/keyboards/infinity60/chconf.h diff --git a/keyboards/infinity_chibios/config.h b/keyboards/infinity60/config.h index 452cc2a9fb..f8346fe165 100644 --- a/keyboards/infinity_chibios/config.h +++ b/keyboards/infinity60/config.h @@ -26,11 +26,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define DEVICE_VER 0x0001 /* in python2: list(u"whatever".encode('utf-16-le')) */ /* at most 32 characters or the ugly hack in usb_main.c borks */ -#define MANUFACTURER "TMK" -#define USBSTR_MANUFACTURER 'T', '\x00', 'M', '\x00', 'K', '\x00', ' ', '\x00', '\xc6', '\x00' -#define PRODUCT "Infinity keyboard/TMK" -#define USBSTR_PRODUCT 'I', '\x00', 'n', '\x00', 'f', '\x00', 'i', '\x00', 'n', '\x00', 'i', '\x00', 't', '\x00', 'y', '\x00', ' ', '\x00', 'k', '\x00', 'e', '\x00', 'y', '\x00', 'b', '\x00', 'o', '\x00', 'a', '\x00', 'r', '\x00', 'd', '\x00', '/', '\x00', 'T', '\x00', 'M', '\x00', 'K', '\x00' - +#define MANUFACTURER "Input Club" +#define USBSTR_MANUFACTURER 'I', '\x00', 'n', '\x00', 'p', '\x00', 'u', '\x00', 't', '\x00', ' ', '\x00', 'C', '\x00', 'l', '\x00', 'u', '\x00', 'b', '\x00' +#define PRODUCT "Infinity keyboard/QMK" +#define USBSTR_PRODUCT 'I', '\x00', 'n', '\x00', 'f', '\x00', 'i', '\x00', 'n', '\x00', 'i', '\x00', 't', '\x00', 'y', '\x00', ' ', '\x00', 'k', '\x00', 'e', '\x00', 'y', '\x00', 'b', '\x00', 'o', '\x00', 'a', '\x00', 'r', '\x00', 'd', '\x00', '/', '\x00', 'Q', '\x00', 'M', '\x00', 'K', '\x00' /* key matrix size */ #define MATRIX_ROWS 9 #define MATRIX_COLS 7 diff --git a/keyboards/infinity_chibios/halconf.h b/keyboards/infinity60/halconf.h index 46b37a4f46..46b37a4f46 100644 --- a/keyboards/infinity_chibios/halconf.h +++ b/keyboards/infinity60/halconf.h diff --git a/keyboards/infinity_chibios/infinity_chibios.c b/keyboards/infinity60/infinity60.c index 845eda01b0..e471250feb 100644 --- a/keyboards/infinity_chibios/infinity_chibios.c +++ b/keyboards/infinity60/infinity60.c @@ -14,4 +14,4 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "infinity_chibios.h" +#include "infinity60.h" diff --git a/keyboards/infinity_chibios/infinity_chibios.h b/keyboards/infinity60/infinity60.h index f1ba15e489..f1ba15e489 100644 --- a/keyboards/infinity_chibios/infinity_chibios.h +++ b/keyboards/infinity60/infinity60.h diff --git a/keyboards/infinity_chibios/keymaps/default/keymap.c b/keyboards/infinity60/keymaps/default/keymap.c index 5f3b46a367..4434128579 100644 --- a/keyboards/infinity_chibios/keymaps/default/keymap.c +++ b/keyboards/infinity60/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -#include "infinity_chibios.h" +#include "infinity60.h" const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer 0: Default Layer diff --git a/keyboards/infinity_chibios/keymaps/depariel/keymap.c b/keyboards/infinity60/keymaps/depariel/keymap.c index e68891f79e..7412b9b9dd 100755 --- a/keyboards/infinity_chibios/keymaps/depariel/keymap.c +++ b/keyboards/infinity60/keymaps/depariel/keymap.c @@ -1,4 +1,4 @@ -#include "infinity_chibios.h" +#include "infinity60.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer 0: Default Layer diff --git a/keyboards/infinity_chibios/keymaps/hasu/keymap.c b/keyboards/infinity60/keymaps/hasu/keymap.c index a1954d2587..d3728869ab 100644 --- a/keyboards/infinity_chibios/keymaps/hasu/keymap.c +++ b/keyboards/infinity60/keymaps/hasu/keymap.c @@ -1,4 +1,4 @@ -#include "infinity_chibios.h" +#include "infinity60.h" const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer 0: Default Layer diff --git a/keyboards/infinity_chibios/led.c b/keyboards/infinity60/led.c index aed66c7c03..aed66c7c03 100644 --- a/keyboards/infinity_chibios/led.c +++ b/keyboards/infinity60/led.c diff --git a/keyboards/infinity_chibios/matrix.c b/keyboards/infinity60/matrix.c index 62c165aa53..62c165aa53 100644 --- a/keyboards/infinity_chibios/matrix.c +++ b/keyboards/infinity60/matrix.c diff --git a/keyboards/infinity_chibios/mcuconf.h b/keyboards/infinity60/mcuconf.h index f453304b75..f453304b75 100644 --- a/keyboards/infinity_chibios/mcuconf.h +++ b/keyboards/infinity60/mcuconf.h diff --git a/keyboards/infinity60/readme.md b/keyboards/infinity60/readme.md new file mode 100644 index 0000000000..97457b4077 --- /dev/null +++ b/keyboards/infinity60/readme.md @@ -0,0 +1,29 @@ +Infinity 60% keyboard firmware +====================== + +## Quantum MK Firmware + +For the full Quantum feature list, see [the parent readme](/). + +## Keymaps + +Several versions of keymaps are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files. + +Keymaps follow the format **__keymap.c__** and are stored in folders in the `keymaps` folder, eg `keymaps/my_keymap/` + + +## Compiling + +Download or clone the whole firmware and navigate to the keyboards/infinity60 folder. Once your dev env is setup, you'll be able to use the `make` command to both compile your keymap and flash it to your keyboard. + +To just compile, which generates the output files in the `.build` folder at the root of the repository, run `make keymap`, where keymap is the name of the keymap that you want to compile. + +## Flashing + +To flash the firmware to the keyboard + +1. First press the flash button on the bottom of the keyboard. If you already have a flah button mapped in a keyboard layout running on the keyboard, you can also use that. +2. Then run `make keymap-dfu-util`, where keymap is the name of the keymap you want to flash. On Linux based operating systems you might need to run the comamnd as root, for example `sudo make keymap-dfu-util` on Ubuntu. + +**Tip** `make keymap-dfu-util` will also compile the keymap if needed, so you can skip the compilation step if you want to. + diff --git a/keyboards/infinity_chibios/rules.mk b/keyboards/infinity60/rules.mk index 56d6470b59..56d6470b59 100644 --- a/keyboards/infinity_chibios/rules.mk +++ b/keyboards/infinity60/rules.mk |