Skip to content

Commit d7dd321

Browse files
authored
Remove duplicate code (#14)
Fixes #13
1 parent 471d8a3 commit d7dd321

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

src/sensors/distance/ultrasound/i2c/SRF08.cpp

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,8 @@ unsigned int SRF08::getDistance()
3838
static const uint8_t kFirstEchoHighByte = 0x02;
3939
static const uint8_t kNumberOfBytesToRequest = 2;
4040

41-
mRuntime.i2cBeginTransmission(mAddress);
42-
mRuntime.i2cWrite(kRangingCommandRegister);
43-
mRuntime.i2cWrite(kRangingInCm);
44-
mRuntime.i2cEndTransmission();
45-
mRuntime.delayMillis(mPingDelay);
41+
measureDistance();
42+
4643
mRuntime.i2cBeginTransmission(mAddress);
4744
mRuntime.i2cWrite(kFirstEchoHighByte);
4845
mRuntime.i2cEndTransmission();
@@ -116,11 +113,7 @@ uint8_t SRF08::getLightReading()
116113
static const uint8_t kNumberOfBytesToRequest = 1;
117114

118115
// Start a ranging
119-
mRuntime.i2cBeginTransmission(mAddress);
120-
mRuntime.i2cWrite(kRangingCommandRegister);
121-
mRuntime.i2cWrite(kRangingInCm);
122-
mRuntime.i2cEndTransmission();
123-
mRuntime.delayMillis(mPingDelay);
116+
measureDistance();
124117

125118
// Get only the light reading byte
126119
mRuntime.i2cBeginTransmission(mAddress);
@@ -166,3 +159,12 @@ uint8_t SRF08::changeAddress(uint8_t newAddress)
166159

167160
return mAddress;
168161
}
162+
163+
void SRF08::measureDistance()
164+
{
165+
mRuntime.i2cBeginTransmission(mAddress);
166+
mRuntime.i2cWrite(kRangingCommandRegister);
167+
mRuntime.i2cWrite(kRangingInCm);
168+
mRuntime.i2cEndTransmission();
169+
mRuntime.delayMillis(mPingDelay);
170+
}

src/sensors/distance/ultrasound/i2c/SRF08.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ class SRF08 : public DistanceSensor
166166
bool mAttached;
167167

168168
void attach();
169+
void measureDistance();
169170
};
170171

171172
/**

0 commit comments

Comments
 (0)