Merge branch 'dev'

Author: francois-berder

CMakeLists.txt

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

@@ -5,10 +5,10 @@
 ## Build status
 
 **Master**  
-[![Build Status](https://travis-ci.org/francois-berder/LetMeCreate.svg?branch=master)](https://travis-ci.org/francois-berder/LetMeCreate)
+[![Build Status](https://travis-ci.org/CreatorDev/LetMeCreate.svg?branch=master)](https://travis-ci.org/CreatorDev/LetMeCreate)
 
 **Dev**  
-[![Build Status](https://travis-ci.org/francois-berder/LetMeCreate.svg?branch=dev)](https://travis-ci.org/francois-berder/LetMeCreate)
+[![Build Status](https://travis-ci.org/CreatorDev/LetMeCreate.svg?branch=dev)](https://travis-ci.org/CreatorDev/LetMeCreate)
 
 ## Introduction
 
@@ -33,10 +33,11 @@ MikroClick board supported:
 |Color|Color2|EVE|
 |Fan|GYRO|IR distance|
 |IR eclipse|Joystick|Light|
-|LIN Hall|Motion|OLED|
-|Opto|Proximity|Relay (partial support)|
-|Relay2|Relay4 (partial support)|RTC|
-|Thermo3|UNI Hall|Weather|
+|LIN Hall|Lora|Motion|
+|OLED|Opto|Proximity|
+|Relay (partial support)|Relay2|Relay4 (partial support)|
+|RTC|Thermo3|UNI Hall|
+|Weather|||
 
 The Raspberry PI sense Hat is supported by the library, except the EEPROM because the pins are not connected on the I2C bus. The atmel chip is confusing the I2C driver of the Ci40 which makes it sometimes impossible to communicate with the hat. Inserting the hat after the board finished booting often solves the issue (assuming it does not cause a reset of the Ci40 because of a brown-out reset).
 

examples/CMakeLists.txt

@@ -89,3 +89,15 @@ install(TARGETS letmecreate_oled_example RUNTIME DESTINATION bin)
 add_executable(letmecreate_rpisensehat_example rpisensehat/main.c)
 target_link_libraries(letmecreate_rpisensehat_example letmecreate_rpisensehat letmecreate_core)
 install(TARGETS letmecreate_rpisensehat_example RUNTIME DESTINATION bin)
+
+add_executable(letmecreate_lora_example lora/main.c)
+target_link_libraries(letmecreate_lora_example letmecreate_click letmecreate_core)
+install(TARGETS letmecreate_lora_example RUNTIME DESTINATION bin)
+
+add_executable(letmecreate_switch_example switch/main.c)
+target_link_libraries(letmecreate_switch_example letmecreate_core)
+install(TARGETS letmecreate_switch_example RUNTIME DESTINATION bin)
+
+add_executable(letmecreate_uni_hall_example uni_hall/main.c)
+target_link_libraries(letmecreate_uni_hall_example letmecreate_click letmecreate_core)
+install(TARGETS letmecreate_uni_hall_example RUNTIME DESTINATION bin)

examples/alphanum/main.c

@@ -2,59 +2,30 @@
  * This example shows how to use the Alphanum Click wrapper of the LetMeCreate
  * to display characters.
  *
- * It displays "Ci" using both displays by enabling them one after the other at
- * 100Hz to give the illusion that both characters are displayed at the same
- * time. The user has to interrupt the program to exit it by pressing Ctrl+C.
+ * It displays "Ci" during 5 seconds on the Alphanum Click.
  *
  * The Alphanum Click must be inserted in Mikrobus 1 before running this
  * program.
  */
 
-
-#include <signal.h>
-#include <stdbool.h>
-#include <stdio.h>
+#include <unistd.h>
 #include <letmecreate/letmecreate.h>
-#include "examples/common.h"
-
-static volatile bool running = true;
 
-static void exit_program(int __attribute__ ((unused))signo)
-{
-    running = false;
-}
 
 int main(void)
 {
-    /* Set signal handler to exit program when Ctrl+c is pressed */
-    struct sigaction action = {
-        .sa_handler = exit_program,
-        .sa_flags = 0
-    };
-    sigemptyset(&action.sa_mask);
-    sigaction (SIGINT, &action, NULL);
-
-    printf("Press Ctrl+c to exit program.\n");
-
     spi_init();
     spi_select_bus(MIKROBUS_1);
 
     if (alphanum_click_init(MIKROBUS_1) < 0)
-        return 1;
+        return -1;
 
     if (alphanum_click_write('C', 'i') < 0)
-        return 1;
-
-    /* This alternately switches on the output of either the two shift registers
-     * to appear to print two characters at the same time.
-     */
-    while (running) {
-        alphanum_click_select_left_display();
-        sleep_ms(5);
-        alphanum_click_select_right_display();
-        sleep_ms(5);
-    }
+        return -1;
+
+    sleep(5);
 
+    alphanum_click_release();
     spi_release();
 
     return 0;

examples/lora/main.c

@@ -0,0 +1,100 @@
+/**
+ * This example shows how to use the Lora Click wrapper of the LetMeCreate to
+ * send or receive data.
+ *
+ * Depending on the mode selected, it either continuously sends a message every
+ * second, or it waits for data and prints what it receives.
+ * The user has to interrupt the program to exit it by pressing Ctrl+C.
+ *
+ * To run the example in send mode:
+ * $ ./letmecreate_lora_example s
+ *
+ * To run the example in receive mode:
+ * $ ./letmecreate_lora_example r
+ *
+ * The Lora Click must be inserted in Mikrobus 1 before running this program.
+ */
+
+
+
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <letmecreate/letmecreate.h>
+
+static volatile bool running = true;
+
+static void exit_program(int __attribute__ ((unused))signo)
+{
+    running = false;
+}
+
+static void receive(void)
+{
+    char buffer[16];
+
+    if (lora_click_receive((uint8_t*)buffer, sizeof(buffer) - 1) < 0)
+        return;
+
+    buffer[15] = '\0';
+    printf("Received \"%s\"\n", buffer);
+}
+
+static void send(unsigned int n)
+{
+    char buffer[255];
+    sprintf(buffer, "Hello, World! %u", n);
+
+    if (lora_click_send((uint8_t*)buffer, strlen(buffer)) < 0)
+        return;
+
+    printf("Sent \"%s\"\n", buffer);
+}
+
+int main(int argc, char** argv)
+{
+    uint32_t n = 0;
+    char mode;
+
+    /* Set signal handler to exit program when Ctrl+c is pressed */
+    struct sigaction action = {
+        .sa_handler = exit_program,
+        .sa_flags = 0
+    };
+    sigemptyset(&action.sa_mask);
+    sigaction (SIGINT, &action, NULL);
+
+    if (argc < 2) {
+        fprintf(stderr, "%s r|s\n", argv[0]);
+        return -1;
+    }
+
+    mode = argv[1][0];
+    if (mode != 's' && mode != 'r') {
+        fprintf(stderr, "Invalid mode.\n");
+        return -1;
+    }
+
+    printf("Press Ctrl+c to exit program.\n");
+
+    uart_init();
+    uart_select_bus(MIKROBUS_1);
+    uart_set_baudrate(UART_BD_57600);
+    lora_click_init(MIKROBUS_1, lora_click_get_default_configuration());
+
+    while (running) {
+        if (mode == 's') {
+            send(n);
+            sleep(1);
+        }
+        else if (mode == 'r')
+            receive();
+
+        ++n;
+    }
+
+    uart_release();
+
+    return 0;
+}

examples/switch/main.c

@@ -0,0 +1,27 @@
+/**
+ * This example shows how to use the Switch wrapper of the LetMeCreate library.
+ *
+ * It attaches a callback to all switch events for 15 seconds. Each time an
+ * event happens, it prints hello on the screen.
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <letmecreate/letmecreate.h>
+
+static void print_hello(void)
+{
+    printf("hello\n");
+}
+
+int main(void)
+{
+    switch_init();
+    switch_add_callback(SWITCH_ALL_EVENTS, print_hello);
+    printf("Switch callback are now active for 15 seconds.\n");
+    printf("Press a switch to print \"hello\" on screen.\n");
+    sleep(15);
+    switch_release();
+
+    return 0;
+}

examples/uni_hall/main.c

@@ -0,0 +1,32 @@
+/**
+ * This example shows how to use the UNI Hall Click wrapper of the LetMeCreate
+ * library.
+ *
+ * It attaches a callback that prints hello everytime it starts/stops detecting
+ * the north pole of a magnet during 10 seconds.
+ *
+ * The UNI Hall Click must be inserted in Mikrobus 1 before running the program.
+ */
+
+
+#include <letmecreate/letmecreate.h>
+#include <stdio.h>
+#include <unistd.h>
+
+void print_hello(uint8_t arg)
+{
+    if (arg == GPIO_FALLING)
+        printf("Hello, starts dectecting north pole\n");
+    else if (arg == GPIO_RAISING)
+        printf("Hello, stops dectecting north pole\n");
+}
+
+int main(void)
+{
+    uni_hall_click_attach_callback(MIKROBUS_1, print_hello);
+    printf("Callback is now active for 15 seconds.\n");
+    printf("Move the north pole of a magnet over the sensor to print \"hello\".\n");
+    sleep(15);
+
+    return 0;
+}

include/letmecreate/bosch/bme280.h

@@ -59,6 +59,10 @@
 #ifndef __BME280_H__
 #define __BME280_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <letmecreate/bosch/export.h>
 
 /*!
@@ -1712,4 +1716,9 @@ s32 v_uncom_pressure_s32);
  */
 BME280_RETURN_FUNCTION_TYPE LETMECREATE_BOSCH_EXPORT bme280_compute_wait_time(u8
 *v_delaytime_u8);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif

include/letmecreate/click.h

@@ -9,6 +9,10 @@
 #ifndef __LETMECREATE_CLICK_H__
 #define __LETMECREATE_CLICK_H__
 
+#ifdef __cplusplus
+extern "C"{
+#endif
+
 #include <letmecreate/click/7seg.h>
 #include <letmecreate/click/accel.h>
 #include <letmecreate/click/adc.h>
@@ -29,6 +33,7 @@
 #include <letmecreate/click/led_matrix.h>
 #include <letmecreate/click/light.h>
 #include <letmecreate/click/lin_hall.h>
+#include <letmecreate/click/lora.h>
 #include <letmecreate/click/motion.h>
 #include <letmecreate/click/oled.h>
 #include <letmecreate/click/opto.h>
@@ -41,4 +46,8 @@
 #include <letmecreate/click/uni_hall.h>
 #include <letmecreate/click/weather.h>
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif