Merge branch 'dev'

Author: francois-berder

CMakeLists.txt

@@ -5,7 +5,7 @@ project(LetMeCreate)
 
 set(LETMECREATE_MAJOR_VERSION 1)
 set(LETMECREATE_MINOR_VERSION 2)
-set(LETMECREATE_PATCH_VERSION 0)
+set(LETMECREATE_PATCH_VERSION 1)
 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.2.0
+PROJECT_NUMBER         = 1.2.1
 
 # 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

include/letmecreate/click/air_quality.h

@@ -13,15 +13,12 @@
 #include <letmecreate/click/export.h>
 
 /**
- * @brief Attach callback triggered if air quality is bad.
- *
- * Multiple callbacks can be attached to the air click output. Use #gpio_monitor_remove_callback
- * to remove them.
+ * @brief Reads measure from Air Quality Click.
  *
  * @param mikrobus_index Index of the mikrobus used by the click (see #MIKROBUS_INDEX)
- * @param callback Function to call if air quality is bad (must not be null)
- * @return callback ID (positive integer) if successful, -1 otherwise.
+ * @param measure Indicator of air pollution in range 0..65535
+ * @return 0 if successful, -1 otherwise.
  */
-int LETMECREATE_CLICK_EXPORT air_quality_click_set_callback(uint8_t mikrobus_index, void(*callback)(uint8_t));
+int LETMECREATE_CLICK_EXPORT air_quality_click_get_measure(uint8_t mikrobus_index, uint16_t *measure);
 
 #endif

include/letmecreate/click/co.h

@@ -32,13 +32,13 @@
 #include <letmecreate/click/export.h>
 
 /**
- * @brief Reads current PPM for CO in air. Please read data sheet for MQ-7 sensor used in MikroE click. It might
+ * @brief Reads current measure for CO in air. Please read data sheet for MQ-7 sensor used in MikroE click. It might
  * require warmup before proper readings can be received.
  *
  * @param[in] mikrobus_index Index of the mikrobus used by the click (see #MIKROBUS_INDEX)
- * @param[out] concentration current concentration of CO in air given in PPM.
+ * @param[out] measure current concentration of CO in air in range 0..65535.
  * @return 0 if success, -1 if error occurred
  */
-int LETMECREATE_CLICK_EXPORT co_click_read_ppm(uint8_t mikrobus_index, float *concentration);
+int LETMECREATE_CLICK_EXPORT co_click_get_measure(uint8_t mikrobus_index, uint16_t *measure);
 
 #endif /* __LETMECREATE_CLICK_CO_H__ */

include/letmecreate/click/eve.h

@@ -189,7 +189,7 @@ int LETMECREATE_CLICK_EXPORT eve_click_translate(int32_t tx, int32_t ty);
  * eve_click_set_matrix must be called to update the bitmap transform matrix.
  *
  * @param[in] sx signed 16.16 fixed-point x factor
- * @param[in] sy signed 16.16 fixed-point x factor
+ * @param[in] sy signed 16.16 fixed-point y factor
  * @return 0 if successful, -1 otherwise.
  */
 int LETMECREATE_CLICK_EXPORT eve_click_scale(int32_t sx, int32_t sy);

include/letmecreate/click/opto.h

@@ -26,6 +26,8 @@ enum OPTO_CLICK_CHANNEL_INDEX {
  * @brief Attach a callback to a channel of the Opto Click.
  *
  * Channel 2 is not supported on Ci40.
+ * The callback is called on each edge, the parameter of the callback indicates
+ * whether it is a raising or falling edge.
  *
  * @param[in] mikrobus_index Index of the mikrobus (see #MIKROBUS_INDEX)
  * @param[in] channel_index Index of the channel (see #OPTO_CLICK_CHANNEL_INDEX)

miscellaneous/Makefile.devel

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=letmecreate
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.2.1
 
 PKG_LICENSE_FILE:=LICENSE
 PKG_LICENSE:=BSD-3-Clause
@@ -14,6 +14,7 @@ define Package/letmecreate
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=LetMeCreate
+  DEPENDS:=@TARGET_pistachio
 endef
 
 define Package/letmecreate/description

miscellaneous/Makefile.stable

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=letmecreate
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.2.1
 
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -20,6 +20,7 @@ define Package/letmecreate
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=LetMeCreate
+  DEPENDS:=@TARGET_pistachio
 endef
 
 define Package/letmecreate/description

src/click/air_quality.c

@@ -1,43 +1,21 @@
 #include <stdio.h>
 #include <letmecreate/click/air_quality.h>
-#include <letmecreate/core/common.h>
-#include <letmecreate/core/gpio.h>
-#include <letmecreate/core/gpio_monitor.h>
+#include <letmecreate/core/adc.h>
 
 
-int air_quality_click_set_callback(uint8_t mikrobus_index, void(*callback)(uint8_t))
+int air_quality_click_get_measure(uint8_t mikrobus_index, uint16_t *measure)
 {
-    uint8_t output_pin = 0;
-    int callback_ID;
+    float tmp = 0.f;
 
-    if (callback == NULL) {
-        fprintf(stderr, "air quality: Callback must not be null.\n");
+    if (measure == NULL) {
+        fprintf(stderr, "air quality: Cannot store measure using null pointer.\n");
         return -1;
     }
 
-    switch (mikrobus_index) {
-    case MIKROBUS_1:
-        output_pin = MIKROBUS_1_AN;
-        break;
-    case MIKROBUS_2:
-        output_pin = MIKROBUS_2_AN;
-        break;
-    default:
-        fprintf(stderr, "air quality: Invalid mikrobus index.\n");
-        return -1;
-    }
-
-    if (gpio_init(output_pin) < 0
-    ||  gpio_set_direction(output_pin, GPIO_INPUT) < 0) {
-        fprintf(stderr, "air quality: Failed to configure pin as an input.\n");
-        return -1;
-    }
-
-    if (gpio_monitor_init() < 0)
+    if (adc_get_value(mikrobus_index, &tmp) < 0)
         return -1;
 
-    if ((callback_ID = gpio_monitor_add_callback(output_pin, GPIO_FALLING, callback)) < 0)
-        fprintf(stderr, "air quality: Failed to add callback.\n");
+    *measure = (tmp / 5.f) * 65535;
 
-    return callback_ID;
+    return 0;
 }

src/click/co.c

@@ -18,32 +18,24 @@
  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ************************************************************************************************************************/
 
-#include <math.h>
 #include <stdio.h>
 #include <letmecreate/click/co.h>
 #include <letmecreate/core/adc.h>
 
-#define Rl      (5000.0)
 
-
-int co_click_read_ppm(uint8_t mikrobus_index, float *concentration)
+int co_click_get_measure(uint8_t mikrobus_index, uint16_t *measure)
 {
-    float adc_value;
-    double Rs, ratio, lgPPM, ppm;
+    float tmp = 0.f;
 
-    if (concentration == NULL) {
-        fprintf(stderr, "co: Cannot store concentration using null pointer.\n");
+    if (measure == NULL) {
+        fprintf(stderr, "co: Cannot store measure using null pointer.\n");
         return -1;
     }
 
-    if (adc_get_value(mikrobus_index, &adc_value) < 0)
+    if (adc_get_value(mikrobus_index, &tmp) < 0)
         return -1;
 
-    Rs = Rl * (5.f - adc_value) / adc_value;
-    ratio = Rs / Rl;
-    lgPPM = (log10(ratio) * -3.7) + 0.9948;
-    ppm = pow(10, lgPPM);
-    *concentration = (float)ppm;
+    *measure = (tmp / 5.f) * 65535;
 
     return 0;
 }