Revert "add a .clang-format file (#9154)" (#9172)

I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides. I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop. I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say. This reverts commit 0d11331d18.
2026-03-30 21:14:11 -04:00 · 2026-01-04 12:15:53 +01:00
parent 0d11331d18
commit beb268ff25
771 changed files with 83399 additions and 77967 deletions
--- a/src/modules/DetectionSensorModule.cpp
+++ b/src/modules/DetectionSensorModule.cpp
@@ -12,26 +12,29 @@ DetectionSensorModule *detectionSensorModule;
 #define DELAYED_INTERVAL 1000

 typedef enum {
-  DetectionSensorVerdictDetected,
-  DetectionSensorVerdictSendState,
-  DetectionSensorVerdictNoop,
+    DetectionSensorVerdictDetected,
+    DetectionSensorVerdictSendState,
+    DetectionSensorVerdictNoop,
 } DetectionSensorTriggerVerdict;

 typedef DetectionSensorTriggerVerdict (*DetectionSensorTriggerHandler)(bool prev, bool current);

-static DetectionSensorTriggerVerdict detection_trigger_logic_level(bool prev, bool current) {
-  return current ? DetectionSensorVerdictDetected : DetectionSensorVerdictNoop;
+static DetectionSensorTriggerVerdict detection_trigger_logic_level(bool prev, bool current)
+{
+    return current ? DetectionSensorVerdictDetected : DetectionSensorVerdictNoop;
 }

-static DetectionSensorTriggerVerdict detection_trigger_single_edge(bool prev, bool current) {
-  return (!prev && current) ? DetectionSensorVerdictDetected : DetectionSensorVerdictNoop;
+static DetectionSensorTriggerVerdict detection_trigger_single_edge(bool prev, bool current)
+{
+    return (!prev && current) ? DetectionSensorVerdictDetected : DetectionSensorVerdictNoop;
 }

-static DetectionSensorTriggerVerdict detection_trigger_either_edge(bool prev, bool current) {
-  if (prev == current) {
-    return DetectionSensorVerdictNoop;
-  }
-  return current ? DetectionSensorVerdictDetected : DetectionSensorVerdictSendState;
+static DetectionSensorTriggerVerdict detection_trigger_either_edge(bool prev, bool current)
+{
+    if (prev == current) {
+        return DetectionSensorVerdictNoop;
+    }
+    return current ? DetectionSensorVerdictDetected : DetectionSensorVerdictSendState;
 }

 const static DetectionSensorTriggerHandler handlers[_meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_MAX + 1] = {
@@ -43,113 +46,119 @@ const static DetectionSensorTriggerHandler handlers[_meshtastic_ModuleConfig_Det
    [meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_EITHER_EDGE_ACTIVE_HIGH] = detection_trigger_either_edge,
 };

-int32_t DetectionSensorModule::runOnce() {
-  /*
-      Uncomment the preferences below if you want to use the module
-      without having to configure it from the PythonAPI or WebUI.
-  */
-  // moduleConfig.detection_sensor.enabled = true;
-  // moduleConfig.detection_sensor.monitor_pin = 10; // WisBlock PIR IO6
-  // moduleConfig.detection_sensor.monitor_pin = 21; // WisBlock RAK12013 Radar IO6
-  // moduleConfig.detection_sensor.minimum_broadcast_secs = 30;
-  // moduleConfig.detection_sensor.state_broadcast_secs = 120;
-  // moduleConfig.detection_sensor.detection_trigger_type =
-  // meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_LOGIC_HIGH;
-  // strcpy(moduleConfig.detection_sensor.name, "Motion");
+int32_t DetectionSensorModule::runOnce()
+{
+    /*
+        Uncomment the preferences below if you want to use the module
+        without having to configure it from the PythonAPI or WebUI.
+    */
+    // moduleConfig.detection_sensor.enabled = true;
+    // moduleConfig.detection_sensor.monitor_pin = 10; // WisBlock PIR IO6
+    // moduleConfig.detection_sensor.monitor_pin = 21; // WisBlock RAK12013 Radar IO6
+    // moduleConfig.detection_sensor.minimum_broadcast_secs = 30;
+    // moduleConfig.detection_sensor.state_broadcast_secs = 120;
+    // moduleConfig.detection_sensor.detection_trigger_type =
+    // meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_LOGIC_HIGH;
+    // strcpy(moduleConfig.detection_sensor.name, "Motion");

-  if (moduleConfig.detection_sensor.enabled == false)
-    return disable();
+    if (moduleConfig.detection_sensor.enabled == false)
+        return disable();

-  if (firstTime) {
+    if (firstTime) {

 #ifdef DETECTION_SENSOR_EN
-    pinMode(DETECTION_SENSOR_EN, OUTPUT);
-    digitalWrite(DETECTION_SENSOR_EN, HIGH);
+        pinMode(DETECTION_SENSOR_EN, OUTPUT);
+        digitalWrite(DETECTION_SENSOR_EN, HIGH);
 #endif

-    // This is the first time the OSThread library has called this function, so do some setup
-    firstTime = false;
-    if (moduleConfig.detection_sensor.monitor_pin > 0) {
-      pinMode(moduleConfig.detection_sensor.monitor_pin, moduleConfig.detection_sensor.use_pullup ? INPUT_PULLUP : INPUT);
-    } else {
-      LOG_WARN("Detection Sensor Module: Set to enabled but no monitor pin is set. Disable module");
-      return disable();
+        // This is the first time the OSThread library has called this function, so do some setup
+        firstTime = false;
+        if (moduleConfig.detection_sensor.monitor_pin > 0) {
+            pinMode(moduleConfig.detection_sensor.monitor_pin, moduleConfig.detection_sensor.use_pullup ? INPUT_PULLUP : INPUT);
+        } else {
+            LOG_WARN("Detection Sensor Module: Set to enabled but no monitor pin is set. Disable module");
+            return disable();
+        }
+        LOG_INFO("Detection Sensor Module: init");
+
+        return setStartDelay();
    }
-    LOG_INFO("Detection Sensor Module: init");

-    return setStartDelay();
-  }
+    // LOG_DEBUG("Detection Sensor Module: Current 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, Default::getConfiguredOrDefaultMs(moduleConfig.detection_sensor.minimum_broadcast_secs))) {
-    bool isDetected = hasDetectionEvent();
-    DetectionSensorTriggerVerdict verdict = handlers[moduleConfig.detection_sensor.detection_trigger_type](wasDetected, isDetected);
-    wasDetected = isDetected;
-    switch (verdict) {
-    case DetectionSensorVerdictDetected:
-      sendDetectionMessage();
-      return DELAYED_INTERVAL;
-    case DetectionSensorVerdictSendState:
-      sendCurrentStateMessage(isDetected);
-      return DELAYED_INTERVAL;
-    case DetectionSensorVerdictNoop:
-      break;
+    if (!Throttle::isWithinTimespanMs(lastSentToMesh,
+                                      Default::getConfiguredOrDefaultMs(moduleConfig.detection_sensor.minimum_broadcast_secs))) {
+        bool isDetected = hasDetectionEvent();
+        DetectionSensorTriggerVerdict verdict =
+            handlers[moduleConfig.detection_sensor.detection_trigger_type](wasDetected, isDetected);
+        wasDetected = isDetected;
+        switch (verdict) {
+        case DetectionSensorVerdictDetected:
+            sendDetectionMessage();
+            return DELAYED_INTERVAL;
+        case DetectionSensorVerdictSendState:
+            sendCurrentStateMessage(isDetected);
+            return DELAYED_INTERVAL;
+        case DetectionSensorVerdictNoop:
+            break;
+        }
    }
-  }
-  // Even if we haven't detected an event, broadcast our current state to the mesh on the scheduled interval as a sort
-  // of heartbeat. We only do this if the minimum broadcast interval is greater than zero, otherwise we'll only
-  // broadcast state change detections.
-  if (moduleConfig.detection_sensor.state_broadcast_secs > 0 &&
-      !Throttle::isWithinTimespanMs(lastSentToMesh, Default::getConfiguredOrDefaultMs(moduleConfig.detection_sensor.state_broadcast_secs,
-                                                                                      default_telemetry_broadcast_interval_secs))) {
-    sendCurrentStateMessage(hasDetectionEvent());
-    return DELAYED_INTERVAL;
-  }
-  return GPIO_POLLING_INTERVAL;
+    // Even if we haven't detected an event, broadcast our current state to the mesh on the scheduled interval as a sort
+    // of heartbeat. We only do this if the minimum broadcast interval is greater than zero, otherwise we'll only broadcast state
+    // change detections.
+    if (moduleConfig.detection_sensor.state_broadcast_secs > 0 &&
+        !Throttle::isWithinTimespanMs(lastSentToMesh,
+                                      Default::getConfiguredOrDefaultMs(moduleConfig.detection_sensor.state_broadcast_secs,
+                                                                        default_telemetry_broadcast_interval_secs))) {
+        sendCurrentStateMessage(hasDetectionEvent());
+        return DELAYED_INTERVAL;
+    }
+    return GPIO_POLLING_INTERVAL;
 }

-void DetectionSensorModule::sendDetectionMessage() {
-  LOG_DEBUG("Detected event observed. Send message");
-  char *message = new char[40];
-  sprintf(message, "%s detected", moduleConfig.detection_sensor.name);
-  meshtastic_MeshPacket *p = allocDataPacket();
-  p->want_ack = false;
-  p->decoded.payload.size = strlen(message);
-  memcpy(p->decoded.payload.bytes, message, p->decoded.payload.size);
-  if (moduleConfig.detection_sensor.send_bell && p->decoded.payload.size < meshtastic_Constants_DATA_PAYLOAD_LEN) {
-    p->decoded.payload.bytes[p->decoded.payload.size] = 7;        // Bell character
-    p->decoded.payload.bytes[p->decoded.payload.size + 1] = '\0'; // Bell character
-    p->decoded.payload.size++;
-  }
-  lastSentToMesh = millis();
-  if (!channels.isDefaultChannel(0)) {
-    LOG_INFO("Send message id=%d, dest=%x, msg=%.*s", p->id, p->to, p->decoded.payload.size, p->decoded.payload.bytes);
-    service->sendToMesh(p);
-  } else
-    LOG_ERROR("Message not allow on Public channel");
-  delete[] message;
+void DetectionSensorModule::sendDetectionMessage()
+{
+    LOG_DEBUG("Detected event observed. Send message");
+    char *message = new char[40];
+    sprintf(message, "%s detected", moduleConfig.detection_sensor.name);
+    meshtastic_MeshPacket *p = allocDataPacket();
+    p->want_ack = false;
+    p->decoded.payload.size = strlen(message);
+    memcpy(p->decoded.payload.bytes, message, p->decoded.payload.size);
+    if (moduleConfig.detection_sensor.send_bell && p->decoded.payload.size < meshtastic_Constants_DATA_PAYLOAD_LEN) {
+        p->decoded.payload.bytes[p->decoded.payload.size] = 7;        // Bell character
+        p->decoded.payload.bytes[p->decoded.payload.size + 1] = '\0'; // Bell character
+        p->decoded.payload.size++;
+    }
+    lastSentToMesh = millis();
+    if (!channels.isDefaultChannel(0)) {
+        LOG_INFO("Send message id=%d, dest=%x, msg=%.*s", p->id, p->to, p->decoded.payload.size, p->decoded.payload.bytes);
+        service->sendToMesh(p);
+    } else
+        LOG_ERROR("Message not allow on Public channel");
+    delete[] message;
 }

-void DetectionSensorModule::sendCurrentStateMessage(bool state) {
-  char *message = new char[40];
-  sprintf(message, "%s state: %i", moduleConfig.detection_sensor.name, state);
-  meshtastic_MeshPacket *p = allocDataPacket();
-  p->want_ack = false;
-  p->decoded.payload.size = strlen(message);
-  memcpy(p->decoded.payload.bytes, message, p->decoded.payload.size);
-  lastSentToMesh = millis();
-  if (!channels.isDefaultChannel(0)) {
-    LOG_INFO("Send message id=%d, dest=%x, msg=%.*s", p->id, p->to, p->decoded.payload.size, p->decoded.payload.bytes);
-    service->sendToMesh(p);
-  } else
-    LOG_ERROR("Message not allow on Public channel");
-  delete[] message;
+void DetectionSensorModule::sendCurrentStateMessage(bool state)
+{
+    char *message = new char[40];
+    sprintf(message, "%s state: %i", moduleConfig.detection_sensor.name, state);
+    meshtastic_MeshPacket *p = allocDataPacket();
+    p->want_ack = false;
+    p->decoded.payload.size = strlen(message);
+    memcpy(p->decoded.payload.bytes, message, p->decoded.payload.size);
+    lastSentToMesh = millis();
+    if (!channels.isDefaultChannel(0)) {
+        LOG_INFO("Send message id=%d, dest=%x, msg=%.*s", p->id, p->to, p->decoded.payload.size, p->decoded.payload.bytes);
+        service->sendToMesh(p);
+    } else
+        LOG_ERROR("Message not allow on Public channel");
+    delete[] message;
 }

-bool DetectionSensorModule::hasDetectionEvent() {
-  bool currentState = digitalRead(moduleConfig.detection_sensor.monitor_pin);
-  // LOG_DEBUG("Detection Sensor Module: Current state: %i", currentState);
-  return (moduleConfig.detection_sensor.detection_trigger_type & 1) ? currentState : !currentState;
+bool DetectionSensorModule::hasDetectionEvent()
+{
+    bool currentState = digitalRead(moduleConfig.detection_sensor.monitor_pin);
+    // LOG_DEBUG("Detection Sensor Module: Current state: %i", currentState);
+    return (moduleConfig.detection_sensor.detection_trigger_type & 1) ? currentState : !currentState;
 }