fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-28 05:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Corrected code format with astyle

Browse Source
This commit is contained in:
gcarmix
2015-10-22 22:55:23 +02:00
parent 6de5a36518
commit 28316d8a44
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/srf02/srf02.cpp
+4 -2
View File
@@ -141,7 +141,8 @@ private:
int _cycling_rate; /* */ int _cycling_rate; /* */
uint8_t _index_counter; /* temporary sonar i2c address */ uint8_t _index_counter; /* temporary sonar i2c address */
std::vector<uint8_t> addr_ind; /* temp sonar i2c address vector */ std::vector<uint8_t> addr_ind; /* temp sonar i2c address vector */
std::vector<float> _latest_sonar_measurements; /* vector to store latest sonar measurements in before writing to report */ std::vector<float>
_latest_sonar_measurements; /* vector to store latest sonar measurements in before writing to report */
/** /**
@@ -561,7 +562,7 @@ SRF02::collect()
uint8_t val[2] = {0, 0}; uint8_t val[2] = {0, 0};
uint8_t cmd = 0x02; uint8_t cmd = 0x02;
perf_begin(_sample_perf); perf_begin(_sample_perf);
ret = transfer(&cmd,1,nullptr,0); ret = transfer(&cmd, 1, nullptr, 0);
ret = transfer(nullptr, 0, &val[0], 2); ret = transfer(nullptr, 0, &val[0], 2);
if (ret < 0) { if (ret < 0) {
@@ -583,6 +584,7 @@ SRF02::collect()
if (addr_ind.size() == 1) { if (addr_ind.size() == 1) {
report.distance = si_units; report.distance = si_units;
report.distance_vector[0] = si_units; report.distance_vector[0] = si_units;
for (unsigned i = 1; i < (SRF02_MAX_RANGEFINDERS); i++) { for (unsigned i = 1; i < (SRF02_MAX_RANGEFINDERS); i++) {
report.distance_vector[i] = 0; report.distance_vector[i] = 0;
} }