Compare commits
5 Commits
f31eae649f
...
release-0.
| Author | SHA1 | Date | |
|---|---|---|---|
|
2e81966afb
|
|||
| 5734f47cd3 | |||
|
d884f5f45c
|
|||
|
c7678d6084
|
|||
|
8527ebea83
|
@@ -38,7 +38,7 @@ dependencies:
|
|||||||
# Add as a custom component from git repository
|
# Add as a custom component from git repository
|
||||||
relay_chn:
|
relay_chn:
|
||||||
git: https://git.kozmotronik.com.tr/KozmotronikTech/relay_chn.git
|
git: https://git.kozmotronik.com.tr/KozmotronikTech/relay_chn.git
|
||||||
version: '>=0.4.0'
|
version: '>=0.5.0'
|
||||||
```
|
```
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
name: relay_chn
|
name: relay_chn
|
||||||
version: "0.4.0"
|
version: "0.5.0"
|
||||||
description: "Custom component for relay channel control"
|
description: "Custom component for relay channel control"
|
||||||
license: "MIT"
|
license: "MIT"
|
||||||
url: "https://git.kozmotronik.com.tr/KozmotronikTech/relay_chn_component"
|
url: "https://git.kozmotronik.com.tr/KozmotronikTech/relay_chn"
|
||||||
repository: "https://git.kozmotronik.com.tr/KozmotronikTech/relay_chn_component.git"
|
repository: "https://git.kozmotronik.com.tr/KozmotronikTech/relay_chn.git"
|
||||||
@@ -1268,8 +1268,11 @@ static uint32_t relay_chn_tilt_count_update(relay_chn_t *relay_chn)
|
|||||||
return ++relay_chn->tilt_control.tilt_counter.tilt_forward_count;
|
return ++relay_chn->tilt_control.tilt_counter.tilt_forward_count;
|
||||||
}
|
}
|
||||||
else if (relay_chn->tilt_control.cmd == RELAY_CHN_TILT_CMD_REVERSE) {
|
else if (relay_chn->tilt_control.cmd == RELAY_CHN_TILT_CMD_REVERSE) {
|
||||||
if (relay_chn->tilt_control.tilt_counter.tilt_forward_count > 0)
|
if (relay_chn->tilt_control.tilt_counter.tilt_forward_count > 0) {
|
||||||
return --relay_chn->tilt_control.tilt_counter.tilt_forward_count;
|
--relay_chn->tilt_control.tilt_counter.tilt_forward_count;
|
||||||
|
// Still should do one more move, return non-zero value
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -1283,8 +1286,11 @@ static uint32_t relay_chn_tilt_count_update(relay_chn_t *relay_chn)
|
|||||||
return ++relay_chn->tilt_control.tilt_counter.tilt_reverse_count;
|
return ++relay_chn->tilt_control.tilt_counter.tilt_reverse_count;
|
||||||
}
|
}
|
||||||
else if (relay_chn->tilt_control.cmd == RELAY_CHN_TILT_CMD_FORWARD) {
|
else if (relay_chn->tilt_control.cmd == RELAY_CHN_TILT_CMD_FORWARD) {
|
||||||
if (relay_chn->tilt_control.tilt_counter.tilt_reverse_count > 0)
|
if (relay_chn->tilt_control.tilt_counter.tilt_reverse_count > 0) {
|
||||||
return --relay_chn->tilt_control.tilt_counter.tilt_reverse_count;
|
--relay_chn->tilt_control.tilt_counter.tilt_reverse_count;
|
||||||
|
// Still should do one more move, return non-zero value
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,4 +44,6 @@ void app_main(void)
|
|||||||
|
|
||||||
UNITY_END();
|
UNITY_END();
|
||||||
ESP_LOGI(TEST_TAG, "All tests complete.");
|
ESP_LOGI(TEST_TAG, "All tests complete.");
|
||||||
|
|
||||||
|
esp_restart(); // Restart to invoke qemu exit
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -283,3 +283,107 @@ TEST_CASE("tilt_auto with ID_ALL tilts channels based on last run direction", "[
|
|||||||
TEST_ASSERT_EQUAL(RELAY_CHN_STATE_TILT_FORWARD, relay_chn_get_state(0));
|
TEST_ASSERT_EQUAL(RELAY_CHN_STATE_TILT_FORWARD, relay_chn_get_state(0));
|
||||||
TEST_ASSERT_EQUAL(RELAY_CHN_STATE_TILT_REVERSE, relay_chn_get_state(1));
|
TEST_ASSERT_EQUAL(RELAY_CHN_STATE_TILT_REVERSE, relay_chn_get_state(1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Test relay_chn_tilt_auto() chooses correct tilt direction
|
||||||
|
TEST_CASE("relay_chn_tilt_auto chooses correct direction", "[relay_chn][tilt][auto]") {
|
||||||
|
uint8_t ch = 0;
|
||||||
|
TEST_ESP_OK(relay_chn_create(gpio_map, gpio_count));
|
||||||
|
g_is_component_initialized = true;
|
||||||
|
|
||||||
|
// Prepare FORWARD
|
||||||
|
prepare_channel_for_tilt(ch, RELAY_CHN_CMD_FORWARD);
|
||||||
|
relay_chn_tilt_auto(ch);
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(test_delay_margin_ms));
|
||||||
|
TEST_ASSERT_EQUAL(RELAY_CHN_STATE_TILT_FORWARD, relay_chn_get_state(ch));
|
||||||
|
relay_chn_tilt_stop(ch);
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(test_delay_margin_ms));
|
||||||
|
|
||||||
|
// Prepare REVERSE
|
||||||
|
prepare_channel_for_tilt(ch, RELAY_CHN_CMD_REVERSE);
|
||||||
|
relay_chn_tilt_auto(ch);
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(test_delay_margin_ms));
|
||||||
|
TEST_ASSERT_EQUAL(RELAY_CHN_STATE_TILT_REVERSE, relay_chn_get_state(ch));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test sensitivity set/get
|
||||||
|
TEST_CASE("relay_chn_tilt_sensitivity_set and get", "[relay_chn][tilt][sensitivity]") {
|
||||||
|
uint8_t ch = 0;
|
||||||
|
uint8_t val = 0;
|
||||||
|
TEST_ESP_OK(relay_chn_create(gpio_map, gpio_count));
|
||||||
|
g_is_component_initialized = true;
|
||||||
|
|
||||||
|
relay_chn_tilt_sensitivity_set(ch, 0);
|
||||||
|
TEST_ESP_OK(relay_chn_tilt_sensitivity_get(ch, &val, 1));
|
||||||
|
TEST_ASSERT_EQUAL_UINT8(0, val);
|
||||||
|
|
||||||
|
relay_chn_tilt_sensitivity_set(ch, 50);
|
||||||
|
TEST_ESP_OK(relay_chn_tilt_sensitivity_get(ch, &val, 1));
|
||||||
|
TEST_ASSERT_EQUAL_UINT8(50, val);
|
||||||
|
|
||||||
|
relay_chn_tilt_sensitivity_set(ch, 100);
|
||||||
|
TEST_ESP_OK(relay_chn_tilt_sensitivity_get(ch, &val, 1));
|
||||||
|
TEST_ASSERT_EQUAL_UINT8(100, val);
|
||||||
|
|
||||||
|
// Set all channels
|
||||||
|
relay_chn_tilt_sensitivity_set(RELAY_CHN_ID_ALL, 42);
|
||||||
|
uint8_t vals[CONFIG_RELAY_CHN_COUNT] = {0};
|
||||||
|
TEST_ESP_OK(relay_chn_tilt_sensitivity_get(RELAY_CHN_ID_ALL, vals, relay_chn_count));
|
||||||
|
for (int i = 0; i < relay_chn_count; ++i) {
|
||||||
|
TEST_ASSERT_EQUAL_UINT8(42, vals[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test tilt counter logic: forward x3, reverse x3, extra reverse fails
|
||||||
|
TEST_CASE("tilt counter logic: forward and reverse consumption", "[relay_chn][tilt][counter]") {
|
||||||
|
uint8_t ch = 0;
|
||||||
|
TEST_ESP_OK(relay_chn_create(gpio_map, gpio_count));
|
||||||
|
g_is_component_initialized = true;
|
||||||
|
|
||||||
|
prepare_channel_for_tilt(ch, RELAY_CHN_CMD_FORWARD);
|
||||||
|
|
||||||
|
// Tilt forward 3 times
|
||||||
|
for (int i = 0; i < 3; ++i) {
|
||||||
|
relay_chn_tilt_forward(ch);
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(test_delay_margin_ms));
|
||||||
|
TEST_ASSERT_EQUAL(RELAY_CHN_STATE_TILT_FORWARD, relay_chn_get_state(ch));
|
||||||
|
relay_chn_tilt_stop(ch);
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(test_delay_margin_ms));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Now tilt reverse 3 times (should succeed)
|
||||||
|
for (int i = 0; i < 3; ++i) {
|
||||||
|
relay_chn_tilt_reverse(ch);
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(test_delay_margin_ms));
|
||||||
|
if (i < 3) {
|
||||||
|
TEST_ASSERT_EQUAL(RELAY_CHN_STATE_TILT_REVERSE, relay_chn_get_state(ch));
|
||||||
|
relay_chn_tilt_stop(ch);
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(test_delay_margin_ms));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extra reverse tilt should fail (counter exhausted)
|
||||||
|
relay_chn_tilt_reverse(ch);
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(test_delay_margin_ms));
|
||||||
|
// Should not enter TILT_REVERSE, should remain FREE or STOPPED
|
||||||
|
relay_chn_state_t state = relay_chn_get_state(ch);
|
||||||
|
TEST_ASSERT(state != RELAY_CHN_STATE_TILT_REVERSE);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test run command during TILT state
|
||||||
|
TEST_CASE("run command during TILT state transitions correctly", "[relay_chn][tilt][run-during-tilt]") {
|
||||||
|
uint8_t ch = 0;
|
||||||
|
TEST_ESP_OK(relay_chn_create(gpio_map, gpio_count));
|
||||||
|
g_is_component_initialized = true;
|
||||||
|
|
||||||
|
prepare_channel_for_tilt(ch, RELAY_CHN_CMD_FORWARD);
|
||||||
|
relay_chn_tilt_forward(ch);
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(opposite_inertia_ms + test_delay_margin_ms));
|
||||||
|
TEST_ASSERT_EQUAL(RELAY_CHN_STATE_TILT_FORWARD, relay_chn_get_state(ch));
|
||||||
|
|
||||||
|
// Issue run reverse while in TILT_FORWARD
|
||||||
|
relay_chn_run_reverse(ch);
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(test_delay_margin_ms));
|
||||||
|
// Should transition to REVERSE or REVERSE_PENDING depending on inertia logic
|
||||||
|
relay_chn_state_t state = relay_chn_get_state(ch);
|
||||||
|
TEST_ASSERT(state == RELAY_CHN_STATE_REVERSE || state == RELAY_CHN_STATE_REVERSE_PENDING);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user