diff options
| author | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-03-24 08:22:21 +0100 |
|---|---|---|
| committer | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-03-24 08:22:21 +0100 |
| commit | 8b883c797fc043def3abe5c367cb9d9a6f11f8fb (patch) | |
| tree | fa0d91fd40de1db1ab744bce880a4cbe2bbc8b5e /tmk_core/common | |
| parent | 55fa66428ca9b75106b8a296ea6095f7b80cc109 (diff) | |
| parent | ba058f8b81132bf64b1aa263779629b8a6c18c23 (diff) | |
| download | firmware-8b883c797fc043def3abe5c367cb9d9a6f11f8fb.tar.gz firmware-8b883c797fc043def3abe5c367cb9d9a6f11f8fb.tar.bz2 firmware-8b883c797fc043def3abe5c367cb9d9a6f11f8fb.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
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 d5fc051bf..2e18dc2af 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 85415df71..0b013fc98 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 } |