Browse Source

Merge branch 'main' of github.com:zmkfirmware/zmk into main

xmkb
Pete Johanson 4 years ago
parent
commit
d3cd791769
  1. 5
      app/include/dt-bindings/zmk/keys.h
  2. 6
      app/include/dt-bindings/zmk/kscan-mock.h
  3. 5
      app/include/dt-bindings/zmk/matrix-transform.h
  4. 5
      app/include/dt-bindings/zmk/rgb.h
  5. 6
      app/include/zmk/split/bluetooth/service.h
  6. 6
      app/include/zmk/split/bluetooth/uuid.h

5
app/include/dt-bindings/zmk/keys.h

@ -1,3 +1,8 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once #pragma once

6
app/include/dt-bindings/zmk/kscan-mock.h

@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once #pragma once
#define ZMK_MOCK_IS_PRESS(v) ((v & (0x01 << 31)) != 0) #define ZMK_MOCK_IS_PRESS(v) ((v & (0x01 << 31)) != 0)

5
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_ROW(item) (item >> 8)
#define KT_COL(item) (item & 0xFF) #define KT_COL(item) (item & 0xFF)

5
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_TOG 0
#define RGB_HUI 1 #define RGB_HUI 1

6
app/include/zmk/split/bluetooth/service.h

@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once #pragma once
int zmk_split_bt_position_pressed(u8_t position); int zmk_split_bt_position_pressed(u8_t position);

6
app/include/zmk/split/bluetooth/uuid.h

@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once #pragma once
#include <bluetooth/uuid.h> #include <bluetooth/uuid.h>

Loading…
Cancel
Save