summaryrefslogtreecommitdiff
path: root/app/include
diff options
context:
space:
mode:
authorCrossR <r.cross@lancaster.ac.uk>2020-08-19 20:53:40 +0100
committerCrossR <r.cross@lancaster.ac.uk>2020-08-19 20:53:40 +0100
commitf8a635aaa0b379d499c0b4c4cd5d7831e1fda7fd (patch)
treeb2adb5a989b2a67360aea46abe0d13ffa02734a9 /app/include
parentdcd36f12e049ee2c423204ebaaa3c16062d9fd5e (diff)
parentebd6fbb2254cfcdd8af6309dd9a5c3251ac19935 (diff)
Merge remote-tracking branch 'upstream/main' into CrossR/Sofle
Diffstat (limited to 'app/include')
-rw-r--r--app/include/zmk/ble.h2
-rw-r--r--app/include/zmk/keymap.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/include/zmk/ble.h b/app/include/zmk/ble.h
index a77237d..e760ed7 100644
--- a/app/include/zmk/ble.h
+++ b/app/include/zmk/ble.h
@@ -3,5 +3,5 @@
#include <zmk/keys.h>
-int zmk_ble_init();
+int zmk_ble_unpair_all();
bool zmk_ble_handle_key_user(struct zmk_key_event *key_event);
diff --git a/app/include/zmk/keymap.h b/app/include/zmk/keymap.h
index 4a6bb37..c1f6393 100644
--- a/app/include/zmk/keymap.h
+++ b/app/include/zmk/keymap.h
@@ -1,6 +1,8 @@
#pragma once
+bool zmk_keymap_layer_active(u8_t layer);
int zmk_keymap_layer_activate(u8_t layer);
int zmk_keymap_layer_deactivate(u8_t layer);
+int zmk_keymap_layer_toggle(u8_t layer);
int zmk_keymap_position_state_changed(u32_t position, bool pressed);