rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-03 16:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

make clang-format happy again. Also fix assorted variable shrouding and logic bleeps

Browse Source
This commit is contained in:
Thomas Göttgens
2024-05-03 15:10:57 +02:00
parent 9fb6148aff
commit 13ad524538
9 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/NeighborInfoModule.cpp
View File

@@ -116,9 +116,8 @@ Will be used for broadcast.
*/
int32_t NeighborInfoModule::runOnce()
{
bool requestReplies = false;
if (airTime->isTxAllowedChannelUtil(true) && airTime->isTxAllowedAirUtil()) {
sendNeighborInfo(NODENUM_BROADCAST, requestReplies);
sendNeighborInfo(NODENUM_BROADCAST, false);
}
return Default::getConfiguredOrDefaultMs(moduleConfig.neighbor_info.update_interval, default_broadcast_interval_secs);
}

2
src/modules/PositionModule.cpp
View File

@@ -343,7 +343,7 @@ int32_t PositionModule::runOnce()
// The minimum time (in seconds) that would pass before we are able to send a new position packet.
auto smartPosition = getDistanceTraveledSinceLastSend(node->position);
uint32_t msSinceLastSend = now - lastGpsSend;
msSinceLastSend = now - lastGpsSend;
if (smartPosition.hasTraveledOverThreshold &&
Throttle::execute(

12
src/modules/Telemetry/Sensor/RCWL9620Sensor.h
View File

@@ -5,15 +5,15 @@
class RCWL9620Sensor : public TelemetrySensor
{
private:
uint8_t _addr;
TwoWire *_wire;
uint8_t _scl;
uint8_t _sda;
uint8_t _speed;
uint8_t _addr = 0x57;
TwoWire *_wire = &Wire;
uint8_t _scl = -1;
uint8_t _sda = -1;
uint32_t _speed = 200000UL;
protected:
virtual void setup() override;
void begin(TwoWire *wire = &Wire, uint8_t addr = 0x57, uint8_t sda = -1, uint8_t scl = -1, uint32_t speed = 200000L);
void begin(TwoWire *wire = &Wire, uint8_t addr = 0x57, uint8_t sda = -1, uint8_t scl = -1, uint32_t speed = 200000UL);
float getDistance();
public: