diff options
| author | Mubeen Khan <mubeen@mubeen.co> | 2020-10-10 16:32:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-10 16:32:16 -0500 |
| commit | 4fd6c14ae93ab1b2db1a6a4fac5df4a595a041bf (patch) | |
| tree | 064f9890c09322b432cf104d080b0385bbaf1c43 /app/include/zmk | |
| parent | 16df1522c282343c3350402360db918a9a1b66e5 (diff) | |
| parent | fc6c01fd6941ec795710d66ead9e17d5dfbaa19d (diff) | |
Merge pull request #4 from zmkfirmware/main
make even with main
Diffstat (limited to 'app/include/zmk')
| -rw-r--r-- | app/include/zmk/split/bluetooth/service.h | 6 | ||||
| -rw-r--r-- | app/include/zmk/split/bluetooth/uuid.h | 6 | ||||
| -rw-r--r-- | app/include/zmk/usb.h (renamed from app/include/zmk/usb_hid.h) | 4 |
3 files changed, 15 insertions, 1 deletions
diff --git a/app/include/zmk/split/bluetooth/service.h b/app/include/zmk/split/bluetooth/service.h index 954e0cd..c2be512 100644 --- a/app/include/zmk/split/bluetooth/service.h +++ b/app/include/zmk/split/bluetooth/service.h @@ -1,3 +1,9 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + #pragma once int zmk_split_bt_position_pressed(u8_t position); diff --git a/app/include/zmk/split/bluetooth/uuid.h b/app/include/zmk/split/bluetooth/uuid.h index a8dfbf6..a31884d 100644 --- a/app/include/zmk/split/bluetooth/uuid.h +++ b/app/include/zmk/split/bluetooth/uuid.h @@ -1,3 +1,9 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + #pragma once #include <bluetooth/uuid.h> diff --git a/app/include/zmk/usb_hid.h b/app/include/zmk/usb.h index 7ee2629..452fd54 100644 --- a/app/include/zmk/usb_hid.h +++ b/app/include/zmk/usb.h @@ -12,6 +12,8 @@ #include <zmk/keys.h> #include <zmk/hid.h> -int zmk_usb_hid_init(); +enum usb_dc_status_code zmk_usb_get_status(); +#ifdef CONFIG_ZMK_USB int zmk_usb_hid_send_report(u8_t *report, size_t len); +#endif /* CONFIG_ZMK_USB */
\ No newline at end of file |