diff options
Diffstat (limited to 'apps/sensors')
-rw-r--r-- | apps/sensors/sensors.c | 8 | ||||
-rw-r--r-- | apps/sensors/sensors.cpp | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/apps/sensors/sensors.c b/apps/sensors/sensors.c index c8ef0aebf..f82aa4c52 100644 --- a/apps/sensors/sensors.c +++ b/apps/sensors/sensors.c @@ -376,7 +376,9 @@ static int parameters_update(const struct sensor_parameter_handles *h, struct se param_get(h->rc_map_pitch, &(p->rc_map_pitch)); param_get(h->rc_map_yaw, &(p->rc_map_yaw)); param_get(h->rc_map_throttle, &(p->rc_map_throttle)); - param_get(h->rc_map_mode_sw, &(p->rc_map_mode_sw)); + if (param_get(h->rc_map_mode_sw, &(p->rc_map_mode_sw)) != OK) { + warnx("Loading RC mode sw param failed."); + } /* gyro offsets */ param_get(h->gyro_offset[0], &(p->gyro_offset[0])); @@ -394,7 +396,9 @@ static int parameters_update(const struct sensor_parameter_handles *h, struct se param_get(h->mag_offset[2], &(p->mag_offset[2])); /* scaling of ADC ticks to battery voltage */ - param_get(h->battery_voltage_scaling, &(p->battery_voltage_scaling)); + if (param_get(h->battery_voltage_scaling, &(p->battery_voltage_scaling)) != OK) { + warnx("Loading voltage scaling param failed."); + } return OK; } diff --git a/apps/sensors/sensors.cpp b/apps/sensors/sensors.cpp index f8baa285b..b3fc5b642 100644 --- a/apps/sensors/sensors.cpp +++ b/apps/sensors/sensors.cpp @@ -464,7 +464,9 @@ Sensors::parameters_update() param_get(_parameter_handles.mag_offset[2], &(_parameters.mag_offset[2])); /* scaling of ADC ticks to battery voltage */ - param_get(_parameter_handles.battery_voltage_scaling, &(_parameters.battery_voltage_scaling)); + if (param_get(_parameter_handles.battery_voltage_scaling, &(_parameters.battery_voltage_scaling)) != OK) { + warnx("Failed updating voltage scaling param"); + } return OK; } @@ -604,8 +606,8 @@ Sensors::accel_poll(struct sensor_combined_s &raw) accel_report.timestamp = hrt_absolute_time(); accel_report.x_raw = (buf[1] == -32768) ? 32767 : -buf[1]; - accel_report.y_raw = (buf[0] == -32768) ? -32767 : buf[0]; - accel_report.z_raw = (buf[2] == -32768) ? -32767 : buf[2]; + accel_report.y_raw = buf[0]; + accel_report.z_raw = buf[2]; const float range_g = 4.0f; /* scale from 14 bit to m/s2 */ @@ -721,7 +723,10 @@ Sensors::vehicle_status_poll() _hil_enabled = false; _publishing = true; } + } + /* XXX run the param update more often right now */ + { /* update parameters */ parameters_update(); |