drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge branch 'rn42' into merge_rn42

Browse source 
Conflicts:
	.gitignore
	common.mk
	common/debug_config.h
	common/print.h
This commit is contained in:
tmk 2014-11-24 13:50:33 +09:00
commit 363950982a
92 changed files with 4461 additions and 401 deletions
Download patch file Download diff file Expand all files Collapse all files

3
common/keyboard.c
View file

@ -15,7 +15,6 @@ 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 <stdint.h>
#include <util/delay.h>
#include "keyboard.h"
#include "matrix.h"
#include "keymap.h"
@ -107,7 +106,7 @@ void keyboard_task(void)
for (uint8_t c = 0; c < MATRIX_COLS; c++) {
if (matrix_change & ((matrix_row_t)1<<c)) {
action_exec((keyevent_t){
.key = (key_t){ .row = r, .col = c },
.key = (keypos_t){ .row = r, .col = c },
.pressed = (matrix_row & ((matrix_row_t)1<<c)),
.time = (timer_read() | 1) /* time should not be 0 */
});