diff options
| author | Alex Johnstone <alexjj@gmail.com> | 2016-03-25 11:16:33 -0700 |
|---|---|---|
| committer | Alex Johnstone <alexjj@gmail.com> | 2016-03-25 11:16:33 -0700 |
| commit | 2d9037491271677f6642ec162b6a8be3ebb47e78 (patch) | |
| tree | d3847db7e2b68c11f704e9635bc832ac7ec7a1e9 /tmk_core/common | |
| parent | fb6dc7499f51688ec245826842300780273203c6 (diff) | |
| parent | c9aec8bc246fe45a6486a5ef7a9ef1302e4e16ad (diff) | |
| download | qmk_firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.tar.gz qmk_firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.zip | |
Merge pull request #3 from jackhumbert/master
Pull upstream
Diffstat (limited to 'tmk_core/common')
| -rw-r--r-- | tmk_core/common/led.h | 5 | ||||
| -rw-r--r-- | tmk_core/common/matrix.h | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tmk_core/common/led.h b/tmk_core/common/led.h index d5fc051bf5..2e18dc2afa 100644 --- a/tmk_core/common/led.h +++ b/tmk_core/common/led.h @@ -34,8 +34,11 @@ extern "C" { void led_set(uint8_t usb_led); +/* keyboard-specific LED functionality */ +void led_set_kb(uint8_t usb_led); + #ifdef __cplusplus } #endif -#endif +#endif
\ No newline at end of file diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h index 85415df719..0b013fc989 100644 --- a/tmk_core/common/matrix.h +++ b/tmk_core/common/matrix.h @@ -64,8 +64,8 @@ void matrix_power_up(void); void matrix_power_down(void); /* keyboard-specific setup/loop functionality */ -void * matrix_init_kb(void); -void * matrix_scan_kb(void); +void matrix_init_kb(void); +void matrix_scan_kb(void); #ifdef __cplusplus } |