diff options
| author | Pete Johanson <peter@peterjohanson.com> | 2020-10-02 23:17:55 -0400 |
|---|---|---|
| committer | Pete Johanson <peter@peterjohanson.com> | 2020-10-02 23:17:55 -0400 |
| commit | d3cd791769811619adb8a2f16eec4e94aa6c0a7e (patch) | |
| tree | 4bcd7aa28ccfcd258f87051bb9ad9eadad9425bc | |
| parent | dfb4f1277d66b58de5473c46ed04cf3d7c102b30 (diff) | |
| parent | 091ac414e3f2b875d27e1b9a0b53b831986b286b (diff) | |
Merge branch 'main' of github.com:zmkfirmware/zmk into main
| -rw-r--r-- | app/include/dt-bindings/zmk/keys.h | 5 | ||||
| -rw-r--r-- | app/include/dt-bindings/zmk/kscan-mock.h | 6 | ||||
| -rw-r--r-- | app/include/dt-bindings/zmk/matrix-transform.h | 5 | ||||
| -rw-r--r-- | app/include/dt-bindings/zmk/rgb.h | 5 | ||||
| -rw-r--r-- | app/include/zmk/split/bluetooth/service.h | 6 | ||||
| -rw-r--r-- | app/include/zmk/split/bluetooth/uuid.h | 6 |
6 files changed, 33 insertions, 0 deletions
diff --git a/app/include/dt-bindings/zmk/keys.h b/app/include/dt-bindings/zmk/keys.h index d3dd634..a3b2229 100644 --- a/app/include/dt-bindings/zmk/keys.h +++ b/app/include/dt-bindings/zmk/keys.h @@ -1,3 +1,8 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ #pragma once diff --git a/app/include/dt-bindings/zmk/kscan-mock.h b/app/include/dt-bindings/zmk/kscan-mock.h index d481899..eff218b 100644 --- a/app/include/dt-bindings/zmk/kscan-mock.h +++ b/app/include/dt-bindings/zmk/kscan-mock.h @@ -1,3 +1,9 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + #pragma once #define ZMK_MOCK_IS_PRESS(v) ((v & (0x01 << 31)) != 0) diff --git a/app/include/dt-bindings/zmk/matrix-transform.h b/app/include/dt-bindings/zmk/matrix-transform.h index 4fd3e6c..2989cb6 100644 --- a/app/include/dt-bindings/zmk/matrix-transform.h +++ b/app/include/dt-bindings/zmk/matrix-transform.h @@ -1,3 +1,8 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ #define KT_ROW(item) (item >> 8) #define KT_COL(item) (item & 0xFF) diff --git a/app/include/dt-bindings/zmk/rgb.h b/app/include/dt-bindings/zmk/rgb.h index c2efda8..eb72180 100644 --- a/app/include/dt-bindings/zmk/rgb.h +++ b/app/include/dt-bindings/zmk/rgb.h @@ -1,3 +1,8 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ #define RGB_TOG 0 #define RGB_HUI 1 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> |