Re-applying 73a7a96, formatting, MyMesh reformat

This commit is contained in:
hank
2025-06-01 20:28:29 -07:00
parent 9247ce460a
commit 69b431a517
3 changed files with 177 additions and 340 deletions

View File

@@ -14,7 +14,7 @@ AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: false AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Inline AllowShortFunctionsOnASingleLine: Inline
AllowShortIfStatementsOnASingleLine: false AllowShortIfStatementsOnASingleLine: true
AllowShortLoopsOnASingleLine: false AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None AlwaysBreakAfterReturnType: None
@@ -35,7 +35,7 @@ BraceWrapping:
BeforeElse: true BeforeElse: true
IndentBraces: false IndentBraces: false
BreakBeforeBinaryOperators: None BreakBeforeBinaryOperators: None
BreakBeforeBraces: Stroustrup BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: true BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false BreakConstructorInitializersBeforeComma: false
ColumnLimit: 110 ColumnLimit: 110

File diff suppressed because it is too large Load Diff

View File

@@ -18,7 +18,8 @@ static const Module::RfSwitchMode_t rfswitch_table[] = {
}; };
VolatileRTCClock rtc_clock; VolatileRTCClock rtc_clock;
WIOE5SensorManager sensors; BME280I2C bme;
WIOE5SensorManager sensors(bme);
#ifndef LORA_CR #ifndef LORA_CR
#define LORA_CR 5 #define LORA_CR 5
@@ -72,9 +73,9 @@ bool WIOE5SensorManager::querySensors(uint8_t requester_permissions, CayenneLPP&
float temp(NAN), hum(NAN), pres(NAN); float temp(NAN), hum(NAN), pres(NAN);
BME280::TempUnit tempUnit(BME280::TempUnit_Celsius); BME280::TempUnit tempUnit(BME280::TempUnit_Celsius);
BME280::PresUnit presUnit(BME280::PresUnit_hPa); BME280::PresUnit presUnit(BME280::PresUnit_bar);
bme.read(pres, temp, hum, tempUnit, presUnit); _bme->read(pres, temp, hum, tempUnit, presUnit);
telemetry.addTemperature(TELEM_CHANNEL_SELF, temp); telemetry.addTemperature(TELEM_CHANNEL_SELF, temp);
telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, hum); telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, hum);
@@ -84,7 +85,7 @@ bool WIOE5SensorManager::querySensors(uint8_t requester_permissions, CayenneLPP&
} }
bool WIOE5SensorManager::begin() { bool WIOE5SensorManager::begin() {
has_bme = bme.begin(); has_bme = _bme->begin();
return has_bme; return has_bme;
} }