fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-06 13:18:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

drivers: fix codestyle for teraranger driver

Browse Source 
Signed-off-by: Mateusz Sadowski <msadowski90@gmail.com>
This commit is contained in:
Mateusz Sadowski
2017-09-15 12:07:16 +01:00
committed by Nuno Marques
parent e439070f25
commit 8ba6c209d4
1 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/teraranger/teraranger.cpp
+48 -43
View File
@@ -278,54 +278,59 @@ TERARANGER::init()
int hw_model;
param_get(param_find("SENS_EN_TRANGER"), &hw_model);
switch(hw_model){
case 0: /* Disabled */
DEVICE_LOG("Disabled");
return ret;
case 1: /* Autodetect */
/* Assume TROne */
set_address(TRONE_BASEADDR);
if(I2C::init() != OK)
{
set_address(TREVO_BASEADDR);
if (I2C::init() != OK)
{
goto out;
} else {
_min_distance = TREVO_MIN_DISTANCE;
_max_distance = TREVO_MAX_DISTANCE;
}
}
else
{
_min_distance = TRONE_MIN_DISTANCE;
_max_distance = TRONE_MAX_DISTANCE;
}
break;
switch (hw_model) {
case 0: /* Disabled */
DEVICE_LOG("Disabled");
return ret;
case 1: /* Autodetect */
/* Assume TROne */
set_address(TRONE_BASEADDR);
if (I2C::init() != OK) {
set_address(TREVO_BASEADDR);
case 2: /* TROne */
set_address(TRONE_BASEADDR);
if (I2C::init() != OK) {
goto out;
}
} else {
_min_distance = TREVO_MIN_DISTANCE;
_max_distance = TREVO_MAX_DISTANCE;
}
} else {
_min_distance = TRONE_MIN_DISTANCE;
_max_distance = TRONE_MAX_DISTANCE;
break;
case 3: /* TREvo */
set_address(TREVO_BASEADDR);
/* do I2C init (and probe) first */
if (I2C::init() != OK) {
goto out;
}
_min_distance = TREVO_MIN_DISTANCE;
_max_distance = TREVO_MAX_DISTANCE;
break;
}
default:
DEVICE_LOG("invalid HW model %d.", hw_model);
return ret;
break;
case 2: /* TROne */
set_address(TRONE_BASEADDR);
if (I2C::init() != OK) {
goto out;
}
_min_distance = TRONE_MIN_DISTANCE;
_max_distance = TRONE_MAX_DISTANCE;
break;
case 3: /* TREvo */
set_address(TREVO_BASEADDR);
/* do I2C init (and probe) first */
if (I2C::init() != OK) {
goto out;
}
_min_distance = TREVO_MIN_DISTANCE;
_max_distance = TREVO_MAX_DISTANCE;
break;
default:
DEVICE_LOG("invalid HW model %d.", hw_model);
return ret;
}
/* allocate basic report buffers */
@@ -582,7 +587,7 @@ int
TERARANGER::measure()
{
int ret;
/*
* Send the command to begin a measurement.
*/