Merge branch 'dev'

Author: francois-berder

CMakeLists.txt

@@ -4,33 +4,45 @@ project(LetMeCreate)
 
 
 set(LETMECREATE_MAJOR_VERSION 1)
-set(LETMECREATE_MINOR_VERSION 2)
+set(LETMECREATE_MINOR_VERSION 3)
 set(LETMECREATE_PATCH_VERSION 0)
 set(LETMECREATE_VERSION ${LETMECREATE_MAJOR_VERSION}.${LETMECREATE_MINOR_VERSION}.${LETMECREATE_PATCH_VERSION})
 set(PROJECT_VERSION ${LETMECREATE_VERSION})
 
 option(BUILD_EXAMPLES "Build examples" OFF)
 option(BUILD_TESTS "Build tests" OFF)
 
+file(GLOB bosch_srcs src/bosch/*.c)
 file(GLOB core_srcs src/core/*.c)
 file(GLOB click_srcs src/click/*.c)
+file(GLOB rpisensehat_srcs src/rpisensehat/*.c)
 
+file(GLOB bosch_hdrs include/letmecreate/bosch/*.h)
 file(GLOB core_hdrs include/letmecreate/core/*.h)
 file(GLOB click_hdrs include/letmecreate/click/*.h)
+file(GLOB rpisensehat_hdrs include/letmecreate/rpisensehat/*.h)
 
 include_directories(include)
 
 # Create targets
 add_library(letmecreate_core SHARED ${core_srcs} ${core_hdrs})
 add_library(letmecreate_click SHARED ${click_srcs} ${click_hdrs})
-target_link_libraries(letmecreate_click letmecreate_core)
+add_library(letmecreate_bosch SHARED ${bosch_srcs} ${bosch_hdrs})
+add_library(letmecreate_rpisensehat SHARED ${rpisensehat_srcs} ${rpisensehat_hdrs})
+target_link_libraries(letmecreate_core pthread)
+target_link_libraries(letmecreate_click letmecreate_core letmecreate_bosch)
+target_link_libraries(letmecreate_rpisensehat letmecreate_core)
 
 # Export symbols
 include(GenerateExportHeader)
+generate_export_header(letmecreate_bosch EXPORT_FILE_NAME "include/letmecreate/bosch/export.h")
 generate_export_header(letmecreate_core EXPORT_FILE_NAME "include/letmecreate/core/export.h")
 generate_export_header(letmecreate_click EXPORT_FILE_NAME "include/letmecreate/click/export.h")
+generate_export_header(letmecreate_rpisensehat EXPORT_FILE_NAME "include/letmecreate/rpisensehat/export.h")
+set_target_properties(letmecreate_bosch PROPERTIES C_VISIBILITY_PRESET hidden)
 set_target_properties(letmecreate_core PROPERTIES C_VISIBILITY_PRESET hidden)
 set_target_properties(letmecreate_click PROPERTIES C_VISIBILITY_PRESET hidden)
+set_target_properties(letmecreate_rpisensehat PROPERTIES C_VISIBILITY_PRESET hidden)
 
 # Enable warnings
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wextra -ggdb3")
@@ -47,6 +59,16 @@ target_include_directories(
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
 )
+target_include_directories(
+    letmecreate_bosch PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
+)
+target_include_directories(
+    letmecreate_rpisensehat PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
+)
 
 
 set(config_install_dir "lib/cmake/${PROJECT_NAME}")
@@ -73,7 +95,7 @@ configure_package_config_file(
 )
 
 install(
-    TARGETS letmecreate_core letmecreate_click
+    TARGETS letmecreate_core letmecreate_click letmecreate_bosch letmecreate_rpisensehat
     EXPORT "${targets_export_name}"
     LIBRARY DESTINATION "lib"
     ARCHIVE DESTINATION "lib"

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.3.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

@@ -30,21 +30,30 @@ MikroClick board supported:
   - ADC
   - Air quality
   - Alcohol
+  - Alphanum
   - Bargraph
   - CO
   - Color
   - Color2
   - EVE
+  - Fan
+  - GYRO
   - IR distance
   - IR eclipse
   - Joystick
+  - Light
   - Motion
+  - OLED
   - Opto
   - Proximity
   - Relay (partial support)
   - Relay2
   - Relay4 (partial support)
+  - RTC
   - Thermo3
+  - 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 are installed in /usr/bin/letmecreate_examples.
 Tests are installed in /usr/bin/letmecreate_tests.

examples/CMakeLists.txt

@@ -73,3 +73,15 @@ install(TARGETS letmecreate_eve_3_example RUNTIME DESTINATION bin)
 add_executable(letmecreate_eve_4_example eve/main4.c)
 target_link_libraries(letmecreate_eve_4_example letmecreate_click letmecreate_core)
 install(TARGETS letmecreate_eve_4_example RUNTIME DESTINATION bin)
+
+add_executable(letmecreate_rtc_example rtc/main.c)
+target_link_libraries(letmecreate_rtc_example letmecreate_click letmecreate_core)
+install(TARGETS letmecreate_rtc_example RUNTIME DESTINATION bin)
+
+add_executable(letmecreate_alphanum_example alphanum/main.c $<TARGET_OBJECTS:examples_common>)
+target_link_libraries(letmecreate_alphanum_example letmecreate_click letmecreate_core)
+install(TARGETS letmecreate_alphanum_example RUNTIME DESTINATION bin)
+
+add_executable(letmecreate_oled_example oled/main.c)
+target_link_libraries(letmecreate_oled_example letmecreate_click letmecreate_core)
+install(TARGETS letmecreate_oled_example RUNTIME DESTINATION bin)

examples/alphanum/main.c

@@ -0,0 +1,61 @@
+/**
+ * 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.
+ *
+ * The Alphanum Click must be inserted in Mikrobus 1 before running this
+ * program.
+ */
+
+
+#include <signal.h>
+#include <stdbool.h>
+#include <stdio.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;
+
+    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);
+    }
+
+    spi_release();
+
+    return 0;
+}

examples/oled/main.c

@@ -0,0 +1,24 @@
+/**
+ * This example shows how to use the OLED Click wrapper of the LetMeCreate library.
+ *
+ * It displays some text for three seconds and then, it exits.
+ *
+ * The OLED Click must be inserted in Mikrobus 1 before running this program.
+ * In addition, the OLED Click must be configured to use I2C.
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <letmecreate/letmecreate.h>
+
+int main(void)
+{
+    i2c_init();
+    oled_click_enable(MIKROBUS_1);
+    oled_click_write_text("Hello   Creator!");
+    sleep(3);
+    oled_click_disable();
+    i2c_release();
+
+    return 0;
+}

examples/relay2/main.c

@@ -7,20 +7,20 @@ int main(void)
     while (1) {
         switch (counter % 4) {
         case 0:
-            relay2_click_disable_relay_1(MIKROBUS_1);
-            relay2_click_disable_relay_2(MIKROBUS_1);
+            relay2_click_disable_relay(MIKROBUS_1, RELAY2_CLICK_RELAY_1);
+            relay2_click_disable_relay(MIKROBUS_1, RELAY2_CLICK_RELAY_1);
             break;
         case 1:
-            relay2_click_enable_relay_1(MIKROBUS_1);
-            relay2_click_disable_relay_2(MIKROBUS_1);
+            relay2_click_enable_relay(MIKROBUS_1, RELAY2_CLICK_RELAY_1);
+            relay2_click_disable_relay(MIKROBUS_1, RELAY2_CLICK_RELAY_2);
             break;
         case 2:
-            relay2_click_disable_relay_1(MIKROBUS_1);
-            relay2_click_enable_relay_2(MIKROBUS_1);
+            relay2_click_disable_relay(MIKROBUS_1, RELAY2_CLICK_RELAY_1);
+            relay2_click_enable_relay(MIKROBUS_1, RELAY2_CLICK_RELAY_2);
             break;
         case 3:
-            relay2_click_enable_relay_1(MIKROBUS_1);
-            relay2_click_enable_relay_2(MIKROBUS_1);
+            relay2_click_enable_relay(MIKROBUS_1, RELAY2_CLICK_RELAY_1);
+            relay2_click_enable_relay(MIKROBUS_1, RELAY2_CLICK_RELAY_2);
             break;
         }
 

examples/rtc/main.c

@@ -0,0 +1,86 @@
+/**
+ * This example shows how to use the RTC Click wrapper of the LetMeCreate to
+ * obtain the current date.
+ *
+ * It sets the date to Friday 28th October, 9:44:0. Then, it prints the current
+ * date read from the RTC Click every second. Ctrl+C must be pressed to exit
+ * the program.
+ *
+ * The RTC 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>
+
+
+static char *weekday_str[] = {
+    "Monday",
+    "Tuesday",
+    "Wednesday",
+    "Thursday",
+    "Friday",
+    "Saturday",
+    "Sunday"
+};
+
+static char *month_str[] = {
+    "January",
+    "Februay",
+    "March",
+    "April",
+    "May",
+    "June",
+    "July",
+    "August",
+    "September",
+    "October",
+    "November",
+    "December"
+};
+
+static volatile bool running = true;
+
+static void exit_program(int __attribute__ ((unused))signo)
+{
+    running = false;
+}
+
+int main(void)
+{
+    struct date date = {
+        .second = 0,
+        .minute = 44,
+        .hour   = 9,
+        .weekday = FRIDAY,
+        .day = 28,
+        .month = OCTOBER,
+        .year = 2016
+    };
+    struct sigaction action = {
+        .sa_handler = exit_program,
+        .sa_flags = 0
+    };
+    sigemptyset(&action.sa_mask);
+    sigaction (SIGINT, &action, NULL);
+
+    i2c_init();
+    rtc_click_init(2016);
+    rtc_click_set_date(date);
+
+    while (running) {
+        rtc_click_get_date(&date);
+        printf("%s %u %s %u, %u:%u:%u\n", weekday_str[date.weekday],
+                                          date.day,
+                                          month_str[date.month],
+                                          date.year,
+                                          date.hour, date.minute, date.second);
+        sleep(1);
+    }
+
+    i2c_release();
+
+    return 0;
+}