Changed all 'NED board' references to 'FRD body'. Also cleaned up mix… #16337
Conversation
…ing of m/s/s and m/s^2 to use the latter. There are still some messages that needs to be looked at for correct reference frame: 'vehicle_rates_setpoint.msg' and 'vehicle_attitude_setpoint.msg
|
There are conflicts in quite a few files, can you rebase this on current master? |
msg/sensor_correction.msg
Outdated
| float32[3] accel_scale_2 # accelerometer XYZ scale factors in the sensor frame | ||
|
|
||
| # Corrections for barometric pressure outputs where corrected_pressure = raw_pressure * pressure_scale + pressure_offset | ||
| # Note the corrections are in the sensor frame and must be applied before the sensor data is rotated into body frame | ||
| # corrections for uORB instance 0 | ||
| float32 baro_offset_0 # barometric pressure offsets in the sensor frame in m/s/s | ||
| float32 baro_offset_0 # barometric pressure offsets in the sensor frame in m/s^2 |
There was a problem hiding this comment.
| float32 baro_offset_0 # barometric pressure offsets in the sensor frame in m/s^2 | |
| float32 baro_offset_0 # barometric pressure offsets in the sensor frame in Pascals. |
@dagar I added current master as upstream and rebased my fork. Then pushed my origin to my fork master. Does that suffice? Sorry - I'm new to rebasing. |
Yes that would be fine, but it doesn't look like that branch made it to github as it still reports the conflicts.
Merging with latest PX4 master is also fine. |
|
@dagar Got messy. Closing this one and making a fresh. |
…ing of m/s/s and m/s^2 to use the latter. There are still some messages that needs to be looked at for correct reference frame: 'vehicle_rates_setpoint.msg' and 'vehicle_attitude_setpoint.msg
Solves issue: #16328