6 Commits

4 changed files with 12 additions and 34 deletions

View File

@@ -280,7 +280,8 @@ static esp_err_t relay_chn_create_event_loop()
.task_core_id = tskNO_AFFINITY .task_core_id = tskNO_AFFINITY
}; };
esp_err_t ret = esp_event_loop_create(&loop_args, &relay_chn_event_loop); esp_err_t ret = esp_event_loop_create(&loop_args, &relay_chn_event_loop);
ret |= esp_event_handler_register_with(relay_chn_event_loop, ESP_RETURN_ON_ERROR(ret, TAG, "Failed to create event loop for relay channel");
ret = esp_event_handler_register_with(relay_chn_event_loop,
RELAY_CHN_CMD_EVENT, RELAY_CHN_CMD_EVENT,
ESP_EVENT_ANY_ID, ESP_EVENT_ANY_ID,
relay_chn_event_handler, NULL); relay_chn_event_handler, NULL);
@@ -701,7 +702,8 @@ static esp_err_t relay_chn_output_stop(relay_chn_t *relay_chn)
{ {
esp_err_t ret; esp_err_t ret;
ret = gpio_set_level(relay_chn->output.forward_pin, 0); ret = gpio_set_level(relay_chn->output.forward_pin, 0);
ret |= gpio_set_level(relay_chn->output.reverse_pin, 0); ESP_RETURN_ON_ERROR(ret, TAG, "Failed to set forward pin to LOW for relay channel #%d", relay_chn->id);
ret = gpio_set_level(relay_chn->output.reverse_pin, 0);
return ret; return ret;
} }
@@ -709,7 +711,8 @@ static esp_err_t relay_chn_output_forward(relay_chn_t *relay_chn)
{ {
esp_err_t ret; esp_err_t ret;
ret = gpio_set_level(relay_chn->output.forward_pin, 1); ret = gpio_set_level(relay_chn->output.forward_pin, 1);
ret |= gpio_set_level(relay_chn->output.reverse_pin, 0); ESP_RETURN_ON_ERROR(ret, TAG, "Failed to set forward pin to HIGH for relay channel #%d", relay_chn->id);
ret = gpio_set_level(relay_chn->output.reverse_pin, 0);
return ret; return ret;
} }
@@ -717,7 +720,8 @@ static esp_err_t relay_chn_output_reverse(relay_chn_t *relay_chn)
{ {
esp_err_t ret; esp_err_t ret;
ret = gpio_set_level(relay_chn->output.forward_pin, 0); ret = gpio_set_level(relay_chn->output.forward_pin, 0);
ret |= gpio_set_level(relay_chn->output.reverse_pin, 1); ESP_RETURN_ON_ERROR(ret, TAG, "Failed to set forward pin to LOW for relay channel #%d", relay_chn->id);
ret = gpio_set_level(relay_chn->output.reverse_pin, 1);
return ret; return ret;
} }

View File

@@ -1,8 +1,3 @@
# The following lines of boilerplate have to be in your project's CMakeLists idf_component_register(SRCS_DIRS "."
# in this exact order for cmake to work correctly INCLUDE_DIRS "."
cmake_minimum_required(VERSION 3.5) REQUIRES unity relay_chn)
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components"
"../../relay_chn")
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
project(relay_chn_test)

View File

@@ -1,3 +0,0 @@
idf_component_register(SRCS_DIRS "."
PRIV_INCLUDE_DIRS "."
PRIV_REQUIRES unity test_utils relay_chn)

View File

@@ -74,22 +74,4 @@ TEST_CASE("Relay channels do not change state for invalid channel", "[relay_chn]
check_channels_state_unchanged(); check_channels_state_unchanged();
relay_chn_flip_direction(relay_chn_count + 1); // Flip the direction relay_chn_flip_direction(relay_chn_count + 1); // Flip the direction
check_channels_state_unchanged(); check_channels_state_unchanged();
} }
void setUp(void)
{
// Run before each test
}
void tearDown(void)
{
// Run after each test
}
// Test app entry point
void app_main(void)
{
// Run the Unity tests menu
unity_run_menu();
}