pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-08 14:12:05 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.5-changes

Browse Source
This commit is contained in:
Jonathan Bennett 2024-08-19 11:28:20 -05:00 committed by GitHub
commit 48dc222b75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/NeighborInfoModule.cpp
View File

@ -120,7 +120,7 @@ int32_t NeighborInfoModule::runOnce()
if (airTime->isTxAllowedChannelUtil(true) && airTime->isTxAllowedAirUtil()) { if (airTime->isTxAllowedChannelUtil(true) && airTime->isTxAllowedAirUtil()) {
sendNeighborInfo(NODENUM_BROADCAST, false); sendNeighborInfo(NODENUM_BROADCAST, false);
} }
return Default::getConfiguredOrDefault(moduleConfig.neighbor_info.update_interval, default_neighbor_info_broadcast_secs); return Default::getConfiguredOrDefaultMs(moduleConfig.neighbor_info.update_interval, default_neighbor_info_broadcast_secs);
} }
/* /*

8
src/modules/Telemetry/Sensor/OPT3001Sensor.cpp
View File

@ -25,10 +25,10 @@ void OPT3001Sensor::setup()
{ {
OPT3001_Config newConfig; OPT3001_Config newConfig;
newConfig.RangeNumber = B1100; newConfig.RangeNumber = 0b1100;
newConfig.ConvertionTime = B0; newConfig.ConvertionTime = 0b0;
newConfig.Latch = B1; newConfig.Latch = 0b1;
newConfig.ModeOfConversionOperation = B11; newConfig.ModeOfConversionOperation = 0b11;
OPT3001_ErrorCode errorConfig = opt3001.writeConfig(newConfig); OPT3001_ErrorCode errorConfig = opt3001.writeConfig(newConfig);
if (errorConfig != NO_ERROR) { if (errorConfig != NO_ERROR) {