diff options
| author | Pete Johanson <peter@peterjohanson.com> | 2020-05-01 14:58:00 -0400 |
|---|---|---|
| committer | Pete Johanson <peter@peterjohanson.com> | 2020-05-01 14:58:00 -0400 |
| commit | 52bfc9dd84592f834c13ce9af4a1dd7fc90d7fef (patch) | |
| tree | 808a50c4fb4238987d3b7bc6aebb3f1c4c2af29f /src | |
| parent | 5b4e43cebd89c09e7cbd405f4a0dfdb942add4fc (diff) | |
Lots of clean up, basic kscan working, remove zephyr-rust.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib.rs | 11 | ||||
| -rw-r--r-- | src/main.c | 51 | ||||
| -rw-r--r-- | src/zmk_lib.h | 7 |
3 files changed, 8 insertions, 61 deletions
diff --git a/src/lib.rs b/src/lib.rs deleted file mode 100644 index 75ada98..0000000 --- a/src/lib.rs +++ /dev/null @@ -1,11 +0,0 @@ -#[no_mangle] -pub extern "C" fn zmk_run() { -} - -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} @@ -10,59 +10,24 @@ #include <drivers/gpio.h> #include <drivers/kscan.h> -#include "zmk_lib.h" -/* 1000 msec = 1 sec */ -#define SLEEP_TIME_MS 1000 - -/* The devicetree node identifier for the "led0" alias. */ -/* -#define LED0_NODE DT_ALIAS(led0) - -#if DT_HAS_NODE(LED0_NODE) -#define LED0 DT_GPIO_LABEL(LED0_NODE, gpios) -#define PIN DT_GPIO_PIN(LED0_NODE, gpios) -#if DT_PHA_HAS_CELL(LED0_NODE, gpios, flags) -#define FLAGS DT_GPIO_FLAGS(LED0_NODE, gpios) -#endif -#else -*/ -/* A build error here means your board isn't set up to blink an LED. */ -/* -#error "Unsupported board: led0 devicetree alias is not defined" -#define LED0 "" -#define PIN 0 -#endif - -#ifndef FLAGS -#define FLAGS 0 -#endif - -*/ +void zmk_kscan_callback(struct device *dev, u32_t row, u32_t column, bool pressed) { + printk("Row: %d, col: %d, pressed: %s\n", row, column, (pressed ? "true" : "false")); +} void main(void) { - /* struct device *dev; - bool led_is_on = true; - int ret; + printk("Welcome to ZMK!\n"); - dev = device_get_binding(LED0); + dev = device_get_binding(CONFIG_KSCAN_MATRIX_DEV_NAME); if (dev == NULL) { + printk("NO DEVICE!\n"); return; } - ret = gpio_pin_configure(dev, PIN, GPIO_OUTPUT_ACTIVE | FLAGS); - if (ret < 0) { - return; - } - */ + kscan_config(dev, zmk_kscan_callback); - zmk_run(); - // while (1) { - // gpio_pin_set(dev, PIN, (int)led_is_on); - // led_is_on = !led_is_on; - // k_msleep(SLEEP_TIME_MS); - // } + kscan_enable_callback(dev); } diff --git a/src/zmk_lib.h b/src/zmk_lib.h deleted file mode 100644 index 0b7706e..0000000 --- a/src/zmk_lib.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef ZMK_LIB_H -#define ZMK_LIB_H - -void zmk_run(void); - -#endif - |