address review comments

This commit is contained in:
Augusto Zanellato 2024-09-25 14:44:05 +02:00
parent 02d9d8b76c
commit ed4527cfa5
No known key found for this signature in database

View File

@ -86,7 +86,8 @@ int32_t DetectionSensorModule::runOnce()
// LOG_DEBUG("Detection Sensor Module: Current pin state: %i\n", digitalRead(moduleConfig.detection_sensor.monitor_pin)); // LOG_DEBUG("Detection Sensor Module: Current pin state: %i\n", digitalRead(moduleConfig.detection_sensor.monitor_pin));
if ((millis() - lastSentToMesh) >= Default::getConfiguredOrDefaultMs(moduleConfig.detection_sensor.minimum_broadcast_secs)) { if (!Throttle::isWithinTimespanMs(lastSentToMesh,
Default::getConfiguredOrDefaultMs(moduleConfig.detection_sensor.minimum_broadcast_secs))) {
bool isDetected = hasDetectionEvent(); bool isDetected = hasDetectionEvent();
DetectionSensorTriggerVerdict verdict = DetectionSensorTriggerVerdict verdict =
handlers[moduleConfig.detection_sensor.detection_trigger_type](wasDetected, isDetected); handlers[moduleConfig.detection_sensor.detection_trigger_type](wasDetected, isDetected);
@ -106,8 +107,9 @@ int32_t DetectionSensorModule::runOnce()
// of heartbeat. We only do this if the minimum broadcast interval is greater than zero, otherwise we'll only broadcast state // of heartbeat. We only do this if the minimum broadcast interval is greater than zero, otherwise we'll only broadcast state
// change detections. // change detections.
if (moduleConfig.detection_sensor.state_broadcast_secs > 0 && if (moduleConfig.detection_sensor.state_broadcast_secs > 0 &&
(millis() - lastSentToMesh) >= Default::getConfiguredOrDefaultMs(moduleConfig.detection_sensor.state_broadcast_secs, !Throttle::isWithinTimespanMs(lastSentToMesh,
default_telemetry_broadcast_interval_secs)) { Default::getConfiguredOrDefaultMs(moduleConfig.detection_sensor.state_broadcast_secs,
default_telemetry_broadcast_interval_secs))) {
sendCurrentStateMessage(hasDetectionEvent()); sendCurrentStateMessage(hasDetectionEvent());
return DELAYED_INTERVAL; return DELAYED_INTERVAL;
} }