diff options
| author | climbalima <climbalima@gmail.com> | 2016-12-03 17:01:26 -0500 |
|---|---|---|
| committer | climbalima <climbalima@gmail.com> | 2016-12-03 17:01:26 -0500 |
| commit | 2186e5ae85aa4cda798b36fd7883d893944ae8a3 (patch) | |
| tree | 8e3c32e2c1f67ee95ae87a63dc158f53a9f27b1c /keyboards/maxipad | |
| parent | 01736a502e8f2900bde229a086a4ab03513f6781 (diff) | |
| parent | a06115df19a74d39b08758472b221e630c3680d3 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboards/maxipad')
| -rw-r--r-- | keyboards/maxipad/readme.md | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/keyboards/maxipad/readme.md b/keyboards/maxipad/readme.md index 4e1702c5ad..606bacd75d 100644 --- a/keyboards/maxipad/readme.md +++ b/keyboards/maxipad/readme.md @@ -1,9 +1,16 @@ +<<<<<<< HEAD Maxipad keyboard firmware ====================== ## Quantum MK Firmware For the full Quantum feature list, see [the parent readme.md](/readme.md). +======= +## Quantum MK Firmware + +For the full Quantum feature list, see [the parent readme](/). + +>>>>>>> a06115df19a74d39b08758472b221e630c3680d3 ## Building @@ -14,14 +21,31 @@ Download or clone the whole firmware and navigate to the keyboards/maxipad folde Depending on which keymap you would like to use, you will have to compile slightly differently. ### Default +<<<<<<< HEAD To build with the default keymap, simply run `make default`. +======= + +To build with the default keymap, simply run `make`. + +>>>>>>> a06115df19a74d39b08758472b221e630c3680d3 ### Other Keymaps Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `<name>.c` and see keymap document (you can find in top readme.md) and existent keymap files. +<<<<<<< HEAD +======= +Several version of keymap 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. + +>>>>>>> a06115df19a74d39b08758472b221e630c3680d3 To build the firmware binary hex file with a keymap just do `make` with a keymap like this: ``` $ make [default|jack|<name>] ``` -Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
\ No newline at end of file +<<<<<<< HEAD +Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder. +======= + +Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder. + +>>>>>>> a06115df19a74d39b08758472b221e630c3680d3 |