Mock platform

api/mraa/initio.hpp

@@ -47,7 +47,7 @@ namespace mraa
 class MraaIo
 {
   private:
-    mraa_io_descriptor* descs;
+    mraa_io_descriptor* descs = nullptr;
 
   public:
     MraaIo(const std::string& initStr) : descs()
@@ -109,39 +109,41 @@ class MraaIo
 
     ~MraaIo()
     {
-        if (descs->leftover_str) {
-            free(descs->leftover_str);
-        }
-
-        if (descs->n_aio) {
-            free(descs->aios);
-        }
-        if (descs->n_gpio) {
-            free(descs->gpios);
-        }
-        if (descs->n_i2c) {
-            free(descs->i2cs);
-        }
+        if(descs != nullptr) {
+            if (descs->leftover_str) {
+                free(descs->leftover_str);
+            }
+
+            if (descs->n_aio) {
+                free(descs->aios);
+            }
+            if (descs->n_gpio) {
+                free(descs->gpios);
+            }
+            if (descs->n_i2c) {
+                free(descs->i2cs);
+            }
 #if !defined(PERIPHERALMAN)
-        if (descs->n_iio) {
-            free(descs->iios);
-        }
+            if (descs->n_iio) {
+                free(descs->iios);
+            }
 #endif
-        if (descs->n_pwm) {
-            free(descs->pwms);
-        }
-        if (descs->n_spi) {
-            free(descs->spis);
-        }
-        if (descs->n_uart) {
-            free(descs->uarts);
+            if (descs->n_pwm) {
+                free(descs->pwms);
+            }
+            if (descs->n_spi) {
+                free(descs->spis);
+            }
+            if (descs->n_uart) {
+                free(descs->uarts);
+            }
+            if (descs->n_uart_ow) {
+                free(descs->uart_ows);
+            }
+
+            /* Finally free the mraa_io_descriptor structure. */
+            free(descs);
         }
-        if (descs->n_uart_ow) {
-            free(descs->uart_ows);
-        }
-
-        /* Finally free the mraa_io_descriptor structure. */
-        free(descs);
     }
 
   public:

include/mock/mock_board.h

@@ -30,7 +30,18 @@ extern "C" {
 
 #include "mraa_internal.h"
 
-#define MRAA_MOCK_PINCOUNT 10
+#define MRAA_MOCK_GPIO_COUNT      1
+#define MRAA_MOCK_AIO_COUNT       1
+#define MRAA_MOCK_I2C_BUS_COUNT   1
+#define MRAA_MOCK_SPI_BUS_COUNT   1
+#define MRAA_MOCK_PWM_DEV_COUNT   1
+#define MRAA_MOCK_UART_DEV_COUNT  1
+#define MRAA_MOCK_PINCOUNT (MRAA_MOCK_GPIO_COUNT + MRAA_MOCK_AIO_COUNT + \
+                           2 * MRAA_MOCK_I2C_BUS_COUNT +  4 * MRAA_MOCK_SPI_BUS_COUNT + \
+                           MRAA_MOCK_PWM_DEV_COUNT + 2 * MRAA_MOCK_UART_DEV_COUNT)
+
+#define MRAA_PWM_OFFSET (MRAA_MOCK_GPIO_COUNT + MRAA_MOCK_AIO_COUNT + \
+                        2 * MRAA_MOCK_I2C_BUS_COUNT + 4 * MRAA_MOCK_SPI_BUS_COUNT)
 
 mraa_board_t*
 mraa_mock_board();

include/mock/mock_board_i2c.h

@@ -33,7 +33,7 @@ extern "C" {
 // Mock I2C device address
 #define MOCK_I2C_DEV_ADDR 0x33
 // Mock I2C device data registers block length in bytes. Our code assumes it's >= 1.
-#define MOCK_I2C_DEV_DATA_LEN 10
+#define MOCK_I2C_DEV_DATA_LEN 255
 // Initial value for each byte in the mock I2C device data registers
 #define MOCK_I2C_DEV_DATA_INIT_BYTE 0xAB
 

include/mock/mock_board_pwm.h

@@ -0,0 +1,50 @@
+/*
+ * Author: Adelin Dobre <[email protected]>
+ * Copyright (c) 2019 Adelin Dobre.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "mraa_internal.h"
+
+mraa_result_t
+mraa_mock_pwm_init_raw_replace(mraa_pwm_context dev, int pin);
+
+mraa_result_t
+mraa_mock_pwm_write_period_replace(mraa_pwm_context dev, int period);
+
+mraa_result_t
+mraa_mock_pwm_write_duty_replace(mraa_pwm_context dev, int duty);
+
+int
+mraa_mock_pwm_read_duty_replace(mraa_pwm_context dev);
+
+mraa_result_t
+mraa_mock_pwm_enable_replace(mraa_pwm_context dev, int enable);
+
+#ifdef __cplusplus
+}
+#endif

src/CMakeLists.txt

@@ -114,6 +114,7 @@ set (mraa_LIB_MOCK_SRCS_NOAUTO
   ${PROJECT_SOURCE_DIR}/src/mock/mock_board_gpio.c
   ${PROJECT_SOURCE_DIR}/src/mock/mock_board_aio.c
   ${PROJECT_SOURCE_DIR}/src/mock/mock_board_i2c.c
+  ${PROJECT_SOURCE_DIR}/src/mock/mock_board_pwm.c
   ${PROJECT_SOURCE_DIR}/src/mock/mock_board_spi.c
   ${PROJECT_SOURCE_DIR}/src/mock/mock_board_uart.c
 )

src/initio/initio.c

@@ -787,7 +787,6 @@ mraa_io_init(const char* strdesc, mraa_io_descriptor** desc)
                     strncat(new_desc->leftover_str, str_descs[i], strlen(str_descs[i]));
                 }
 
-                strncat(new_desc->leftover_str, str_descs[i], strlen(str_descs[i]));
                 leftover_str_len += strlen(str_descs[i]) + 1;
                 new_desc->leftover_str[leftover_str_len - 1] = ',';
                 new_desc->leftover_str[leftover_str_len] = '\0';