Small various changes

Author: natanaeljr

.gitignore

@@ -2,4 +2,5 @@
 **/build
 **/sdkconfig
 **/sdkconfig.old
+tools.mk
 NOTES

example/Makefile examples/Makefile

@@ -4,6 +4,8 @@
 #
 
 PROJECT_NAME := I2Cbus
-EXTRA_COMPONENT_DIRS := ${HOME}/esp/libraries/I2Cbus
+
+# Add I2Cbus library path to components
+EXTRA_COMPONENT_DIRS := $(abspath ..)
 
 include $(IDF_PATH)/make/project.mk

example/main/component.mk examples/main/component.mk

@@ -22,29 +22,23 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
  ========================================================================= */
 
+#include <stdio.h>
 #include <stdint.h>
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "driver/gpio.h"
-#include "driver/i2c.h"
 #include "esp_log.h"
-
 #include "I2Cbus.hpp"
 
-#ifdef __cplusplus
-extern "C" {
-    void app_main(void);
-}
-#endif
 
 /**
  * I2Cbus0 and I2Cbus1 are the default objects
  * */
 
-void app_main() {
+extern "C" void app_main() {
     printf(LOG_BOLD("97") "\n[APP_MAIN]" LOG_RESET_COLOR "\n");
 
-    I2Cbus0.begin(GPIO_NUM_21, GPIO_NUM_22, 400000U);
+    ESP_ERROR_CHECK(I2Cbus0.begin(GPIO_NUM_21, GPIO_NUM_22, 400000U));
     I2Cbus0.setTimeout(10);
     I2Cbus0.scanner();
 
@@ -56,5 +50,6 @@ void app_main() {
         vTaskDelay(1000 / portTICK_PERIOD_MS);
     }
 
+    I2Cbus0.close();
     vTaskDelay(portMAX_DELAY);
 }

example/main/main.cpp examples/main/main.cpp

@@ -2,7 +2,7 @@
 # I2Cbus
 #
 CONFIG_I2CBUS_LOG_ERRORS=y
-CONFIG_I2CBUS_LOG_READWRITES=
-CONFIG_I2CBUS_LOG_RW_LEVEL_INFO=
+CONFIG_I2CBUS_LOG_READWRITES=y
+CONFIG_I2CBUS_LOG_RW_LEVEL_INFO=y
 CONFIG_I2CBUS_LOG_RW_LEVEL_DEBUG=
 CONFIG_I2CBUS_LOG_RW_LEVEL_VERBOSE=

example/sdkconfig.defaults examples/sdkconfig.defaults

@@ -41,7 +41,7 @@ IN THE SOFTWARE.
 #define ACK_LEVEL           (0x0)       /*!< Burst readings are ACK*/
 #define NACK_LEVEL          (0x1)       /*!< Last reading is NACK*/
 
-
+// Forward declaration
 class I2Cbus_t;
 
 // Default Objects
@@ -53,12 +53,12 @@ extern I2Cbus_t I2Cbus1;        /*!< port: I2C_NUM_1 */
  * I2CBUS
  * ^^^^^^ */
 class I2Cbus_t {
-private:
+ private:
     i2c_port_t port;            /*!< I2C port: I2C_NUM_0 or I2C_NUM_1 */
     uint32_t ticksToWait;       /*!< Timeout in ticks for read and write */
 
-public:
-    I2Cbus_t(i2c_port_t port);
+ public:
+    explicit I2Cbus_t(i2c_port_t port);
     ~I2Cbus_t();
 
     /** *** I2C Begin ***
@@ -77,7 +77,7 @@ class I2Cbus_t {
                     uint32_t clk_speed = I2CBUS_CLOCKSPEED_DEFAULT);
 
     esp_err_t begin(gpio_num_t sda_io_num, gpio_num_t scl_io_num,
-                    gpio_pullup_t sda_pullup_en, gpio_pullup_t scl_pullup_en, 
+                    gpio_pullup_t sda_pullup_en, gpio_pullup_t scl_pullup_en,
                     uint32_t clk_speed = I2CBUS_CLOCKSPEED_DEFAULT);
 
     /**

include/I2Cbus.hpp

@@ -22,6 +22,7 @@ IN THE SOFTWARE.
  ========================================================================= */
 
 #include "I2Cbus.hpp"
+#include <stdio.h>
 #include <stdint.h>
 #include "driver/i2c.h"
 #include "driver/gpio.h"
@@ -123,9 +124,9 @@ esp_err_t I2Cbus_t::writeBytes(uint8_t devAddr, uint8_t regAddr, size_t length,
     esp_err_t err = i2c_master_cmd_begin(port, cmd, (timeout < 0 ? ticksToWait : pdMS_TO_TICKS(timeout)));
     i2c_cmd_link_delete(cmd);
     #if defined CONFIG_I2CBUS_LOG_READWRITES
-        if (!err) { 
-            char str[length*5+1]; 
-            for(size_t i = 0; i < length; i++) 
+        if (!err) {
+            char str[length*5+1];
+            for (size_t i = 0; i < length; i++)
                 sprintf(str+i*5, "0x%s%X ", (data[i] < 0x10 ? "0" : ""), data[i]);
             I2CBUS_LOG_RW("[port:%d, slave:0x%X] Write %d bytes to register 0x%X, data: %s", port, devAddr, length, regAddr, str);
         }
@@ -180,9 +181,9 @@ esp_err_t I2Cbus_t::readBytes(uint8_t devAddr, uint8_t regAddr, size_t length, u
     esp_err_t err = i2c_master_cmd_begin(port, cmd, (timeout < 0 ? ticksToWait : pdMS_TO_TICKS(timeout)));
     i2c_cmd_link_delete(cmd);
     #if defined CONFIG_I2CBUS_LOG_READWRITES
-        if (!err) { 
-            char str[length*5+1]; 
-            for(size_t i = 0; i < length; i++) 
+        if (!err) {
+            char str[length*5+1];
+            for(size_t i = 0; i < length; i++)
             sprintf(str+i*5, "0x%s%X ", (data[i] < 0x10 ? "0" : ""), data[i]);
             I2CBUS_LOG_RW("[port:%d, slave:0x%X] Read %d bytes from register 0x%X, data: %s", port, devAddr, length, regAddr, str);
         }