Skip to content

Commit

Permalink
trunk fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
caveman99 committed May 3, 2024
1 parent 6c1377a commit 827dcfc
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/modules/CannedMessageModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ int32_t CannedMessageModule::runOnce()
runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
break;
case 0x9e: // toggle GPS like triple press does
#if !MESHTASTIC_EXCLUDE_GPS
#if !MESHTASTIC_EXCLUDE_GPS
if (gps != nullptr) {
gps->toggleGpsMode();
}
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Telemetry/AirQualityTelemetry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

#include "AirQualityTelemetry.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "AirQualityTelemetry.h"
#include "Default.h"
#include "MeshService.h"
#include "NodeDB.h"
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Telemetry/EnvironmentTelemetry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

#include "EnvironmentTelemetry.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "Default.h"
#include "EnvironmentTelemetry.h"
#include "MeshService.h"
#include "NodeDB.h"
#include "PowerFSM.h"
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Telemetry/PowerTelemetry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

#include "PowerTelemetry.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "Default.h"
#include "MeshService.h"
#include "NodeDB.h"
#include "PowerFSM.h"
#include "PowerTelemetry.h"
#include "RTC.h"
#include "Router.h"
#include "main.h"
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Telemetry/Sensor/BME280Sensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

#include "BME280Sensor.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "BME280Sensor.h"
#include "TelemetrySensor.h"
#include <Adafruit_BME280.h>
#include <typeinfo>
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Telemetry/Sensor/BME680Sensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

#include "BME680Sensor.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "BME680Sensor.h"
#include "FSCommon.h"
#include "TelemetrySensor.h"

Expand Down
2 changes: 1 addition & 1 deletion src/modules/Telemetry/Sensor/BMP085Sensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

#include "BMP085Sensor.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "BMP085Sensor.h"
#include "TelemetrySensor.h"
#include <Adafruit_BMP085.h>
#include <typeinfo>
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Telemetry/Sensor/BMP280Sensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

#include "BMP280Sensor.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "BMP280Sensor.h"
#include "TelemetrySensor.h"
#include <Adafruit_BMP280.h>
#include <typeinfo>
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Telemetry/Sensor/INA219Sensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

#include "INA219Sensor.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "INA219Sensor.h"
#include "TelemetrySensor.h"
#include <Adafruit_INA219.h>

Expand Down
2 changes: 1 addition & 1 deletion src/modules/Telemetry/Sensor/INA260Sensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

#include "INA260Sensor.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "INA260Sensor.h"
#include "TelemetrySensor.h"
#include <Adafruit_INA260.h>

Expand Down
2 changes: 1 addition & 1 deletion src/modules/Telemetry/Sensor/INA3221Sensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

#include "INA3221Sensor.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "INA3221Sensor.h"
#include "TelemetrySensor.h"
#include <INA3221.h>

Expand Down
2 changes: 1 addition & 1 deletion src/modules/Telemetry/Sensor/LPS22HBSensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

#include "LPS22HBSensor.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "LPS22HBSensor.h"
#include "TelemetrySensor.h"
#include <Adafruit_LPS2X.h>
#include <Adafruit_Sensor.h>
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Telemetry/Sensor/MCP9808Sensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

#include "MCP9808Sensor.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "MCP9808Sensor.h"
#include "TelemetrySensor.h"
#include <Adafruit_MCP9808.h>

Expand Down
2 changes: 1 addition & 1 deletion src/modules/Telemetry/Sensor/SHT31Sensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

#include "SHT31Sensor.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "SHT31Sensor.h"
#include "TelemetrySensor.h"
#include <Adafruit_SHT31.h>

Expand Down
2 changes: 1 addition & 1 deletion src/modules/Telemetry/Sensor/SHTC3Sensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

#include "SHTC3Sensor.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "SHTC3Sensor.h"
#include "TelemetrySensor.h"
#include <Adafruit_SHTC3.h>

Expand Down
2 changes: 1 addition & 1 deletion src/modules/Telemetry/Sensor/TelemetrySensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

#include "TelemetrySensor.h"
#include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "NodeDB.h"
#include "TelemetrySensor.h"
#include "main.h"

#endif
2 changes: 1 addition & 1 deletion src/power.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once
#include "configuration.h"
#include "PowerStatus.h"
#include "concurrency/OSThread.h"
#include "configuration.h"
#ifdef ARCH_ESP32
#include <esp_adc_cal.h>
#include <soc/adc_channel.h>
Expand Down

0 comments on commit 827dcfc

Please sign in to comment.