diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-06-29 16:21:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-29 16:21:41 -0400 |
| commit | 215c2119af5281072d5a6efb0308408793cadd08 (patch) | |
| tree | 995bb9788a4f40b835d7713af3eb3015e9f43689 /quantum/matrix.c | |
| parent | 755b17f8fc0f484261108f912af38430b27e9c95 (diff) | |
| download | qmk_firmware-215c2119af5281072d5a6efb0308408793cadd08.tar.gz qmk_firmware-215c2119af5281072d5a6efb0308408793cadd08.zip | |
Implements subprojects and updates projects for this (#459)
* non-working commit
* working
* subprojects implemented for planck
* pass a subproject variable through to c
* consolidates clueboard revisions
* thanks for letting me know about conflicts..
* turn off audio for yang's
* corrects starting paths for subprojects
* messing around with travis
* semicolon
* travis script
* travis script
* script for travis
* correct directory (probably), amend files to commit
* remove origin before adding
* git pull, correct syntax
* git checkout
* git pull origin branch
* where are we?
* where are we?
* merging
* force things to happen
* adds commit message, adds add
* rebase, no commit message
* rebase branch
* idk!
* try just pull
* fetch - merge
* specify repo branch
* checkout
* goddammit
* merge? idk
* pls
* after all
* don't split up keyboards
* syntax
* adds quick for all-keyboards
* trying out new script
* script update
* lowercase
* all keyboards
* stop replacing compiled.hex automatically
* adds if statement
* skip automated build branches
* forces push to automated build branch
* throw an add in there
* upstream?
* adds AUTOGEN
* ignore all .hex files again
* testing out new repo
* global ident
* generate script, keyboard_keymap.hex
* skip generation for now, print pandoc info, submodule update
* try trusty
* and sudo
* try generate
* updates subprojects to keyboards
* no idea
* updates to keyboards
* cleans up clueboard stuff
* setup to use local readme
* updates cluepad, planck experimental
* remove extra led.c [ci skip]
* disable power up for now
* config files updates
* makefile updates
* .h file updates, config tuning
* disable audio for yang
Diffstat (limited to 'quantum/matrix.c')
| -rw-r--r-- | quantum/matrix.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/quantum/matrix.c b/quantum/matrix.c index 6e9f92727..f5744658c 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c | |||
| @@ -86,29 +86,29 @@ uint8_t matrix_cols(void) { | |||
| 86 | return MATRIX_COLS; | 86 | return MATRIX_COLS; |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | void matrix_power_up(void) { | 89 | // void matrix_power_up(void) { |
| 90 | #if DIODE_DIRECTION == COL2ROW | 90 | // #if DIODE_DIRECTION == COL2ROW |
| 91 | for (int8_t r = MATRIX_ROWS - 1; r >= 0; --r) { | 91 | // for (int8_t r = MATRIX_ROWS - 1; r >= 0; --r) { |
| 92 | /* DDRxn */ | 92 | // /* DDRxn */ |
| 93 | _SFR_IO8((row_pins[r] >> 4) + 1) |= _BV(row_pins[r] & 0xF); | 93 | // _SFR_IO8((row_pins[r] >> 4) + 1) |= _BV(row_pins[r] & 0xF); |
| 94 | toggle_row(r); | 94 | // toggle_row(r); |
| 95 | } | 95 | // } |
| 96 | for (int8_t c = MATRIX_COLS - 1; c >= 0; --c) { | 96 | // for (int8_t c = MATRIX_COLS - 1; c >= 0; --c) { |
| 97 | /* PORTxn */ | 97 | // /* PORTxn */ |
| 98 | _SFR_IO8((col_pins[c] >> 4) + 2) |= _BV(col_pins[c] & 0xF); | 98 | // _SFR_IO8((col_pins[c] >> 4) + 2) |= _BV(col_pins[c] & 0xF); |
| 99 | } | 99 | // } |
| 100 | #else | 100 | // #else |
| 101 | for (int8_t c = MATRIX_COLS - 1; c >= 0; --c) { | 101 | // for (int8_t c = MATRIX_COLS - 1; c >= 0; --c) { |
| 102 | /* DDRxn */ | 102 | // /* DDRxn */ |
| 103 | _SFR_IO8((col_pins[c] >> 4) + 1) |= _BV(col_pins[c] & 0xF); | 103 | // _SFR_IO8((col_pins[c] >> 4) + 1) |= _BV(col_pins[c] & 0xF); |
| 104 | toggle_col(c); | 104 | // toggle_col(c); |
| 105 | } | 105 | // } |
| 106 | for (int8_t r = MATRIX_ROWS - 1; r >= 0; --r) { | 106 | // for (int8_t r = MATRIX_ROWS - 1; r >= 0; --r) { |
| 107 | /* PORTxn */ | 107 | // /* PORTxn */ |
| 108 | _SFR_IO8((row_pins[r] >> 4) + 2) |= _BV(row_pins[r] & 0xF); | 108 | // _SFR_IO8((row_pins[r] >> 4) + 2) |= _BV(row_pins[r] & 0xF); |
| 109 | } | 109 | // } |
| 110 | #endif | 110 | // #endif |
| 111 | } | 111 | // } |
| 112 | 112 | ||
| 113 | void matrix_init(void) { | 113 | void matrix_init(void) { |
| 114 | /* frees PORTF by setting the JTD bit twice within four cycles */ | 114 | /* frees PORTF by setting the JTD bit twice within four cycles */ |