Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
This commit is contained in:
commit
2186e5ae85
File diff suppressed because it is too large
Load Diff
After Width: | Height: | Size: 860 KiB |
|
@ -1,9 +1,16 @@
|
||||||
|
<<<<<<< HEAD
|
||||||
Maxipad keyboard firmware
|
Maxipad keyboard firmware
|
||||||
======================
|
======================
|
||||||
|
|
||||||
## Quantum MK Firmware
|
## Quantum MK Firmware
|
||||||
|
|
||||||
For the full Quantum feature list, see [the parent readme.md](/readme.md).
|
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
|
## 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.
|
Depending on which keymap you would like to use, you will have to compile slightly differently.
|
||||||
|
|
||||||
### Default
|
### Default
|
||||||
|
<<<<<<< HEAD
|
||||||
To build with the default keymap, simply run `make default`.
|
To build with the default keymap, simply run `make default`.
|
||||||
|
=======
|
||||||
|
|
||||||
|
To build with the default keymap, simply run `make`.
|
||||||
|
|
||||||
|
>>>>>>> a06115df19a74d39b08758472b221e630c3680d3
|
||||||
|
|
||||||
### Other Keymaps
|
### 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.
|
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:
|
To build the firmware binary hex file with a keymap just do `make` with a keymap like this:
|
||||||
|
|
||||||
```
|
```
|
||||||
$ make [default|jack|<name>]
|
$ make [default|jack|<name>]
|
||||||
```
|
```
|
||||||
Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
|
<<<<<<< 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
|
||||||
|
|
|
@ -310,7 +310,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
|
||||||
// Unselect row
|
// Unselect row
|
||||||
unselect_row(current_row);
|
unselect_row(current_row);
|
||||||
|
|
||||||
return (last_row_value == current_matrix[current_row]);
|
return (last_row_value != current_matrix[current_row]);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void select_row(uint8_t row)
|
static void select_row(uint8_t row)
|
||||||
|
|
Loading…
Reference in New Issue