~thomas-voss/location-service/fix-rtd-docs-next

« back to all changes in this revision

Viewing changes to src/location/providers/gps/android_hardware_abstraction_layer.cpp

Committer: Thomas Voß
Date: 2016-08-26 11:57:39 UTC
mfrom: (261.1.5 refactor-public-structs)
Revision ID: thomas.voss@canonical.com-20160826115739-uibmrkoarr24dr6i

Merge lp:~thomas-voss/location-service/ramp-up-abi-stability.

files added:
include/location/visibility.h

src/location/criteria.cpp

src/location/features.cpp

src/location/space_vehicle.cpp

files modified:
CMakeLists.txt

include/location/clock.h

include/location/connectivity/bounded_integer.h

include/location/connectivity/manager.h

include/location/connectivity/radio_cell.h

include/location/connectivity/wireless_network.h

include/location/criteria.h

include/location/event.h

include/location/events/reference_position_updated.h

include/location/events/wifi_and_cell_id_reporting_state_changed.h

include/location/features.h

include/location/optional.h

include/location/position.h

include/location/provider.h

include/location/satellite_based_positioning_state.h

include/location/service.h

include/location/space_vehicle.h

include/location/units/units.h

include/location/update.h

include/location/wifi_and_cell_reporting_state.h

src/location/CMakeLists.txt

src/location/boost_ptree_settings.h

src/location/cmds/list.h

src/location/cmds/monitor.h

src/location/cmds/provider.h

src/location/cmds/run.h

src/location/cmds/status.h

src/location/cmds/test.h

src/location/connectivity/ofono_nm_connectivity_manager.h

src/location/daemon.h

src/location/dbus/codec.h

src/location/engine.h

src/location/events/reference_position_updated.cpp

src/location/events/wifi_and_cell_id_reporting_state_changed.cpp

src/location/provider_factory.h

src/location/providers/gps/android_hardware_abstraction_layer.cpp

src/location/providers/remote/provider.h

src/location/providers/remote/skeleton.h

src/location/providers/remote/stub.h

src/location/providers/state_tracking_provider.h

src/location/runtime.h

src/location/runtime_tests.cpp

src/location/serializing_bus.h

src/location/settings.h

src/location/time_based_update_policy.h

src/location/trust_store_permission_manager.h

src/location/util/cli.h

Show diffs side-by-side

added added

removed removed

src/location/providers/gps/android_hardware_abstraction_layer.cpp

223

std::set<location::SpaceVehicle> svs;

224

225

for (int i = 0; i < sv_info->num_svs; i++)

226

{

227

location::SpaceVehicle sv;

228

226

{

229

227

// PRN is in the range of [1, 32], adjusting it to make sure we

230

228

// can use it for bitfield flag testing operations.

231

229

int prn = sv_info->sv_list[i].prn - 1;

234

232

235

233

auto shift = (1 << prn);

236

234

237

sv.key.type = location::SpaceVehicle::Type::gps;

238

sv.key.id = sv_info->sv_list[i].prn;

239

sv.snr = sv_info->sv_list[i].snr;

240

sv.has_almanac_data = sv_info->almanac_mask & shift;

241

sv.has_ephimeris_data = sv_info->ephemeris_mask & shift;

242

sv.used_in_fix = sv_info->used_in_fix_mask & shift;

243

sv.azimuth = sv_info->sv_list[i].elevation * location::units::degrees;

244

sv.elevation = sv_info->sv_list[i].azimuth * location::units::degrees;

245

246

svs.insert(sv);

235

svs.insert(location::SpaceVehicle{location::SpaceVehicle::Key{location::SpaceVehicle::Type::gps, sv_info->sv_list[i].prn}}

236

.snr(sv_info->sv_list[i].snr)

237

.has_almanac_data(sv_info->almanac_mask & shift)

238

.has_ephimeris_data(sv_info->ephemeris_mask & shift)

239

.used_in_fix(sv_info->used_in_fix_mask & shift)

240

.azimuth(sv_info->sv_list[i].azimuth * location::units::degrees)

241

.elevation(sv_info->sv_list[i].elevation * location::units::degrees));

247

242

}

248

243

249

244

thiz->space_vehicle_updates()(svs);

Older »