kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Back in Action!!

Browse source
This commit is contained in:
Retic1337 2021-09-26 21:08:14 -07:00
parent 2cfd0720d5
commit 88943b0aee
7 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/CMakeLists.txt
View file

@ -76,7 +76,7 @@ target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/rgb_underglow.c)
target_sources(app PRIVATE src/endpoints.c) target_sources(app PRIVATE src/endpoints.c)
target_sources(app PRIVATE src/hid_listener.c) target_sources(app PRIVATE src/hid_listener.c)
target_sources(app PRIVATE src/main.c) target_sources(app PRIVATE src/main.c)
target_sources_ifdef(CONFIG_IS31FL3733 app PRIVATE src/led_perkey.c)
add_subdirectory(src/display/) add_subdirectory(src/display/)
zephyr_cc_option(-Wfatal-errors) zephyr_cc_option(-Wfatal-errors)

8
app/drivers/gpio/CMakeLists.txt Normal file
View file

@ -0,0 +1,8 @@
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT
zephyr_library_named(zmk__drivers__gpio)
zephyr_library_include_directories(${CMAKE_SOURCE_DIR}/include)
zephyr_library_sources_ifdef(CONFIG_GPIO_MCP23017 gpio_mcp23017.c)
zephyr_library_sources_ifndef(CONFIG_GPIO_MCP23017 ${ZEPHYR_BASE}/misc/empty_file.c)

14
app/drivers/led/CMakeLists.txt
View file

@ -1,16 +1,8 @@
# Copyright (c) 2020 The ZMK Contributors # Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
<<<<<<< Updated upstream zephyr_library()
<<<<<<< Updated upstream
=======
#zephyr_library()
#zephyr_library_sources(led.c) zephyr_library_sources(led.c)
>>>>>>> Stashed changes
=======
#zephyr_library()
#zephyr_library_sources(led.c)
>>>>>>> Stashed changes
add_subdirectory_ifdef(CONFIG_IS31FL3733 is31fl3733) add_subdirectory_ifdef(CONFIG_IS31FL3733 is31fl3733)

0
app/drivers/led/led.c Normal file
View file

9
app/include/zmk/led_perkey.h Normal file
View file

@ -0,0 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once
int led_perkey_init(char *name);

7
app/src/led_perkey.c
View file

@ -80,11 +80,8 @@ void zmk_kscan_process_msgxq(struct k_work *item) {
else{ else{
set_led_rgb(led_lookup_matrix[position], led_base_color); set_led_rgb(led_lookup_matrix[position], led_base_color);
} }
pos_evx = new_position_state_changed(); ZMK_EVENT_RAISE(new_zmk_position_state_changed((struct zmk_position_state_changed){
pos_evx->state = pressed; .state = pressed, .position = position, .timestamp = k_uptime_get()}));
pos_evx->position = position;
pos_evx->timestamp = k_uptime_get();
ZMK_EVENT_RAISE(pos_evx);
} }
} }
void set_all_on(const struct device *dev){ void set_all_on(const struct device *dev){

5
app/src/main.c
View file

@ -16,6 +16,7 @@ LOG_MODULE_REGISTER(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/kscan.h> #include <zmk/kscan.h>
#include <zmk/display.h> #include <zmk/display.h>
#include <drivers/ext_power.h> #include <drivers/ext_power.h>
#include <zmk/led_perkey.h>
#define ZMK_KSCAN_DEV DT_LABEL(ZMK_MATRIX_NODE_ID) #define ZMK_KSCAN_DEV DT_LABEL(ZMK_MATRIX_NODE_ID)
@ -25,7 +26,9 @@ void main(void) {
if (zmk_kscan_init(ZMK_KSCAN_DEV) != 0) { if (zmk_kscan_init(ZMK_KSCAN_DEV) != 0) {
return; return;
} }
#ifdef CONFIG_IS31FL3733
led_perkey_init(ZMK_KSCAN_DEV);
#endif /* CONFIG_IS31fl3733 */
#ifdef CONFIG_ZMK_DISPLAY #ifdef CONFIG_ZMK_DISPLAY
zmk_display_init(); zmk_display_init();
#endif /* CONFIG_ZMK_DISPLAY */ #endif /* CONFIG_ZMK_DISPLAY */