Merge pull request #16 from mutablelogic/dev

Added updates for GPIO

Author: djthorpe

README.md

@@ -76,8 +76,6 @@ Whenever you target a different board, use `make clean` before `make picotool` a
 
 ## References
 
-  * Pico SDK
-    * Repository https://github.com/raspberrypi/pico-sdk
-    * Documentation (in PDF) https://datasheets.raspberrypi.org/pico/raspberry-pi-pico-c-sdk.pdf
-
-
+* Pico SDK
+  * Repository https://github.com/raspberrypi/pico-sdk
+  * Documentation (in PDF) https://datasheets.raspberrypi.org/pico/raspberry-pi-pico-c-sdk.pdf

examples/picofuse/gpio_in/run.c

@@ -1,10 +1,30 @@
 #include <picofuse/picofuse.h>
 
-int run(fuse_t *fuse)
+/* @brief Callback when there is a rising or falling edge on GPIO pin
+ */
+void gpio_callback(fuse_t *self, fuse_event_t *evt, void *user_data)
 {
-    // GPIO Pin 26 input
-    fuse_gpio_t *pin = fuse_new_gpio(fuse, 26, FUSE_GPIO_IN);
-    assert(pin);
+    assert(self);
+    assert(evt);
+    assert(user_data);
+
+    // Print the event
+    fuse_printf(self, "Event: evt=%v user_data=%p\n", evt, user_data);
+}
+
+int run(fuse_t *self)
+{
+    // Initialize picofuse
+    picofuse_init(self);
+
+    // GPIO inputs
+    assert(fuse_retain(self, fuse_new_gpio(self, 23, FUSE_GPIO_IN)));
+    assert(fuse_retain(self, fuse_new_gpio(self, 12, FUSE_GPIO_PULLUP)));
+    assert(fuse_retain(self, fuse_new_gpio(self, 13, FUSE_GPIO_PULLUP)));
+    assert(fuse_retain(self, fuse_new_gpio(self, 14, FUSE_GPIO_PULLUP)));
+
+    // Register a callback
+    assert(fuse_register_callback(self, FUSE_EVENT_GPIO, 0, gpio_callback));
 
     return 0;
 }

include/fuse/device.h

@@ -6,6 +6,8 @@
 #ifndef FUSE_EVENT_H
 #define FUSE_EVENT_H
 
+#include "value.h"
+
 // Define the event types
 #define FUSE_EVENT_NULL 0x00  ///< NULL event
 #define FUSE_EVENT_TIMER 0x01 ///< Timer event

include/fuse/event.h

@@ -13,7 +13,6 @@
 typedef struct fuse_application fuse_t;
 
 #include "assert.h"
-#include "device.h"
 #include "event.h"
 #include "list.h"
 #include "magic.h"
@@ -22,6 +21,7 @@ typedef struct fuse_application fuse_t;
 #include "printf.h"
 #include "random.h"
 #include "sleep.h"
+#include "str.h"
 #include "timer.h"
 #include "value.h"
 

include/fuse/flags.h

@@ -8,6 +8,7 @@
  */
 #ifndef FUSE_RANDOM_H
 #define FUSE_RANDOM_H
+
 #include <stdint.h>
 
 /** @brief Return a random unsigned 32 bit number

include/fuse/fuse.h

@@ -1,4 +1,4 @@
-/** @file string.h
+/** @file str.h
  *  @brief String storage and manipulation
  *
  *  This file contains the function prototypes for working with UTF-8 strings

include/fuse/random.h

@@ -8,6 +8,8 @@
 
 #include "fuse.h"
 #include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
 
 /** @brief The representation of a fuse value
  */
@@ -68,19 +70,19 @@ fuse_value_t *fuse_new_value_ex(fuse_t *self, const uint16_t magic, const void *
  * This method increments the reference count of the value, to take ownership of the value.
  *
  * @param self The fuse instance
- * @param value The value to retain
+ * @param value The value to retain, which must be a fuse_value_t*
  * @return The retained value, or NULL if the value could not be retained
  */
-fuse_value_t *fuse_retain(fuse_t *self, fuse_value_t *value);
+fuse_value_t *fuse_retain(fuse_t *self, void *value);
 
 /** @brief Release a value and destroy it if the reference count reaches 0
  *
  * This method decrements the reference count of the value. When it reaches zero, it is
  * freed.
  *
  * @param self The fuse instance
- * @param ptr The value to release
+ * @param ptr The value to release, which must be a fuse_value_t*
  */
-void fuse_release(fuse_t *self, fuse_value_t *value);
+void fuse_release(fuse_t *self, void *value);
 
 #endif /* FUSE_VALUE_H */

include/fuse/string.h renamed to include/fuse/str.h

@@ -27,7 +27,8 @@ typedef enum
 #define fuse_new_gpio(self, pin, func) \
     ((fuse_gpio_t *)fuse_new_gpio_ex((self), (pin), (func), __FILE__, __LINE__))
 #else
-#define fuse_new_gpio((self, pin, func)((fuse_gpio_t *)fuse_new_gpio_ex((self), (pin), (func), 0, 0))
+#define fuse_new_gpio(self, pin, func) \
+    ((fuse_gpio_t *)fuse_new_gpio_ex((self), (pin), (func), 0, 0))
 #endif
 
 /** @brief An opaque event object