xenua
/
zmk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Rebased and fixed nasty code

xmkb
Mega Mind 4 years ago
parent
5d1c083959
commit
4adcb396ff
3 changed files with 16 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/boards/shields/lily58/lily58.keymap
  2. 32
      app/src/behaviors/behavior_ext_power.c
  3. 2
      app/src/behaviors/behavior_key_press.c

2
app/boards/shields/lily58/lily58.keymap
Unescape View File

@ -42,7 +42,7 @@
&bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans &trans &trans &trans &trans &trans &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans &trans &trans &trans &trans &trans
&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12
&kp GRAV &kp BANG &kp ATSN &kp HASH &kp CURU &kp PRCT &kp CRRT &kp AMPS &kp KMLT &kp LPRN &kp RPRN &kp TILD &kp GRAV &kp BANG &kp ATSN &kp HASH &kp CURU &kp PRCT &kp CRRT &kp AMPS &kp KMLT &kp LPRN &kp RPRN &kp TILD
&trans &ext_power EP_ON &ext_power EP_OFF &trans &trans &trans &trans &trans &trans &kp MINUS &kp KPLS &kp LCUR &kp RCUR &kp PIPE &trans &ext_power EP_ON &ext_power EP_OFF &ext_power EP_TOG &trans &trans &trans &trans &trans &kp MINUS &kp KPLS &kp LCUR &kp RCUR &kp PIPE
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
>; >;

32
app/src/behaviors/behavior_ext_power.c
Unescape View File

@ -9,32 +9,29 @@
#include <device.h> #include <device.h>
#include <devicetree.h> #include <devicetree.h>
#include <drivers/behavior.h> #include <drivers/behavior.h>
#include <drivers/ext_power.h>
#include <dt-bindings/zmk/ext_power.h>
#include <logging/log.h> #include <logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <drivers/ext_power.h> static int on_keymap_binding_pressed(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event) {
static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t command, u32_t arg) {
const struct device *ext_power = device_get_binding("EXT_POWER"); const struct device *ext_power = device_get_binding("EXT_POWER");
if (ext_power == NULL) { if (ext_power == NULL) {
LOG_ERR("Unable to retrieve ext_power device: %d", command); LOG_ERR("Unable to retrieve ext_power device: %d", command);
return -EIO; return -EIO;
} }
const struct ext_power_api *ext_power_api = ext_power->driver_api;
switch (command) { switch (binding->param1) {
case EXT_POWER_OFF_CMD: case EXT_POWER_OFF_CMD:
return ext_power_api->disable(ext_power); return ext_power_disable(ext_power);
case EXT_POWER_ON_CMD: case EXT_POWER_ON_CMD:
return ext_power_api->enable(ext_power); return ext_power_enable(ext_power);
case EXT_POWER_TOGGLE_CMD: case EXT_POWER_TOGGLE_CMD:
if(ext_power_api->get(ext_power) > 0) if (ext_power_get(ext_power) > 0)
return ext_power_api->disable(ext_power); return ext_power_disable(ext_power);
else else
return ext_power_api->enable(ext_power); return ext_power_enable(ext_power);
default: default:
LOG_ERR("Unknown ext_power command: %d", command); LOG_ERR("Unknown ext_power command: %d", command);
} }
@ -42,18 +39,17 @@ static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t c
return -ENOTSUP; return -ENOTSUP;
} }
static int behavior_ext_power_init(struct device *dev) { return 0; }; static int on_keymap_binding_released(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event) {
static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t command,
u32_t arg) {
return 0; return 0;
} }
static int behavior_ext_power_init(struct device *dev) { return 0; };
static const struct behavior_driver_api behavior_ext_power_driver_api = { static const struct behavior_driver_api behavior_ext_power_driver_api = {
.binding_pressed = on_keymap_binding_pressed, .binding_pressed = on_keymap_binding_pressed,
.binding_released = on_keymap_binding_released, .binding_released = on_keymap_binding_released,
}; };
DEVICE_AND_API_INIT(behavior_ext_power, DT_INST_LABEL(0), behavior_ext_power_init, NULL, NULL, DEVICE_AND_API_INIT(behavior_ext_power, DT_INST_LABEL(0), behavior_ext_power_init, NULL, NULL,
APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY, &behavior_ext_power_driver_api);
&behavior_ext_power_driver_api);

2
app/src/behaviors/behavior_key_press.c
Unescape View File

@ -54,4 +54,4 @@ static const struct behavior_driver_api behavior_key_press_driver_api = {
&behavior_key_press_data_##n, &behavior_key_press_config_##n, APPLICATION, \ &behavior_key_press_data_##n, &behavior_key_press_config_##n, APPLICATION, \
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_key_press_driver_api); CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_key_press_driver_api);
DT_INST_FOREACH_STATUS_OKAY(KP_INST) DT_INST_FOREACH_STATUS_OKAY(KP_INST)

Write Preview
Loading…
Cancel
Save