ninharp/ninlight-w600
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat: Default-Transition, Weckschalter und farbfreier Ausschaltfade

Browse Source 
Zwei neue Einstellungen, beide wie fade_in/fade_out ueber
POST /api/v1/device/state les- und schreibbar und sofort wirksam:

- transition_default (Voreinstellung 300 ms) fuellt die Transition fuer
  Farb-, Weiss- und Helligkeitswechsel bei eingeschalteter Lampe, wenn der
  Aufruf kein eigenes "transition" mitbringt. Beim Ein- und Ausschalten
  behalten fade_in/fade_out weiterhin Vorrang.
- wake_on_change (Voreinstellung aus) schaltet die Lampe bei einer Farb-,
  Weiss- oder Helligkeitsaenderung ein, wenn sie aus war. Ein
  ausdrueckliches "on": false im selben Aufruf gewinnt immer.

Beide Felder haengen am Ende von nl_settings_t, damit bestehende Lampen
ueber die Laengentoleranz von read_rec() ihre echten Voreinstellungen
bekommen statt Nullen. nl_ctrl_set_fades() heisst jetzt
nl_ctrl_set_options().

Dazu ein Treiberfehler, der erst an der migrierten GU10 RGB auffiel: der
WY-Zweig von nl_sm2135eh_set() schrieb nur Header und WY-Daten, nie die
RGB-Datenregister. Der Chip behielt also die zuletzt gesetzte Farbe, und
bei einem direkten Wechsel Farbe -> Weiss (ohne Zwischenschritt ueber
dunkel) schaelte sie sich beim Ausblenden wieder frei. Der Header sendet
jetzt die - in Weiss immer nullwertigen - RGB-Daten mit.

Die Bruno-Collection zeigt Transition jetzt zusammen mit einem Farb- und
einem Weisswechsel im selben Aufruf und hat einen Request fuer die
beiden neuen Einstellungen.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Michael Sauer
2026-09-13 02:56:56 +02:00
co-authored by Claude Opus 5
parent 62a2b43175
commit 00d5a4c532
13 changed files with 256 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test_api.c
+33
View File
@@ -55,6 +55,8 @@ static void test_get_state(void)
TEST_ASSERT_EQUAL_STRING("last", cJSON_GetStringValue(field("power_on_behaviour")));
TEST_ASSERT_EQUAL_INT(700, field("fade_in")->valueint);
TEST_ASSERT_EQUAL_INT(500, field("fade_out")->valueint);
TEST_ASSERT_EQUAL_INT(300, field("transition_default")->valueint);
TEST_ASSERT_TRUE(cJSON_IsFalse(field("wake_on_change")));
cap = field("capabilities");
TEST_ASSERT_TRUE(cJSON_IsTrue(cJSON_GetObjectItem(cap, "color")));
TEST_ASSERT_EQUAL_INT(2700, cJSON_GetArrayItem(cJSON_GetObjectItem(cap, "color_temp"), 0)->valueint);
@@ -114,6 +116,8 @@ static void test_post_validation(void)
{"{\"power_on_behaviour\":\"maybe\"}", "invalid power_on_behaviour"},
{"{\"fade_in\":10001}", "invalid fade_in"},
{"{\"fade_out\":-1}", "invalid fade_out"},
{"{\"transition_default\":60001}", "invalid transition_default"},
{"{\"wake_on_change\":\"ja\"}", "invalid wake_on_change"},
};
for (size_t i = 0; i < sizeof CASES / sizeof CASES[0]; i++) {
call(NL_HTTP_POST, "/api/v1/device/state", NULL, CASES[i].body);
@@ -151,6 +155,33 @@ static void test_post_settings_fields(void)
TEST_ASSERT_EQUAL_STRING("on", cJSON_GetStringValue(field("power_on_behaviour")));
}
static void test_post_transition_default_and_wake(void)
{
call(NL_HTTP_POST, "/api/v1/device/state", NULL,
"{\"transition_default\":1200,\"wake_on_change\":true}");
TEST_ASSERT_EQUAL_INT(200, resp.status);
TEST_ASSERT_EQUAL_INT(1, fake_save_calls);
TEST_ASSERT_EQUAL_UINT16(1200, fake_settings.transition_ms);
TEST_ASSERT_EQUAL_UINT8(1, fake_settings.wake_on_change);
TEST_ASSERT_EQUAL_INT(1200, field("transition_default")->valueint);
TEST_ASSERT_TRUE(cJSON_IsTrue(field("wake_on_change")));
}
/* A colour and a per-call transition travel in the same request - the light change is
applied, and nothing is treated as a settings write. */
static void test_post_color_with_transition(void)
{
call(NL_HTTP_POST, "/api/v1/device/state", NULL,
"{\"color\":{\"r\":255,\"g\":0,\"b\":0},\"transition\":2000}");
TEST_ASSERT_EQUAL_INT(200, resp.status);
TEST_ASSERT_EQUAL_INT(1, fake_apply_calls);
TEST_ASSERT_EQUAL_INT(0, fake_save_calls);
TEST_ASSERT_TRUE(fake_last_change.has_transition);
TEST_ASSERT_EQUAL_UINT32(2000, fake_last_change.transition_ms);
TEST_ASSERT_TRUE(fake_last_change.has_color);
TEST_ASSERT_EQUAL_UINT8(255, fake_last_change.r);
}
static void test_post_save_failure(void)
{
fake_save_result = -1;
@@ -364,6 +395,8 @@ int main(void)
RUN_TEST(test_post_validation);
RUN_TEST(test_post_control_errors);
RUN_TEST(test_post_settings_fields);
RUN_TEST(test_post_transition_default_and_wake);
RUN_TEST(test_post_color_with_transition);
RUN_TEST(test_post_save_failure);
RUN_TEST(test_auth_all_protects_device_state);
RUN_TEST(test_auth_too_long_is_unauthenticated);
test/test_control.c
+115 -3
View File
@@ -10,18 +10,24 @@ static void out(const uint8_t ch[NL_CH_COUNT], void *ctx)
(void)ctx;
}
static void start(const char *board_id, bool on)
static void start_opts(const char *board_id, bool on, uint16_t transition_ms, bool wake)
{
const nl_board_t *b = nl_board_find(board_id);
nl_engine_cfg_t cfg = {b->ct_min, b->ct_max, out, NULL};
nl_engine_init(&cfg);
nl_ctrl_init(b, 500, 800);
nl_ctrl_init(b, 500, 800, transition_ms, wake);
nl_light_state_t s = nl_boot_default_state(b);
s.on = on;
nl_ctrl_boot(&s);
nl_engine_tick(10000); /* finish a possible boot fade */
}
/* Most tests want the historical behaviour: no default transition, no wake switch. */
static void start(const char *board_id, bool on)
{
start_opts(board_id, on, 0, false);
}
static uint16_t bri(void)
{
nl_visual_t v;
@@ -188,13 +194,112 @@ static void test_boot_fades_in_when_on(void)
const nl_board_t *b = nl_board_find("evk");
nl_engine_cfg_t cfg = {b->ct_min, b->ct_max, out, NULL};
nl_engine_init(&cfg);
nl_ctrl_init(b, 500, 800);
nl_ctrl_init(b, 500, 800, 0, false);
nl_light_state_t s = nl_boot_default_state(b);
nl_ctrl_boot(&s);
nl_engine_tick(250);
TEST_ASSERT_EQUAL_UINT16(5000, bri());
}
static void test_default_transition_applies_while_on(void)
{
start_opts("evk", true, 400, false);
nl_light_change_t c = chg();
c.has_brightness = true;
c.brightness = 50;
nl_ctrl_apply(&c, 0);
TEST_ASSERT_EQUAL_UINT16(10000, bri()); /* not instant any more */
nl_engine_tick(200);
TEST_ASSERT_EQUAL_UINT16(7500, bri());
nl_engine_tick(200);
TEST_ASSERT_EQUAL_UINT16(5000, bri());
}
static void test_explicit_transition_beats_default(void)
{
start_opts("evk", true, 5000, false);
nl_light_change_t c = chg();
c.has_brightness = true;
c.brightness = 50;
c.has_transition = true;
c.transition_ms = 100;
nl_ctrl_apply(&c, 0);
nl_engine_tick(100);
TEST_ASSERT_EQUAL_UINT16(5000, bri());
}
static void test_fades_beat_default_transition_when_switching(void)
{
start_opts("evk", false, 5000, false);
nl_light_change_t c = chg();
c.has_on = true;
c.on = true;
nl_ctrl_apply(&c, 0);
nl_engine_tick(500); /* fade_in, not the 5 s default */
TEST_ASSERT_EQUAL_UINT16(10000, bri());
c = chg();
c.has_on = true;
c.on = false;
nl_ctrl_apply(&c, 1000);
nl_engine_tick(800); /* fade_out */
TEST_ASSERT_EQUAL_UINT16(0, bri());
}
static void test_wake_switch_off_leaves_lamp_off(void)
{
start_opts("evk", false, 300, false);
nl_light_change_t c = chg();
c.has_ct = true;
c.ct = 3000;
nl_ctrl_apply(&c, 0);
nl_light_state_t s;
nl_ctrl_get(&s);
TEST_ASSERT_FALSE(s.on);
}
static void test_wake_switch_turns_lamp_on_with_fade_in(void)
{
start_opts("evk", false, 300, true);
nl_light_change_t c = chg();
c.has_ct = true;
c.ct = 3000;
nl_ctrl_apply(&c, 0);
nl_light_state_t s;
nl_ctrl_get(&s);
TEST_ASSERT_TRUE(s.on);
nl_engine_tick(250); /* fade_in = 500, not the 300 ms default transition */
TEST_ASSERT_EQUAL_UINT16(5000, bri());
}
static void test_wake_switch_also_reacts_to_brightness(void)
{
start_opts("evk", false, 300, true);
nl_light_change_t c = chg();
c.has_brightness = true;
c.brightness = 40;
nl_ctrl_apply(&c, 0);
nl_light_state_t s;
nl_ctrl_get(&s);
TEST_ASSERT_TRUE(s.on);
TEST_ASSERT_EQUAL_UINT8(40, s.brightness);
}
static void test_explicit_off_beats_wake_switch(void)
{
start_opts("evk", false, 300, true);
nl_light_change_t c = chg();
c.has_on = true;
c.on = false;
c.has_brightness = true;
c.brightness = 40;
nl_ctrl_apply(&c, 0);
nl_light_state_t s;
nl_ctrl_get(&s);
TEST_ASSERT_FALSE(s.on);
TEST_ASSERT_EQUAL_UINT8(40, s.brightness);
}
int main(void)
{
UNITY_BEGIN();
@@ -209,5 +314,12 @@ int main(void)
RUN_TEST(test_persist_debounce);
RUN_TEST(test_change_during_write_stays_dirty);
RUN_TEST(test_boot_fades_in_when_on);
RUN_TEST(test_default_transition_applies_while_on);
RUN_TEST(test_explicit_transition_beats_default);
RUN_TEST(test_fades_beat_default_transition_when_switching);
RUN_TEST(test_wake_switch_off_leaves_lamp_off);
RUN_TEST(test_wake_switch_turns_lamp_on_with_fade_in);
RUN_TEST(test_wake_switch_also_reacts_to_brightness);
RUN_TEST(test_explicit_off_beats_wake_switch);
return UNITY_END();
}
test/test_settings.c
+16
View File
@@ -42,6 +42,8 @@ static void test_defaults(void)
TEST_ASSERT_EQUAL_UINT8(NL_POB_LAST, s.power_on_behaviour);
TEST_ASSERT_EQUAL_UINT16(500, s.fade_in_ms);
TEST_ASSERT_EQUAL_UINT16(500, s.fade_out_ms);
TEST_ASSERT_EQUAL_UINT16(300, s.transition_ms);
TEST_ASSERT_EQUAL_UINT8(0, s.wake_on_change);
}
static void test_save_and_load(void)
@@ -108,6 +110,19 @@ static void test_load_accepts_shorter_record(void)
TEST_ASSERT_EQUAL_UINT16(500, out.fade_in_ms);
TEST_ASSERT_EQUAL_UINT16(500, out.fade_out_ms);
TEST_ASSERT_EQUAL_UINT8(0, out.ota_pending);
TEST_ASSERT_EQUAL_UINT16(300, out.transition_ms);
TEST_ASSERT_EQUAL_UINT8(0, out.wake_on_change);
}
static void test_transition_and_wake_roundtrip(void)
{
nl_settings_t in = sample("neu"), out;
in.transition_ms = 1500;
in.wake_on_change = 1;
TEST_ASSERT_EQUAL_INT(0, nl_settings_save(&in));
TEST_ASSERT_TRUE(nl_settings_load(&out));
TEST_ASSERT_EQUAL_UINT16(1500, out.transition_ms);
TEST_ASSERT_EQUAL_UINT8(1, out.wake_on_change);
}
static void test_load_rejects_longer_record(void)
@@ -171,6 +186,7 @@ int main(void)
{
UNITY_BEGIN();
RUN_TEST(test_defaults);
RUN_TEST(test_transition_and_wake_roundtrip);
RUN_TEST(test_save_and_load);
RUN_TEST(test_alternates_slots);
RUN_TEST(test_power_loss_keeps_previous);