Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Mock platform #949

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Mock platform #949

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
54e9fc7
initio: Add safety checks inside MraaIo destructor
adelindobre Oct 25, 2018
d383c4c
mock_platform: Mock functionalities for pwm / Add support for multipl…
adelindobre Jan 14, 2019
d3f7e65
api_common_hpp_unit: Change getPinCount test for mock_platform
adelindobre Jan 21, 2019
15b4384
platform_checks.py: Change PLATFORM_PINCOUNT after pwm added on mock_…
adelindobre Jan 21, 2019
b7e348c
mock_board_i2c: Increase register block length
adelindobre Jan 22, 2019
b116331
tests/mock/i2c_checks: Change MRAA_MOCK_I2C_DATA_LEN and correct two …
adelindobre Jan 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion include/mock/mock_board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update the mock platform description in docs accordingly, right now the PWM functionality and the extra pin are not mentioned.

#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 + \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: shis and line below need one more space to align on opening (

MRAA_MOCK_PWM_DEV_COUNT + 2 * MRAA_MOCK_UART_DEV_COUNT)

#define MRAA_PWM_OFFSET (MRAA_MOCK_GPIO_COUNT + MRAA_MOCK_AIO_COUNT + \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's make this a base for MRAA_MOCK_PINCOUNT to avoid repeating the same piece two times.

2 * MRAA_MOCK_I2C_BUS_COUNT + 4 * MRAA_MOCK_SPI_BUS_COUNT)

mraa_board_t*
mraa_mock_board();
Expand Down
50 changes: 50 additions & 0 deletions include/mock/mock_board_pwm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* Author: Adelin Dobre <adelin.dobre@rinftech.com>
* 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
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
212 changes: 129 additions & 83 deletions src/mock/mock_board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,20 @@

#include <stdlib.h>
#include <string.h>
#include <stdio.h>

#include "common.h"
#include "mock/mock_board.h"
#include "mock/mock_board_gpio.h"
#include "mock/mock_board_aio.h"
#include "mock/mock_board_i2c.h"
#include "mock/mock_board_spi.h"
#include "mock/mock_board_pwm.h"
#include "mock/mock_board_uart.h"

#define PLATFORM_NAME "MRAA mock platform"
#define UART_DEV_PATH "dummy"
#define PWM_DEV_PATH "dummy"

mraa_board_t*
mraa_mock_board()
Expand All @@ -47,35 +50,54 @@ mraa_mock_board()
// General board definitions
b->platform_name = PLATFORM_NAME;
b->phy_pin_count = MRAA_MOCK_PINCOUNT;
b->gpio_count = 1;
b->aio_count = 1;
b->gpio_count = MRAA_MOCK_GPIO_COUNT;
b->aio_count = MRAA_MOCK_AIO_COUNT;
b->adc_raw = 12;
b->adc_supported = 10;

b->i2c_bus_count = 1;
b->i2c_bus[0].bus_id = 0;
b->i2c_bus[0].sda = 2;
b->i2c_bus[0].scl = 3;
int i2c_offset = MRAA_MOCK_GPIO_COUNT + MRAA_MOCK_AIO_COUNT;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: as we don't expect this do be a negative please use uint or somesuch

b->i2c_bus_count = MRAA_MOCK_I2C_BUS_COUNT;

for(int index = 0; index < MRAA_MOCK_I2C_BUS_COUNT; index++) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a space after for and before ( to align with mraa code style. Better yet - please run clang-format on your submissions with the confir file from the repo root.

b->i2c_bus[index].bus_id = index;
b->i2c_bus[index].sda = i2c_offset + 2 * index;
b->i2c_bus[index].scl = i2c_offset + 2 * index + 1;
}
b->def_i2c_bus = b->i2c_bus[0].bus_id;

b->spi_bus_count = 1;
int spi_offset = i2c_offset + 2 * MRAA_MOCK_I2C_BUS_COUNT;
b->spi_bus_count = MRAA_MOCK_SPI_BUS_COUNT;
b->def_spi_bus = 0;
b->spi_bus[0].bus_id = 0;
b->spi_bus[0].slave_s = 0;
b->spi_bus[0].cs = 4;
b->spi_bus[0].mosi = 5;
b->spi_bus[0].miso = 6;
b->spi_bus[0].sclk = 7;

b->pwm_default_period = 0;
b->pwm_max_period = 0;
b->pwm_min_period = 0;

b->uart_dev_count = 1;

for(int index = 0; index < MRAA_MOCK_SPI_BUS_COUNT; index++) {
b->spi_bus[index].bus_id = index;
b->spi_bus[index].slave_s = 0;
b->spi_bus[index].cs = spi_offset + 4 * index;
b->spi_bus[index].mosi = spi_offset + 4 * index + 1;
b->spi_bus[index].miso = spi_offset + 4 * index + 2;
b->spi_bus[index].sclk = spi_offset + 4 * index + 3;
}

int pwm_offset = spi_offset + 4 * MRAA_MOCK_SPI_BUS_COUNT;
b->pwm_dev_count = MRAA_MOCK_PWM_DEV_COUNT;
b->pwm_default_period = 500;
b->pwm_max_period = 2147483;
b->pwm_min_period = 1;

for(int index = 0; index < MRAA_MOCK_PWM_DEV_COUNT; index++) {
b->pwm_dev[index].index = pwm_offset + index;
b->pwm_dev[index].device_path = PWM_DEV_PATH;
}

int uart_offset = pwm_offset + MRAA_MOCK_PWM_DEV_COUNT;
b->uart_dev_count = MRAA_MOCK_UART_DEV_COUNT;
b->def_uart_dev = 0;
b->uart_dev[0].rx = 8;
b->uart_dev[0].tx = 9;
b->uart_dev[0].device_path = UART_DEV_PATH;

for(int index = 0; index < MRAA_MOCK_UART_DEV_COUNT; index++) {
b->uart_dev[index].rx = uart_offset + 2 * index;
b->uart_dev[index].tx = uart_offset + 2 * index + 1;
b->uart_dev[index].device_path = UART_DEV_PATH;
}

b->pins = (mraa_pininfo_t*) malloc(sizeof(mraa_pininfo_t) * MRAA_MOCK_PINCOUNT);
if (b->pins == NULL) {
Expand Down Expand Up @@ -125,6 +147,11 @@ mraa_mock_board()
b->adv_func->spi_write_word_replace = &mraa_mock_spi_write_word_replace;
b->adv_func->spi_transfer_buf_replace = &mraa_mock_spi_transfer_buf_replace;
b->adv_func->spi_transfer_buf_word_replace = &mraa_mock_spi_transfer_buf_word_replace;
b->adv_func->pwm_init_raw_replace = &mraa_mock_pwm_init_raw_replace;
b->adv_func->pwm_period_replace = &mraa_mock_pwm_write_period_replace;
b->adv_func->pwm_write_replace = &mraa_mock_pwm_write_duty_replace;
b->adv_func->pwm_read_replace = &mraa_mock_pwm_read_duty_replace;
b->adv_func->pwm_enable_replace = &mraa_mock_pwm_enable_replace;
b->adv_func->uart_init_raw_replace = &mraa_mock_uart_init_raw_replace;
b->adv_func->uart_set_baudrate_replace = &mraa_mock_uart_set_baudrate_replace;
b->adv_func->uart_flush_replace = &mraa_mock_uart_flush_replace;
Expand All @@ -140,67 +167,86 @@ mraa_mock_board()
// Pin definitions
int pos = 0;

strncpy(b->pins[pos].name, "GPIO0", 8);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 0 };
b->pins[pos].gpio.pinmap = 0;
b->pins[pos].gpio.mux_total = 0;
pos++;

strncpy(b->pins[pos].name, "ADC0", 8);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 0, 1, 0 };
b->pins[pos].aio.pinmap = 0;
b->pins[pos].aio.mux_total = 0;
pos++;

strncpy(b->pins[pos].name, "I2C0SDA", 8);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 1, 0, 0 };
b->pins[pos].i2c.mux_total = 0;
b->pins[pos].i2c.pinmap = 0;
pos++;

strncpy(b->pins[pos].name, "I2C0SCL", 8);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 1, 0, 0 };
b->pins[pos].i2c.mux_total = 0;
b->pins[pos].i2c.pinmap = 0;
pos++;

strncpy(b->pins[pos].name, "SPI0CS", 8);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 1, 0, 0, 0 };
b->pins[pos].spi.mux_total = 0;
b->pins[pos].spi.pinmap = 0;
pos++;

strncpy(b->pins[pos].name, "SPI0MOSI", 8);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 1, 0, 0, 0 };
b->pins[pos].spi.mux_total = 0;
b->pins[pos].spi.pinmap = 0;
pos++;

strncpy(b->pins[pos].name, "SPI0MISO", 8);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 1, 0, 0, 0 };
b->pins[pos].spi.mux_total = 0;
b->pins[pos].spi.pinmap = 0;
pos++;

strncpy(b->pins[pos].name, "SPI0SCLK", 8);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 1, 0, 0, 0 };
b->pins[pos].spi.mux_total = 0;
b->pins[pos].spi.pinmap = 0;
pos++;

strncpy(b->pins[pos].name, "UART0RX", 8);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 0, 0, 1 };
b->pins[pos].uart.pinmap = 0;
b->pins[pos].uart.parent_id = 0;
b->pins[pos].uart.mux_total = 0;
pos++;

strncpy(b->pins[pos].name, "UART0TX", 8);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 0, 0, 1 };
b->pins[pos].uart.pinmap = 0;
b->pins[pos].uart.parent_id = 0;
b->pins[pos].uart.mux_total = 0;
pos++;
for(int index = 0; index < MRAA_MOCK_GPIO_COUNT; index++) {
snprintf(b->pins[pos].name, 8, "GPIO%d", index);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 0 };
b->pins[pos].gpio.pinmap = index;
b->pins[pos].gpio.mux_total = 0;
pos++;
}

for(int index = 0; index < MRAA_MOCK_AIO_COUNT; index++) {
snprintf(b->pins[pos].name, 8, "ADC%d", index);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 0, 1, 0 };
b->pins[pos].aio.pinmap = 0;
b->pins[pos].aio.mux_total = 0;
pos++;
}

for(int index = 0; index < MRAA_MOCK_I2C_BUS_COUNT; index++) {
snprintf(b->pins[pos].name, 8, "I2C%dSDA", index);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 1, 0, 0 };
b->pins[pos].i2c.mux_total = 0;
b->pins[pos].i2c.pinmap = 0;
pos++;

snprintf(b->pins[pos].name, 8, "I2C%dSCL", index);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 1, 0, 0 };
b->pins[pos].i2c.mux_total = 0;
b->pins[pos].i2c.pinmap = 0;
pos++;
}

for(int index = 0; index < MRAA_MOCK_SPI_BUS_COUNT; index++) {
snprintf(b->pins[pos].name, 8, "SPI%dCS", index);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 1, 0, 0, 0 };
b->pins[pos].spi.mux_total = 0;
b->pins[pos].spi.pinmap = 0;
pos++;

snprintf(b->pins[pos].name, 9, "SPI%dMOSI", index);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 1, 0, 0, 0 };
b->pins[pos].spi.mux_total = 0;
b->pins[pos].spi.pinmap = 0;
pos++;

snprintf(b->pins[pos].name, 9, "SPI%dMISO", index);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 1, 0, 0, 0 };
b->pins[pos].spi.mux_total = 0;
b->pins[pos].spi.pinmap = 0;
pos++;

snprintf(b->pins[pos].name, 9, "SPI%dSCLK", index);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 1, 0, 0, 0 };
b->pins[pos].spi.mux_total = 0;
b->pins[pos].spi.pinmap = 0;
pos++;
}

for(int index = 0; index < MRAA_MOCK_PWM_DEV_COUNT; index++) {
snprintf(b->pins[pos].name, 8, "PWM%d", index);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 1, 0, 0, 0, 0, 0 };
b->pins[pos].pwm.pinmap = index;
b->pins[pos].pwm.parent_id = 0;
b->pins[pos].pwm.mux_total = 0;
pos++;
}

for(int index = 0; index < MRAA_MOCK_UART_DEV_COUNT; index++) {
snprintf(b->pins[pos].name, 8, "UART%dRX", index);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 0, 0, 1 };
b->pins[pos].uart.pinmap = 0;
b->pins[pos].uart.parent_id = 0;
b->pins[pos].uart.mux_total = 0;
pos++;

snprintf(b->pins[pos].name, 8, "UART%dTX", index);
b->pins[pos].capabilities = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 0, 0, 1 };
b->pins[pos].uart.pinmap = 0;
b->pins[pos].uart.parent_id = 0;
b->pins[pos].uart.mux_total = 0;
pos++;
}

return b;

Expand Down
Loading