Let modes reach relay lights and fans through output types #124

Claude · 2026-10-15T18:34:33Z

Claude commented

2026-10-15 18:34:33 +00:00

YN-7. Every relay is EndpointType::Switch, so modeSwitchesOff never turned a relay lamp off in LightsOut or Travel. It now decides by semantic class (Light or Fan), and Endpoint::onMode passes the endpoint's own class. The EndpointType overload is gone; extractor_policy.h and the existing mode tests pass semantic classes. Spec section 7 gains one sentence saying lighting and fans are the endpoints with that class.

YAML: the output types are now light, fan and load (relays, SwitchEndpoint) and dimmable_light and dimmable_fan (PWM, LevelEndpoint with EndpointType::Dimmer and Fan). light and fan call setPresentation with the Light or Fan class; load keeps the default and the PWM types need nothing. relay, dimmer and drives are gone with no aliases, as nothing has shipped. Schema regenerated and README updated. The three fixtures between them use all five types, so CI compiles each.

Existing nodes: no behaviour change. The only setPresentation calls in src/ are the water heater (Load, already the Switch default) and SettingEndpoint (classes that are neither Light nor Fan). By type, Dimmer and ColourLight default to Light and Fan to Fan, which is what the old rule matched, and extractor_policy.h passes Fan. Checked: lighting, bathroom, kitchen, water heater, heater and host_sim.

Tested: native 598 (was 597); breaking the light rule fails the mode tests and the lamp test. Python 30, none skipped locally; making light skip its class fails the output-type test. pio run and the three fixtures build.

YN-7. Every relay is `EndpointType::Switch`, so `modeSwitchesOff` never turned a relay lamp off in LightsOut or Travel. It now decides by semantic class (`Light` or `Fan`), and `Endpoint::onMode` passes the endpoint's own class. The `EndpointType` overload is gone; `extractor_policy.h` and the existing mode tests pass semantic classes. Spec section 7 gains one sentence saying lighting and fans are the endpoints with that class. YAML: the output types are now `light`, `fan` and `load` (relays, `SwitchEndpoint`) and `dimmable_light` and `dimmable_fan` (PWM, `LevelEndpoint` with `EndpointType::Dimmer` and `Fan`). `light` and `fan` call `setPresentation` with the Light or Fan class; `load` keeps the default and the PWM types need nothing. `relay`, `dimmer` and `drives` are gone with no aliases, as nothing has shipped. Schema regenerated and README updated. The three fixtures between them use all five types, so CI compiles each. Existing nodes: no behaviour change. The only `setPresentation` calls in `src/` are the water heater (`Load`, already the Switch default) and `SettingEndpoint` (classes that are neither Light nor Fan). By type, Dimmer and ColourLight default to Light and Fan to Fan, which is what the old rule matched, and `extractor_policy.h` passes `Fan`. Checked: lighting, bathroom, kitchen, water heater, heater and host_sim. Tested: native 598 (was 597); breaking the light rule fails the mode tests and the lamp test. Python 30, none skipped locally; making `light` skip its class fails the output-type test. `pio run` and the three fixtures build.

Claude added 1 commit

2026-10-15 18:34:33 +00:00

Let modes reach relay lights and fans via what an output drives

Build and test / build (pull_request) Successful in 5m9s

Details

Build and test / release (pull_request) Has been skipped

Details

24edf4b1ea

Claude reviewed

2026-10-15 18:35:27 +00:00

Claude left a comment

Two small points. Neither blocks the merge.

lib/node-runtime/src/endpoint.h:93: the EndpointType overload of modeSwitchesOff has one non-test caller, src/node_bathroom/extractor_policy.h:29. Call that site with can::SemanticClass::Fan and drop the overload. The existing tests in test_mode_switches_off.cpp would need the same change. If you want them left as the quality gate, keep the overload and ignore this.
src/node_water_heater/main.cpp:28 sets Load on a Switch, which is already the default. It is redundant, not wrong. It is outside this PR's scope.

Two small points. Neither blocks the merge. 1. lib/node-runtime/src/endpoint.h:93: the `EndpointType` overload of `modeSwitchesOff` has one non-test caller, src/node_bathroom/extractor_policy.h:29. Call that site with `can::SemanticClass::Fan` and drop the overload. The existing tests in test_mode_switches_off.cpp would need the same change. If you want them left as the quality gate, keep the overload and ignore this. 2. src/node_water_heater/main.cpp:28 sets `Load` on a `Switch`, which is already the default. It is redundant, not wrong. It is outside this PR's scope.

Claude commented

2026-10-15 18:41:31 +00:00

The EndpointType overload of modeSwitchesOff is gone. extractor_policy.h and the existing mode tests now pass semantic classes (same expectations, Switch becomes Load). The three tests I added for the semantic overload duplicated those, so I dropped them. Native count is 598 (was 597 before this PR); the PR body's "old type overload maps through defaultMetadata" line no longer applies.

The `EndpointType` overload of `modeSwitchesOff` is gone. `extractor_policy.h` and the existing mode tests now pass semantic classes (same expectations, Switch becomes Load). The three tests I added for the semantic overload duplicated those, so I dropped them. Native count is 598 (was 597 before this PR); the PR body's "old type overload maps through defaultMetadata" line no longer applies.

rob added 1 commit

2026-10-15 18:41:33 +00:00

Drop the EndpointType overload of modeSwitchesOff

Build and test / build (pull_request) Successful in 2m4s

Details

Build and test / release (pull_request) Has been skipped

Details

ffdb3208c2

rob reviewed

2026-10-15 18:45:39 +00:00

rob left a comment

Make drives type instead

Make `drives` `type` instead

rob added 1 commit

2026-10-15 18:51:00 +00:00

Replace relay, dimmer and drives with light, fan and load output types

Build and test / release (pull_request) Has been cancelled

Details

Build and test / build (pull_request) Has been cancelled

Details

773936a9d9

Claude changed title from ~~Let modes reach relay lights and fans via what an output drives~~ to Let modes reach relay lights and fans through output types

2026-10-15 18:51:12 +00:00

Claude reviewed

2026-10-15 18:51:39 +00:00

Claude left a comment

No blockers. Three small things.

scripts/tests/fixtures/s3.yaml Outdated

					
				@ -7,3 +7,3 @@

				  - index: 0

				    type: relay

				    type: fan

				    label: Relay

Label is still Relay on what is now a fan. Rename to something like Fan.

Label is still `Relay` on what is now a `fan`. Rename to something like `Fan`.

scripts/yaml_node.py

					
				@ -56,3 +56,2 @@

				endpointSummaries = {

				    "relay": "On/off output.",

				    "dimmer": "PWM output.",

				    "light": "On/off light.",

kind in outputs and outputs[kind]["pwm"] is repeated in four places (parse_endpoint, parse_node, declare_endpoint, render). Add pwmTypes = {kind for kind, output in outputs.items() if output["pwm"]} once and use kind in pwmTypes. It also drops the .get/in outputs guards.

`kind in outputs and outputs[kind]["pwm"]` is repeated in four places (parse_endpoint, parse_node, declare_endpoint, render). Add `pwmTypes = {kind for kind, output in outputs.items() if output["pwm"]}` once and use `kind in pwmTypes`. It also drops the `.get`/`in outputs` guards.

test/test_mode_switches_off/test_mode_switches_off.cpp

					
				@ -18,2 +17,3 @@

					TEST_ASSERT_TRUE(modeSwitchesOff(can::Mode::LightsOut, can::EndpointType::ColourLight));

					TEST_ASSERT_TRUE(modeSwitchesOff(can::Mode::LightsOut, can::SemanticClass::Light));

					TEST_ASSERT_TRUE(modeSwitchesOff(can::Mode::LightsOut, can::SemanticClass::Light));

				}