aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2026-10-31 13:52:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: move only the tilt of a tilt-only shade for sun and wind

Browse source 
The three places that act on the sun and wind each set different targets
for a tilt-only shade: the sun timer moved its lift, the no-sun and wind
timers moved tilt and lift, a group's sun flag moved its lift and only a
remote's sun flag moved its tilt. They now share sensorTargets(): a
tilt-only shade moves its tilt to the favorite tilt (or fully) and back to
0, and every other shade its lift, as Up and Down already do.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
cjkas 2026-10-13 21:14:20 +02:00
parent 8276c1c3cd
commit 5f26340d06
5 changed files with 83 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

48
test/test_sensors/test_sensors.cpp
View file

@ -135,6 +135,49 @@ static void test_timers_run_across_a_millis_rollover() {
TEST_ASSERT_TRUE(s.windBlocksDown(start + 2000));
}
/*********************************************************************
* sensorTargets
********************************************************************/
#define ASSERT_POS(expected, actual) TEST_ASSERT_FLOAT_WITHIN(0.01f, (expected), (actual))
static const float NO_FAVORITE = -1.0f;
static void test_lift_shade_extends_to_its_favorite() {
SensorTargets t = sensorTargets(SensorMove::extend, tilt_types::none, 60.0f, NO_FAVORITE);
TEST_ASSERT_TRUE(t.setLift);
ASSERT_POS(60.0f, t.lift);
TEST_ASSERT_FALSE(t.setTilt);
}
static void test_lift_shade_extends_fully_without_a_favorite() {
SensorTargets t = sensorTargets(SensorMove::extend, tilt_types::integrated, NO_FAVORITE, 30.0f);
TEST_ASSERT_TRUE(t.setLift);
ASSERT_POS(100.0f, t.lift);
TEST_ASSERT_FALSE(t.setTilt);
}
static void test_lift_shade_retracts_fully() {
SensorTargets t = sensorTargets(SensorMove::retract, tilt_types::tiltmotor, 60.0f, 30.0f);
TEST_ASSERT_TRUE(t.setLift);
ASSERT_POS(0.0f, t.lift);
TEST_ASSERT_FALSE(t.setTilt);
}
static void test_tilt_only_shade_only_moves_its_tilt() {
SensorTargets t = sensorTargets(SensorMove::extend, tilt_types::tiltonly, 60.0f, 30.0f);
TEST_ASSERT_FALSE(t.setLift);
TEST_ASSERT_TRUE(t.setTilt);
ASSERT_POS(30.0f, t.tilt);
t = sensorTargets(SensorMove::extend, tilt_types::tiltonly, 60.0f, NO_FAVORITE);
TEST_ASSERT_FALSE(t.setLift);
ASSERT_POS(100.0f, t.tilt);
t = sensorTargets(SensorMove::retract, tilt_types::tiltonly, 60.0f, 30.0f);
TEST_ASSERT_FALSE(t.setLift);
TEST_ASSERT_TRUE(t.setTilt);
ASSERT_POS(0.0f, t.tilt);
}
static void test_no_move_sets_nothing() {
SensorTargets t = sensorTargets(SensorMove::none, tilt_types::tiltonly, 60.0f, 30.0f);
TEST_ASSERT_FALSE(t.setLift);
TEST_ASSERT_FALSE(t.setTilt);
}
int main(int argc, char **argv) {
(void)argc;
(void)argv;
@ -155,5 +198,10 @@ int main(int argc, char **argv) {
RUN_TEST(test_sun_flag_does_nothing_in_wind);
RUN_TEST(test_clear_forgets_pending_timers);
RUN_TEST(test_timers_run_across_a_millis_rollover);
RUN_TEST(test_lift_shade_extends_to_its_favorite);
RUN_TEST(test_lift_shade_extends_fully_without_a_favorite);
RUN_TEST(test_lift_shade_retracts_fully);
RUN_TEST(test_tilt_only_shade_only_moves_its_tilt);
RUN_TEST(test_no_move_sets_nothing);
return UNITY_END();
}