Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-07 09:13:32 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

Apply AStyle to fixup formating

Browse Source
This commit is contained in:
Robert Dickenson
2016-03-30 11:57:42 +11:00
committed by Lorenz Meier
parent 630146686e
commit cb3c625ea4
2 changed files with 57 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/lis3mdl/lis3mdl.cpp
+56 -47
View File
@@ -487,78 +487,84 @@ void LIS3MDL::check_conf(void)
uint8_t reg_in = 0;
switch (_check_state_cnt++) {
case 0:
ret = read_reg(ADDR_CTRL_REG1, reg_in);
case 0:
ret = read_reg(ADDR_CTRL_REG1, reg_in);
if (OK != ret) {
perf_count(_comms_errors);
return;
}
if (reg_in != _cntl_reg1) {
perf_count(_conf_errors);
ret = write_reg(ADDR_CTRL_REG1, _cntl_reg1);
if (OK != ret) {
perf_count(_comms_errors);
return;
}
}
if (reg_in != _cntl_reg1) {
perf_count(_conf_errors);
ret = write_reg(ADDR_CTRL_REG1, _cntl_reg1);
break;
if (OK != ret) {
perf_count(_comms_errors);
}
}
break;
case 50:
ret = read_reg(ADDR_CTRL_REG4, reg_in);
case 50:
ret = read_reg(ADDR_CTRL_REG4, reg_in);
if (OK != ret) {
perf_count(_comms_errors);
return;
}
if (reg_in != _cntl_reg4) {
perf_count(_conf_errors);
ret = write_reg(ADDR_CTRL_REG1, _cntl_reg4);
if (OK != ret) {
perf_count(_comms_errors);
return;
}
if (reg_in != _cntl_reg4) {
perf_count(_conf_errors);
ret = write_reg(ADDR_CTRL_REG1, _cntl_reg4);
}
if (OK != ret) {
perf_count(_comms_errors);
}
}
break;
break;
case 100:
ret = read_reg(ADDR_CTRL_REG5, reg_in);
case 100:
ret = read_reg(ADDR_CTRL_REG5, reg_in);
if (OK != ret) {
perf_count(_comms_errors);
return;
}
if (reg_in != _cntl_reg5) {
perf_count(_conf_errors);
ret = write_reg(ADDR_CTRL_REG5, _cntl_reg5);
if (OK != ret) {
perf_count(_comms_errors);
return;
}
if (reg_in != _cntl_reg5) {
perf_count(_conf_errors);
ret = write_reg(ADDR_CTRL_REG5, _cntl_reg5);
}
if (OK != ret) {
perf_count(_comms_errors);
}
}
break;
break;
case 150:
ret = read_reg(ADDR_CTRL_REG2, reg_in);
case 150:
ret = read_reg(ADDR_CTRL_REG2, reg_in);
if (OK != ret) {
perf_count(_comms_errors);
return;
}
if (reg_in != (_range_bits << 5)) {
perf_count(_range_errors);
ret = write_reg(ADDR_CTRL_REG2, (_range_bits << 5));
if (OK != ret) {
perf_count(_comms_errors);
return;
}
}
if (reg_in != (_range_bits << 5)) {
perf_count(_range_errors);
ret = write_reg(ADDR_CTRL_REG2, (_range_bits << 5));
break;
if (OK != ret) {
perf_count(_comms_errors);
}
}
break;
default:
break;
default:
break;
}
}
@@ -1244,6 +1250,7 @@ int LIS3MDL::set_excitement(unsigned enable)
if (((int)enable) < 0) {
warnx("WARN: set_excitement negative not supported\n");
} else if (enable > 0) {
_cntl_reg1 |= 0x01;
}
@@ -1392,12 +1399,14 @@ start_bus(struct lis3mdl_bus_option &bus, enum Rotation rotation)
if (OK != ioctl(fd, SENSORIOCSPOLLRATE, 50)) {
warn("FAILED: SENSORIOCSPOLLRATE 50Hz");
}
printf("set poll rate to 50Hz\n");
/* Set to 4 Gauss */
if (OK != ioctl(fd, MAGIOCSRANGE, 4)) {
warnx("FAILED: MAGIOCSRANGE 4 Ga");
}
printf("set range to 4 Ga\n");
close(fd);
src/modules/attitude_estimator_q/attitude_estimator_q_main.cpp
+1 -1
View File
@@ -334,7 +334,7 @@ void AttitudeEstimatorQ::task_main()
} else if (ret == 0) {
// Poll timeout, do nothing
// RobD debugging - quiet this for now
// TODO: RobD debugging - quiet this for now
// PX4_WARN("Q POLL TIMEOUT");
continue;
}