Merge branch 'dev'

Signed-off-by: Francois Berder <[email protected]>

Author: francois-berder

CMakeLists.txt

@@ -1,15 +1,15 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.8)
 
 project(LetMeCreate)
 
 option(BUILD_EXAMPLES "Build examples" OFF)
+option(BUILD_TESTS "Build tests" OFF)
 
 set(letmecreate_VERSION_MAJOR 0)
 set(letmecreate_VERSION_MINOR 1)
 
 set(CMAKE_C_FLAGS_DEBUG  "${CMAKE_C_FLAGS_DEBUG} -Wall -ggdb3")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/examples/bin)
 
 include_directories(include)
 file(GLOB core_srcs src/core/*.c)
@@ -24,3 +24,7 @@ install(TARGETS letmecreate_click LIBRARY DESTINATION lib)
 if(BUILD_EXAMPLES)
     add_subdirectory(examples)
 endif(BUILD_EXAMPLES)
+
+if(BUILD_TESTS)
+    add_subdirectory(tests)
+endif(BUILD_TESTS)

Readme.md

@@ -23,6 +23,7 @@ MikroClick board supported:
   - 8x8R (Led Matrix)
 
 Examples are installed in /usr/bin/letmecreate_examples.
+Tests are installed in /usr/bin/letmecreate_tests.
 
 ## Integration in Openwrt
 

examples/CMakeLists.txt

@@ -1,3 +1,5 @@
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/examples/bin)
+
 add_executable(letmecreate_test_proximity proximity/main.c)
 target_link_libraries(letmecreate_test_proximity letmecreate_click letmecreate_core)
 install(TARGETS letmecreate_test_proximity RUNTIME DESTINATION bin)

examples/joystick/main.c

@@ -9,8 +9,6 @@
 #define OFFSET  98
 #define MAXIMUM (OFFSET * 2)
 
-/* We have 7 LEDs + the heartbeat LED which we skip */
-#define LED_CNT 7
 
 int get_led_mask(float perc)
 {

examples/led_matrix/main.c

@@ -23,6 +23,7 @@ int main(void)
     spi_init();
     spi_select_bus(MIKROBUS_1);
     led_matrix_click_enable();
+    led_matrix_click_set_intensity(3);
     for (cols = 0; cols < 8; ++cols) {
         uint8_t lines;
         for (lines = 0; lines < 8; ++lines) {

include/click/air_quality.h

@@ -21,6 +21,6 @@
  * @param callback Function to call if air quality is bad (must not be null)
  * @return callback ID (positive integer) if successful, -1 otherwise.
  */
-int air_quality_click_set_callback(const uint8_t mikrobus_index, void(*callback)(uint8_t));
+int air_quality_click_set_callback(uint8_t mikrobus_index, void(*callback)(uint8_t));
 
 #endif

include/click/common.h

@@ -18,7 +18,7 @@
  * @param[in] value New value of the register
  * @return 0 if successful, otherwise it returns -1.
  */
-int i2c_write_register(const uint16_t address, const uint8_t reg_address, const uint8_t value);
+int i2c_write_register(uint16_t address, uint8_t reg_address, uint8_t value);
 
 /**
  * @brief Read a one-byte register from a slave over I²C.
@@ -28,7 +28,7 @@ int i2c_write_register(const uint16_t address, const uint8_t reg_address, const
  * @param[out] data Pointer to a 8-bit variable to store the value of the register read from the slave
  * @return 0 if successful, otherwise it returns -1.
  */
-int i2c_read_register(const uint16_t address, const uint8_t reg_address, uint8_t *data);
+int i2c_read_register(uint16_t address, uint8_t reg_address, uint8_t *data);
 
 /**
  * @brief Read a 16bit register from a slave over I²C.
@@ -39,7 +39,7 @@ int i2c_read_register(const uint16_t address, const uint8_t reg_address, uint8_t
  * @param[out] data Pointer to a 16-bit variable to store the value of the register read from the slave
  * @return 0 if successful, otherwise it returns -1.
  */
-int i2c_read_16b_register(const uint16_t address, const uint8_t reg_low_address, const uint8_t reg_high_address, uint16_t *data);
+int i2c_read_16b_register(uint16_t address, uint8_t reg_low_address, uint8_t reg_high_address, uint16_t *data);
 
 /**
  * @brief Write one byte to a register over SPI.
@@ -48,6 +48,6 @@ int i2c_read_16b_register(const uint16_t address, const uint8_t reg_low_address,
  * @param[in] data New value of the register
  * @return 0 if successful, -1 otherwise
  */
-int spi_write_register(const uint8_t reg_address, const uint8_t data);
+int spi_write_register(uint8_t reg_address, uint8_t data);
 
 #endif

include/click/led_matrix.h

@@ -25,7 +25,7 @@ int led_matrix_click_enable(void);
  * @param[in] intensity in range 0-15
  * @return 0 if successful, -1 otherwise
  */
-int led_matrix_click_set_intensity(const uint8_t intensity);
+int led_matrix_click_set_intensity(uint8_t intensity);
 
 /**
  * @brief Switch on/off all LED's of one column.
@@ -34,7 +34,16 @@ int led_matrix_click_set_intensity(const uint8_t intensity);
  * @param[in] data bit string to switch on/off LED's in this column
  * @return 0 if successful, -1 otherwise
  */
-int led_matrix_click_set_column(const uint8_t column_index, const uint8_t data);
+int led_matrix_click_set_column(uint8_t column_index, uint8_t data);
+
+
+/**
+ * @brief Displays a two digit number.
+ *
+ * @param[in] number a number between 0 and 99 which will be displayed
+ * @return 0 if successful, -1 otherwise
+ */
+int led_matrix_click_display_number(uint8_t number);
 
 /**
  * @brief Switch on/off all LED's.

include/click/motion.h

@@ -17,7 +17,7 @@
  * @param[in] mikrobus_index Index of the mikrobus used by the click board (see #MIKROBUS_INDEX)
  * @return 0 if successful, -1 otherwise
  */
-int motion_click_enable(const uint8_t mikrobus_index);
+int motion_click_enable(uint8_t mikrobus_index);
 
 /**
  * @brief Attach a callback if movement is detected.
@@ -28,14 +28,14 @@ int motion_click_enable(const uint8_t mikrobus_index);
  * @param[in] callback Function to call if movement is detected
  * @return ID of the callback. Use #gpio_monitor_remove_callback to detach your callback.
  */
-int motion_click_attach_callback(const uint8_t mikrobus_index, void(*callback)(uint8_t));
+int motion_click_attach_callback(uint8_t mikrobus_index, void(*callback)(uint8_t));
 
 /**
  * @brief Disable the Motion Click.
  *
  * @param[in] mikrobus_index Index of the mikrobus used by the click board (see #MIKROBUS_INDEX)
  * @return 0 if successful, -1 otherwise
  */
-int motion_click_disable(const uint8_t mikrobus_index);
+int motion_click_disable(uint8_t mikrobus_index);
 
 #endif

include/click/relay2.h

@@ -16,30 +16,30 @@
  * @param[in] mikrobus_index Index of the mikrobus (see #MIKROBUS_INDEX)
  * @return 0 if successful, -1 otherwise
  */
-int relay2_click_enable_relay_1(const uint8_t mikrobus_index);
+int relay2_click_enable_relay_1(uint8_t mikrobus_index);
 
 /**
  * @brief Disable relay 1 on Relay2 Click.
  *
  * @param[in] mikrobus_index Index of the mikrobus (see #MIKROBUS_INDEX)
  * @return 0 if successful, -1 otherwise
  */
-int relay2_click_disable_relay_1(const uint8_t mikrobus_index);
+int relay2_click_disable_relay_1(uint8_t mikrobus_index);
 
 /**
  * @brief Enable relay 2 on Relay2 Click.
  *
  * @param[in] mikrobus_index Index of the mikrobus (see #MIKROBUS_INDEX)
  * @return 0 if successful, -1 otherwise
  */
-int relay2_click_enable_relay_2(const uint8_t mikrobus_index);
+int relay2_click_enable_relay_2(uint8_t mikrobus_index);
 
 /**
  * @brief Disable relay 2 on Relay2 Click.
  *
  * @param[in] mikrobus_index Index of the mikrobus (see #MIKROBUS_INDEX)
  * @return 0 if successful, -1 otherwise
  */
-int relay2_click_disable_relay_2(const uint8_t mikrobus_index);
+int relay2_click_disable_relay_2(uint8_t mikrobus_index);
 
 #endif