summaryrefslogtreecommitdiff
path: root/app/include
diff options
context:
space:
mode:
Diffstat (limited to 'app/include')
-rw-r--r--app/include/drivers/behavior.h6
-rw-r--r--app/include/zmk/behavior.h8
-rw-r--r--app/include/zmk/ble.h2
-rw-r--r--app/include/zmk/endpoints.h2
-rw-r--r--app/include/zmk/event-manager.h2
-rw-r--r--app/include/zmk/events/battery-state-changed.h2
-rw-r--r--app/include/zmk/events/ble-active-profile-changed.h2
-rw-r--r--app/include/zmk/events/keycode-state-changed.h14
-rw-r--r--app/include/zmk/events/layer-state-changed.h6
-rw-r--r--app/include/zmk/events/position-state-changed.h4
-rw-r--r--app/include/zmk/events/sensor-event.h4
-rw-r--r--app/include/zmk/hid.h18
-rw-r--r--app/include/zmk/keymap.h16
-rw-r--r--app/include/zmk/keys.h12
-rw-r--r--app/include/zmk/matrix_transform.h2
-rw-r--r--app/include/zmk/split/bluetooth/service.h4
-rw-r--r--app/include/zmk/usb.h2
17 files changed, 53 insertions, 53 deletions
diff --git a/app/include/drivers/behavior.h b/app/include/drivers/behavior.h
index 39561a2..d90897d 100644
--- a/app/include/drivers/behavior.h
+++ b/app/include/drivers/behavior.h
@@ -23,7 +23,7 @@
typedef int (*behavior_keymap_binding_callback_t)(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event);
typedef int (*behavior_sensor_keymap_binding_callback_t)(struct zmk_behavior_binding *binding,
- struct device *sensor, s64_t timestamp);
+ struct device *sensor, int64_t timestamp);
__subsystem struct behavior_driver_api {
behavior_keymap_binding_callback_t binding_pressed;
@@ -92,11 +92,11 @@ static inline int z_impl_behavior_keymap_binding_released(struct zmk_behavior_bi
* @retval Negative errno code if failure.
*/
__syscall int behavior_sensor_keymap_binding_triggered(struct zmk_behavior_binding *binding,
- struct device *sensor, s64_t timestamp);
+ struct device *sensor, int64_t timestamp);
static inline int
z_impl_behavior_sensor_keymap_binding_triggered(struct zmk_behavior_binding *binding,
- struct device *sensor, s64_t timestamp) {
+ struct device *sensor, int64_t timestamp) {
struct device *dev = device_get_binding(binding->behavior_dev);
const struct behavior_driver_api *api = (const struct behavior_driver_api *)dev->driver_api;
diff --git a/app/include/zmk/behavior.h b/app/include/zmk/behavior.h
index 428ae24..f00ea4f 100644
--- a/app/include/zmk/behavior.h
+++ b/app/include/zmk/behavior.h
@@ -8,12 +8,12 @@
struct zmk_behavior_binding {
char *behavior_dev;
- u32_t param1;
- u32_t param2;
+ uint32_t param1;
+ uint32_t param2;
};
struct zmk_behavior_binding_event {
int layer;
- u32_t position;
- s64_t timestamp;
+ uint32_t position;
+ int64_t timestamp;
}; \ No newline at end of file
diff --git a/app/include/zmk/ble.h b/app/include/zmk/ble.h
index 90afbda..f6f6e19 100644
--- a/app/include/zmk/ble.h
+++ b/app/include/zmk/ble.h
@@ -12,7 +12,7 @@
int zmk_ble_clear_bonds();
int zmk_ble_prof_next();
int zmk_ble_prof_prev();
-int zmk_ble_prof_select(u8_t index);
+int zmk_ble_prof_select(uint8_t index);
int zmk_ble_active_profile_index();
bt_addr_le_t *zmk_ble_active_profile_addr();
diff --git a/app/include/zmk/endpoints.h b/app/include/zmk/endpoints.h
index c252ef0..05e9954 100644
--- a/app/include/zmk/endpoints.h
+++ b/app/include/zmk/endpoints.h
@@ -18,4 +18,4 @@ int zmk_endpoints_select(enum zmk_endpoint endpoint);
int zmk_endpoints_toggle();
enum zmk_endpoint zmk_endpoints_selected();
-int zmk_endpoints_send_report(u8_t usage_report);
+int zmk_endpoints_send_report(uint8_t usage_report);
diff --git a/app/include/zmk/event-manager.h b/app/include/zmk/event-manager.h
index 4b8f72c..31c5322 100644
--- a/app/include/zmk/event-manager.h
+++ b/app/include/zmk/event-manager.h
@@ -16,7 +16,7 @@ struct zmk_event_type {
struct zmk_event_header {
const struct zmk_event_type *event;
- u8_t last_listener_index;
+ uint8_t last_listener_index;
};
#define ZMK_EV_EVENT_HANDLED 1
diff --git a/app/include/zmk/events/battery-state-changed.h b/app/include/zmk/events/battery-state-changed.h
index a590170..a983820 100644
--- a/app/include/zmk/events/battery-state-changed.h
+++ b/app/include/zmk/events/battery-state-changed.h
@@ -12,7 +12,7 @@
struct battery_state_changed {
struct zmk_event_header header;
// TODO: Other battery channels
- u8_t state_of_charge;
+ uint8_t state_of_charge;
};
ZMK_EVENT_DECLARE(battery_state_changed); \ No newline at end of file
diff --git a/app/include/zmk/events/ble-active-profile-changed.h b/app/include/zmk/events/ble-active-profile-changed.h
index 1e3a198..4491dfc 100644
--- a/app/include/zmk/events/ble-active-profile-changed.h
+++ b/app/include/zmk/events/ble-active-profile-changed.h
@@ -14,7 +14,7 @@
struct ble_active_profile_changed {
struct zmk_event_header header;
- u8_t index;
+ uint8_t index;
struct zmk_ble_profile *profile;
};
diff --git a/app/include/zmk/events/keycode-state-changed.h b/app/include/zmk/events/keycode-state-changed.h
index a0e2436..7dc87e2 100644
--- a/app/include/zmk/events/keycode-state-changed.h
+++ b/app/include/zmk/events/keycode-state-changed.h
@@ -14,19 +14,19 @@
struct keycode_state_changed {
struct zmk_event_header header;
- u8_t usage_page;
- u32_t keycode;
- u8_t implicit_modifiers;
+ uint8_t usage_page;
+ uint32_t keycode;
+ uint8_t implicit_modifiers;
bool state;
- s64_t timestamp;
+ int64_t timestamp;
};
ZMK_EVENT_DECLARE(keycode_state_changed);
static inline struct keycode_state_changed *
-keycode_state_changed_from_encoded(u32_t encoded, bool pressed, s64_t timestamp) {
- u16_t page = HID_USAGE_PAGE(encoded) & 0xFF;
- u16_t id = HID_USAGE_ID(encoded);
+keycode_state_changed_from_encoded(uint32_t encoded, bool pressed, int64_t timestamp) {
+ uint16_t page = HID_USAGE_PAGE(encoded) & 0xFF;
+ uint16_t id = HID_USAGE_ID(encoded);
zmk_mod_flags implicit_mods = SELECT_MODS(encoded);
if (!page) {
diff --git a/app/include/zmk/events/layer-state-changed.h b/app/include/zmk/events/layer-state-changed.h
index dc13ed6..352c602 100644
--- a/app/include/zmk/events/layer-state-changed.h
+++ b/app/include/zmk/events/layer-state-changed.h
@@ -11,14 +11,14 @@
struct layer_state_changed {
struct zmk_event_header header;
- u8_t layer;
+ uint8_t layer;
bool state;
- s64_t timestamp;
+ int64_t timestamp;
};
ZMK_EVENT_DECLARE(layer_state_changed);
-static inline struct layer_state_changed *create_layer_state_changed(u8_t layer, bool state) {
+static inline struct layer_state_changed *create_layer_state_changed(uint8_t layer, bool state) {
struct layer_state_changed *ev = new_layer_state_changed();
ev->layer = layer;
ev->state = state;
diff --git a/app/include/zmk/events/position-state-changed.h b/app/include/zmk/events/position-state-changed.h
index e4cbbbe..7058276 100644
--- a/app/include/zmk/events/position-state-changed.h
+++ b/app/include/zmk/events/position-state-changed.h
@@ -11,9 +11,9 @@
struct position_state_changed {
struct zmk_event_header header;
- u32_t position;
+ uint32_t position;
bool state;
- s64_t timestamp;
+ int64_t timestamp;
};
ZMK_EVENT_DECLARE(position_state_changed); \ No newline at end of file
diff --git a/app/include/zmk/events/sensor-event.h b/app/include/zmk/events/sensor-event.h
index 688f7de..d1d72f4 100644
--- a/app/include/zmk/events/sensor-event.h
+++ b/app/include/zmk/events/sensor-event.h
@@ -12,9 +12,9 @@
struct sensor_event {
struct zmk_event_header header;
- u8_t sensor_number;
+ uint8_t sensor_number;
struct device *sensor;
- s64_t timestamp;
+ int64_t timestamp;
};
ZMK_EVENT_DECLARE(sensor_event); \ No newline at end of file
diff --git a/app/include/zmk/hid.h b/app/include/zmk/hid.h
index 306bc26..1f755aa 100644
--- a/app/include/zmk/hid.h
+++ b/app/include/zmk/hid.h
@@ -19,7 +19,7 @@
#define ZMK_HID_CONSUMER_NKRO_SIZE 6
-static const u8_t zmk_hid_report_desc[] = {
+static const uint8_t zmk_hid_report_desc[] = {
/* USAGE_PAGE (Generic Desktop) */
HID_GI_USAGE_PAGE,
HID_USAGE_GD,
@@ -141,28 +141,28 @@ static const u8_t zmk_hid_report_desc[] = {
// struct zmk_hid_boot_report
// {
-// u8_t modifiers;
-// u8_t _unused;
-// u8_t keys[6];
+// uint8_t modifiers;
+// uint8_t _unused;
+// uint8_t keys[6];
// } __packed;
struct zmk_hid_keyboard_report_body {
zmk_mod_flags modifiers;
- u8_t _reserved;
- u8_t keys[ZMK_HID_KEYBOARD_NKRO_SIZE];
+ uint8_t _reserved;
+ uint8_t keys[ZMK_HID_KEYBOARD_NKRO_SIZE];
} __packed;
struct zmk_hid_keyboard_report {
- u8_t report_id;
+ uint8_t report_id;
struct zmk_hid_keyboard_report_body body;
} __packed;
struct zmk_hid_consumer_report_body {
- u16_t keys[ZMK_HID_CONSUMER_NKRO_SIZE];
+ uint16_t keys[ZMK_HID_CONSUMER_NKRO_SIZE];
} __packed;
struct zmk_hid_consumer_report {
- u8_t report_id;
+ uint8_t report_id;
struct zmk_hid_consumer_report_body body;
} __packed;
diff --git a/app/include/zmk/keymap.h b/app/include/zmk/keymap.h
index 88dc933..7303d4a 100644
--- a/app/include/zmk/keymap.h
+++ b/app/include/zmk/keymap.h
@@ -6,14 +6,14 @@
#pragma once
-typedef u32_t zmk_keymap_layers_state;
+typedef uint32_t zmk_keymap_layers_state;
-u8_t zmk_keymap_layer_default();
+uint8_t zmk_keymap_layer_default();
zmk_keymap_layers_state zmk_keymap_layer_state();
-bool zmk_keymap_layer_active(u8_t layer);
-u8_t zmk_keymap_highest_layer_active();
-int zmk_keymap_layer_activate(u8_t layer);
-int zmk_keymap_layer_deactivate(u8_t layer);
-int zmk_keymap_layer_toggle(u8_t layer);
+bool zmk_keymap_layer_active(uint8_t layer);
+uint8_t zmk_keymap_highest_layer_active();
+int zmk_keymap_layer_activate(uint8_t layer);
+int zmk_keymap_layer_deactivate(uint8_t layer);
+int zmk_keymap_layer_toggle(uint8_t layer);
-int zmk_keymap_position_state_changed(u32_t position, bool pressed, s64_t timestamp);
+int zmk_keymap_position_state_changed(uint32_t position, bool pressed, int64_t timestamp);
diff --git a/app/include/zmk/keys.h b/app/include/zmk/keys.h
index af474b1..27d34b0 100644
--- a/app/include/zmk/keys.h
+++ b/app/include/zmk/keys.h
@@ -9,14 +9,14 @@
#include <zephyr.h>
#include <dt-bindings/zmk/keys.h>
-typedef u32_t zmk_key;
-typedef u8_t zmk_action;
-typedef u8_t zmk_mod;
-typedef u8_t zmk_mod_flags;
+typedef uint32_t zmk_key;
+typedef uint8_t zmk_action;
+typedef uint8_t zmk_mod;
+typedef uint8_t zmk_mod_flags;
struct zmk_key_event {
- u32_t column;
- u32_t row;
+ uint32_t column;
+ uint32_t row;
zmk_key key;
bool pressed;
}; \ No newline at end of file
diff --git a/app/include/zmk/matrix_transform.h b/app/include/zmk/matrix_transform.h
index 29c2afc..413678a 100644
--- a/app/include/zmk/matrix_transform.h
+++ b/app/include/zmk/matrix_transform.h
@@ -6,4 +6,4 @@
#pragma once
-u32_t zmk_matrix_transform_row_column_to_position(u32_t row, u32_t column); \ No newline at end of file
+uint32_t zmk_matrix_transform_row_column_to_position(uint32_t row, uint32_t column); \ No newline at end of file
diff --git a/app/include/zmk/split/bluetooth/service.h b/app/include/zmk/split/bluetooth/service.h
index c2be512..b9f9fc3 100644
--- a/app/include/zmk/split/bluetooth/service.h
+++ b/app/include/zmk/split/bluetooth/service.h
@@ -6,5 +6,5 @@
#pragma once
-int zmk_split_bt_position_pressed(u8_t position);
-int zmk_split_bt_position_released(u8_t position); \ No newline at end of file
+int zmk_split_bt_position_pressed(uint8_t position);
+int zmk_split_bt_position_released(uint8_t position); \ No newline at end of file
diff --git a/app/include/zmk/usb.h b/app/include/zmk/usb.h
index 30461de..62a7e3c 100644
--- a/app/include/zmk/usb.h
+++ b/app/include/zmk/usb.h
@@ -25,5 +25,5 @@ static inline bool zmk_usb_is_powered() { return zmk_usb_get_conn_state() != ZMK
static inline bool zmk_usb_is_hid_ready() { return zmk_usb_get_conn_state() == ZMK_USB_CONN_HID; }
#ifdef CONFIG_ZMK_USB
-int zmk_usb_hid_send_report(const u8_t *report, size_t len);
+int zmk_usb_hid_send_report(const uint8_t *report, size_t len);
#endif /* CONFIG_ZMK_USB */ \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-30 19:11:12 +0000