From 52bfc9dd84592f834c13ce9af4a1dd7fc90d7fef Mon Sep 17 00:00:00 2001
From: Pete Johanson <peter@peterjohanson.com>
Date: Fri, 1 May 2020 14:58:00 -0400
Subject: Lots of clean up, basic kscan working, remove zephyr-rust.

---
 src/lib.rs    | 11 -----------
 src/main.c    | 51 ++++++++-------------------------------------------
 src/zmk_lib.h |  7 -------
 3 files changed, 8 insertions(+), 61 deletions(-)
 delete mode 100644 src/lib.rs
 delete mode 100644 src/zmk_lib.h

(limited to 'src')

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);
-    }
-}
diff --git a/src/main.c b/src/main.c
index 21f481a..6640e47 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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
-
-- 
cgit v1.2.3