     ss1.put(AmbLight); // Always send ambient light level (assuming sensor is present).
     // Show TRV-related stats since enabled.
     ss1.put(NominalRadValve); // Show modelled value to be able to deduce call-for-heat.
-    // ss1.put(NominalRadValve.targetTemperatureSubSensor); XXX
-    // ss1.put(NominalRadValve.setbackSubSensor); XXX
+    ss1.put(NominalRadValve.targetTemperatureSubSensor);
+    ss1.put(NominalRadValve.setbackSubSensor);
     // Show state of setback lockout.
     ss1.put(V0p2_SENSOR_TAG_F("gE"), OTRadValve::getSetbackLockout(), true);
 

    // Enable "+" count field for diagnostic purposes, eg while TX is lossy,
    // if the primary radio channel does not include a sequence number itself.
    // Assume that an encrypted channel will provide its own (visible) sequence counter.
    // TODO Stats need updating (valvePC replaced with on off? or just send 0 or 100).
    ss1.enableCount(false);  // Always encrypted
    ss1.put(TemperatureC16);
    ss1.put(Occupancy.twoBitTag(), Occupancy.twoBitOccupancyValue()); // Reduce spurious TX cf percentage.

            break;
        }
    }

    // Command-Line Interface (CLI) polling.
    // If a reasonable chunk of the minor cycle remains after all other work is done
