Merge branch 'dev'

Author: francois-berder

CMakeLists.txt

@@ -5,7 +5,7 @@ project(LetMeCreate)
 
 set(LETMECREATE_MAJOR_VERSION 1)
 set(LETMECREATE_MINOR_VERSION 0)
-set(LETMECREATE_PATCH_VERSION 2)
+set(LETMECREATE_PATCH_VERSION 3)
 set(LETMECREATE_VERSION ${LETMECREATE_MAJOR_VERSION}.${LETMECREATE_MINOR_VERSION}.${LETMECREATE_PATCH_VERSION})
 set(PROJECT_VERSION ${LETMECREATE_VERSION})
 

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "LetMeCreate"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.0.2
+PROJECT_NUMBER         = 1.0.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

Readme.md

@@ -1,6 +1,6 @@
 # LetMeCreate library
 
-This library is a collection of small wrappers for some interfaces of the Ci-40. It aims at making easier to develop on this platform. Also, it provides some wrappers for a few clicks.
+This library is a collection of small wrappers for some interfaces of the Ci40. It aims at making easier to develop on this platform. Also, it provides some wrappers for a few clicks. Notice that you cannot compile the library on Ci40 because cmake cannot run on it.
 
 Interface supported:
   - I²C
@@ -23,6 +23,7 @@ MikroClick board supported:
   - Accel (SPI only)
   - 8x8R (Led Matrix)
   - Alcohol
+  - IR eclipse
 
 Examples are installed in /usr/bin/letmecreate_examples.
 Tests are installed in /usr/bin/letmecreate_tests.

examples/motion/main.c

@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <time.h>
 #include <letmecreate/letmecreate.h>
 

include/letmecreate/click.h

@@ -14,6 +14,7 @@
 #include "letmecreate/click/alcohol.h"
 #include "letmecreate/click/color.h"
 #include "letmecreate/click/common.h"
+#include "letmecreate/click/ir_eclipse.h"
 #include "letmecreate/click/joystick.h"
 #include "letmecreate/click/led_matrix.h"
 #include "letmecreate/click/motion.h"

include/letmecreate/click/ir_eclipse.h

@@ -0,0 +1,18 @@
+#ifndef __LETMECREATE_CLICK_IR_ECLIPSE_H__
+#define __LETMECREATE_CLICK_IR_ECLIPSE_H__
+
+#include <stdint.h>
+
+/**
+ * @brief Attach callback triggered if an object is detected.
+ *
+ * To remove this callback, call gpio_monitor_remove_callback function with
+ * the callback ID returned by this function.
+ *
+ * @param[in] mikrobus_index Index of the mikrobus
+ * @param[in] callback Must not be null.
+ * @return A callback ID (positive integer) if successful, -1 otherwise
+ */
+int ir_eclipse_click_add_callback(uint8_t mikrobus_index, void (*callback)(uint8_t));
+
+#endif

miscellaneous/Makefile.devel

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=letmecreate
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.3
 
 PKG_LICENSE_FILE:=LICENSE
 PKG_LICENSE:=BSD-3-Clause
@@ -53,7 +53,7 @@ endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/letmecreate
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/letmecreate $(STAGING_DIR)/usr/include/letmecreate
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/letmecreate $(STAGING_DIR)/usr/include/
 
 	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(STAGING_DIR)/usr/lib/
@@ -77,7 +77,7 @@ define Package/letmecreate/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/usr/lib/
 
 	$(INSTALL_DIR) $(1)/usr/include/letmecreate
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/letmecreate
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
 
 	$(INSTALL_DIR) $(1)/usr/lib/cmake/LetMeCreate
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/cmake/LetMeCreate/*.cmake $(1)/usr/lib/cmake/LetMeCreate

miscellaneous/Makefile.stable

@@ -1,11 +1,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=letmecreate
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.3
 
 PKG_SOURCE_VERSION:=HEAD
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:= git@github.com:francois-berder/LetMeCreate.git
+PKG_SOURCE_URL:= https://github.com/francois-berder/LetMeCreate.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
@@ -36,7 +36,7 @@ CMAKE_OPTIONS += $(if $(CONFIG_LETMECREATE_BUILD_EXAMPLES),-DBUILD_EXAMPLES=ON)
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/letmecreate
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/letmecreate $(STAGING_DIR)/usr/include/letmecreate
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/letmecreate $(STAGING_DIR)/usr/include/
 
 	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(STAGING_DIR)/usr/lib/
@@ -55,7 +55,7 @@ define Package/letmecreate/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/usr/lib/
 
 	$(INSTALL_DIR) $(1)/usr/include/letmecreate
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/letmecreate
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
 
 	$(INSTALL_DIR) $(1)/usr/lib/cmake/LetMeCreate
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/cmake/LetMeCreate/*.cmake $(1)/usr/lib/cmake/LetMeCreate

src/click/alcohol.c

@@ -6,6 +6,8 @@
 
 int alcohol_click_get_measure(uint8_t mikrobus_index, uint16_t *measure)
 {
+    float tmp = 0.f;
+
     if (measure == NULL) {
         fprintf(stderr, "alcohol: Cannot store measurement in null variable.\n");
         return -1;
@@ -16,5 +18,10 @@ int alcohol_click_get_measure(uint8_t mikrobus_index, uint16_t *measure)
         return -1;
     }
 
-    return adc_get_value(mikrobus_index, measure);
+    if (adc_get_value(mikrobus_index, &tmp) < 0)
+        return -1;
+
+    *measure = (tmp / 5.f) * 1023;
+
+    return 0;
 }

src/click/ir_eclipse.c

@@ -0,0 +1,35 @@
+#include <stdio.h>
+#include "letmecreate/click/ir_eclipse.h"
+#include "letmecreate/core/common.h"
+#include "letmecreate/core/gpio.h"
+#include "letmecreate/core/gpio_monitor.h"
+
+
+int ir_eclipse_click_add_callback(uint8_t mikrobus_index, void (*callback)(uint8_t))
+{
+    uint8_t gpio_pin;
+
+    switch (mikrobus_index) {
+    case MIKROBUS_1:
+        gpio_pin = MIKROBUS_1_INT;
+        break;
+    case MIKROBUS_2:
+        gpio_pin = MIKROBUS_2_INT;
+        break;
+    default:
+        fprintf(stderr, "ir_eclipse: Invalid mikrobus index.\n");
+        return -1;
+    }
+
+    if (callback == NULL) {
+        fprintf(stderr, "ir_eclipse: Callback must not be null.\n");
+        return -1;
+    }
+
+    if (gpio_init(gpio_pin) < 0
+    ||  gpio_set_direction(gpio_pin, GPIO_INPUT) < 0
+    ||  gpio_monitor_init() < 0)
+        return -1;
+
+    return gpio_monitor_add_callback(gpio_pin, GPIO_EDGE, callback);
+}