diff options
author | Jack Humbert <jack.humb@gmail.com> | 2017-01-26 01:28:44 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-26 01:28:44 -0500 |
commit | aac7c0aa4db6b27f4c8d8f3849f8fd41f07e892a (patch) | |
tree | 4cae966728b7b6baf101a7ab2b95eeff16cce141 /keyboards | |
parent | 0212a30aa67771b3c5a59f0201356b6efd83cce5 (diff) | |
parent | 9111cc00f587188c68d3ed0379aae6675ad8d377 (diff) | |
download | qmk_firmware-aac7c0aa4db6b27f4c8d8f3849f8fd41f07e892a.tar.gz qmk_firmware-aac7c0aa4db6b27f4c8d8f3849f8fd41f07e892a.zip |
Merge pull request #1029 from SjB/qmk_infinity60
fix: infinity60 keyboard was not using quantum features.
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/infinity60/infinity60.c | 15 | ||||
-rw-r--r-- | keyboards/infinity60/keymaps/default/keymap.c | 9 | ||||
-rwxr-xr-x | keyboards/infinity60/keymaps/depariel/keymap.c | 9 | ||||
-rw-r--r-- | keyboards/infinity60/keymaps/hasu/keymap.c | 10 | ||||
-rw-r--r-- | keyboards/infinity60/matrix.c | 3 |
5 files changed, 46 insertions, 0 deletions
diff --git a/keyboards/infinity60/infinity60.c b/keyboards/infinity60/infinity60.c index e471250feb..fdeed5124d 100644 --- a/keyboards/infinity60/infinity60.c +++ b/keyboards/infinity60/infinity60.c @@ -15,3 +15,18 @@ 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 "infinity60.h" + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + matrix_init_user(); +} + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + + matrix_scan_user(); +} + diff --git a/keyboards/infinity60/keymaps/default/keymap.c b/keyboards/infinity60/keymaps/default/keymap.c index 4434128579..8347c94b48 100644 --- a/keyboards/infinity60/keymaps/default/keymap.c +++ b/keyboards/infinity60/keymaps/default/keymap.c @@ -46,3 +46,12 @@ const uint16_t fn_actions[] = { }; +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { + +}; + +// Runs constantly in the background, in a loop. +void matrix_scan_user(void) { + +}; diff --git a/keyboards/infinity60/keymaps/depariel/keymap.c b/keyboards/infinity60/keymaps/depariel/keymap.c index 7412b9b9dd..57f9487f22 100755 --- a/keyboards/infinity60/keymaps/depariel/keymap.c +++ b/keyboards/infinity60/keymaps/depariel/keymap.c @@ -80,3 +80,12 @@ const uint16_t PROGMEM fn_actions[] = { }; +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { + +}; + +// Runs constantly in the background, in a loop. +void matrix_scan_user(void) { + +}; diff --git a/keyboards/infinity60/keymaps/hasu/keymap.c b/keyboards/infinity60/keymaps/hasu/keymap.c index d3728869ab..9982078c19 100644 --- a/keyboards/infinity60/keymaps/hasu/keymap.c +++ b/keyboards/infinity60/keymaps/hasu/keymap.c @@ -111,3 +111,13 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t fn_actions[] = { }; + +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { + +}; + +// Runs constantly in the background, in a loop. +void matrix_scan_user(void) { + +}; diff --git a/keyboards/infinity60/matrix.c b/keyboards/infinity60/matrix.c index d2f1852885..b6ccf86c3a 100644 --- a/keyboards/infinity60/matrix.c +++ b/keyboards/infinity60/matrix.c @@ -62,6 +62,8 @@ void matrix_init(void) #endif memset(matrix, 0, MATRIX_ROWS); memset(matrix_debouncing, 0, MATRIX_ROWS); + + matrix_init_quantum(); } uint8_t matrix_scan(void) @@ -146,6 +148,7 @@ uint8_t matrix_scan(void) } debouncing = false; } + matrix_scan_quantum(); return 1; } |