pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-11 05:24:26 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update DetectionSensorModule.cpp

Browse Source
This commit is contained in:
Michael Gjelsø 2024-11-08 17:30:30 +01:00 committed by GitHub
parent 786036f15a
commit dd2b7dffb9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/DetectionSensorModule.cpp
View File

@ -5,9 +5,7 @@
#include "PowerFSM.h" #include "PowerFSM.h"
#include "configuration.h" #include "configuration.h"
#include "main.h" #include "main.h"
#include <Channels.h>
#include <Throttle.h> #include <Throttle.h>
DetectionSensorModule *detectionSensorModule; DetectionSensorModule *detectionSensorModule;
#define GPIO_POLLING_INTERVAL 100 #define GPIO_POLLING_INTERVAL 100
@ -80,17 +78,18 @@ int32_t DetectionSensorModule::runOnce()
if (moduleConfig.detection_sensor.monitor_pin > 0) { if (moduleConfig.detection_sensor.monitor_pin > 0) {
pinMode(moduleConfig.detection_sensor.monitor_pin, moduleConfig.detection_sensor.use_pullup ? INPUT_PULLUP : INPUT); pinMode(moduleConfig.detection_sensor.monitor_pin, moduleConfig.detection_sensor.use_pullup ? INPUT_PULLUP : INPUT);
} else { } else {
LOG_WARN("DetectionSensor: no monitor pin set. Disabling module..."); LOG_WARN("Detection Sensor Module: Set to enabled but no monitor pin is set. Disable module");
return disable(); return disable();
} }
LOG_INFO("DetectionSensor: Init"); LOG_INFO("Detection Sensor Module: init");
return DELAYED_INTERVAL; return DELAYED_INTERVAL;
} }
// LOG_DEBUG("Detection Sensor: Pin state: %i", digitalRead(moduleConfig.detection_sensor.monitor_pin)); // LOG_DEBUG("Detection Sensor Module: Current pin state: %i", digitalRead(moduleConfig.detection_sensor.monitor_pin));
if (!Throttle::isWithinTimespanMs(lastSentToMesh, if (!Throttle::isWithinTimespanMs(lastSentToMesh,
Default::getConfiguredOrDefaultMs(moduleConfig.detection_sensor.minimum_broadcast_secs))) { 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);
@ -111,7 +110,7 @@ int32_t DetectionSensorModule::runOnce()
// change detections. // change detections.
if (moduleConfig.detection_sensor.state_broadcast_secs > 0 && if (moduleConfig.detection_sensor.state_broadcast_secs > 0 &&
!Throttle::isWithinTimespanMs(lastSentToMesh, !Throttle::isWithinTimespanMs(lastSentToMesh,
Default::getConfiguredOrDefaultMs(moduleConfig.detection_sensor.state_broadcast_secs, Default::getConfiguredOrDefaultMs(moduleConfig.detection_sensor.state_broadcast_secs,
default_telemetry_broadcast_interval_secs))) { default_telemetry_broadcast_interval_secs))) {
sendCurrentStateMessage(hasDetectionEvent()); sendCurrentStateMessage(hasDetectionEvent());
return DELAYED_INTERVAL; return DELAYED_INTERVAL;
@ -122,7 +121,7 @@ int32_t DetectionSensorModule::runOnce()
void DetectionSensorModule::sendDetectionMessage() void DetectionSensorModule::sendDetectionMessage()
{ {
if (moduleConfig.detection_sensor.sendTo[0] != 0x00) { if (moduleConfig.detection_sensor.sendTo[0] != 0x00) {
LOG_DEBUG("Detected event. Sending message"); LOG_DEBUG("Detected event observed. Send message");
char *message = new char[40]; char *message = new char[40];
bool isValidrecipient = false; bool isValidrecipient = false;
sprintf(message, "%s detected", moduleConfig.detection_sensor.name); sprintf(message, "%s detected", moduleConfig.detection_sensor.name);
@ -196,6 +195,6 @@ void DetectionSensorModule::sendCurrentStateMessage(bool state)
bool DetectionSensorModule::hasDetectionEvent() bool DetectionSensorModule::hasDetectionEvent()
{ {
bool currentState = digitalRead(moduleConfig.detection_sensor.monitor_pin); bool currentState = digitalRead(moduleConfig.detection_sensor.monitor_pin);
// LOG_DEBUG("Detection Sensor: state: %i", currentState); // LOG_DEBUG("Detection Sensor Module: Current state: %i", currentState);
return (moduleConfig.detection_sensor.detection_trigger_type & 1) ? currentState : !currentState; return (moduleConfig.detection_sensor.detection_trigger_type & 1) ? currentState : !currentState;
} }