summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2018-06-24 22:08:16 +0200
committerAleksander Morgado <aleksander@aleksander.es>2018-07-10 22:42:49 +0200
commite46399838d802f1582c657e458c542c21e7ed93c (patch)
tree307f129f64d19a281b1510a52b9bf58225205cd1
parent1bfb1df88d97608952726d8eb0bcd93c915570d1 (diff)
downloadlibqmi-e46399838d802f1582c657e458c542c21e7ed93c.tar.gz
libqmi-glib,loc: remove QmiLocAltitudeAssumed, it's just a boolean
-rw-r--r--data/qmi-service-loc.json4
-rw-r--r--docs/reference/libqmi-glib/libqmi-glib-common.sections5
-rw-r--r--src/libqmi-glib/qmi-enums-loc.h14
-rw-r--r--src/qmicli/qmicli-loc.c10
4 files changed, 10 insertions, 23 deletions
diff --git a/data/qmi-service-loc.json b/data/qmi-service-loc.json
index 71cc69da..daa343e3 100644
--- a/data/qmi-service-loc.json
+++ b/data/qmi-service-loc.json
@@ -313,12 +313,12 @@
"id" : "0x0025",
"since" : "1.22",
"output" : [ {
- "name": "Altitude Source",
+ "name": "Altitude Assumed",
"id" : "0x01",
"type" : "TLV",
"since" : "1.22",
"format": "guint8",
- "public-format": "QmiLocAltitudeAssumed" },
+ "public-format": "gboolean" },
{ "name" : "List",
"id" : "0x10",
"type" : "TLV",
diff --git a/docs/reference/libqmi-glib/libqmi-glib-common.sections b/docs/reference/libqmi-glib/libqmi-glib-common.sections
index 9fb7de5c..ffd97077 100644
--- a/docs/reference/libqmi-glib/libqmi-glib-common.sections
+++ b/docs/reference/libqmi-glib/libqmi-glib-common.sections
@@ -1074,7 +1074,6 @@ QmiLocEventRegistrationFlag
QmiLocFixRecurrenceType
QmiLocOperationMode
QmiLocEngineState
-QmiLocAltitudeAssumed
QmiLocSatelliteValidInformation
QmiLocSystem
QmiLocHealthStatus
@@ -1090,7 +1089,6 @@ QmiLocSessionStatus
qmi_loc_intermediate_report_state_get_string
qmi_loc_fix_recurrence_type_get_string
qmi_loc_operation_mode_get_string
-qmi_loc_altitude_assumed_get_string
qmi_loc_engine_state_get_string
qmi_loc_health_status_get_string
qmi_loc_indication_status_get_string
@@ -1107,7 +1105,6 @@ qmi_loc_intermediate_report_state_build_string_from_mask
qmi_loc_operation_mode_build_string_from_mask
qmi_loc_fix_recurrence_type_build_string_from_mask
qmi_loc_event_registration_flag_build_string_from_mask
-qmi_loc_altitude_assumed_build_string_from_mask
qmi_loc_engine_state_build_string_from_mask
qmi_loc_health_status_build_string_from_mask
qmi_loc_indication_status_build_string_from_mask
@@ -1124,7 +1121,6 @@ qmi_loc_time_source_build_string_from_mask
QMI_TYPE_LOC_INTERMEDIATE_REPORT_STATE
QMI_TYPE_LOC_FIX_RECURRENCE_TYPE
QMI_TYPE_LOC_OPERATION_MODE
-QMI_TYPE_LOC_ALTITUDE_ASSUMED
QMI_TYPE_LOC_ENGINE_STATE
QMI_TYPE_LOC_HEALTH_STATUS
QMI_TYPE_LOC_INDICATION_STATUS
@@ -1139,7 +1135,6 @@ QMI_TYPE_LOC_TIME_SOURCE
qmi_loc_intermediate_report_state_get_type
qmi_loc_fix_recurrence_type_get_type
qmi_loc_operation_mode_get_type
-qmi_loc_altitude_assumed_get_type
qmi_loc_engine_state_get_type
qmi_loc_health_status_get_type
qmi_loc_indication_status_get_type
diff --git a/src/libqmi-glib/qmi-enums-loc.h b/src/libqmi-glib/qmi-enums-loc.h
index 26865f0d..1946c2f4 100644
--- a/src/libqmi-glib/qmi-enums-loc.h
+++ b/src/libqmi-glib/qmi-enums-loc.h
@@ -246,20 +246,6 @@ typedef enum {
} QmiLocTimeSource;
/**
- * QmiLocAltitudeAssumed:
- * @QMI_LOC_ALTITUDE_ASSUMED_ALTITUDE_IS_CALCULATED: Altitude is calculated.
- * @QMI_LOC_ALTITUDE_ASSUMED_ALTITUDE_IS_ASSUMED: Altitude is assumed.
- *
- * Whether the altitude has been calculated or assumed.
- *
- * Since 1.22
- */
-typedef enum {
- QMI_LOC_ALTITUDE_ASSUMED_ALTITUDE_IS_CALCULATED = 0,
- QMI_LOC_ALTITUDE_ASSUMED_ALTITUDE_IS_ASSUMED = 1,
-} QmiLocAltitudeAssumed;
-
-/**
* QmiLocSatelliteValidInformation:
* @QMI_LOC_SATELLITE_VALID_INFORMATION_SYSTEM: System,
* @QMI_LOC_SATELLITE_VALID_INFORMATION_GNSS_SATELLITE_ID: GNSS Satellite ID.
diff --git a/src/qmicli/qmicli-loc.c b/src/qmicli/qmicli-loc.c
index 74d91e52..be5c894c 100644
--- a/src/qmicli/qmicli-loc.c
+++ b/src/qmicli/qmicli-loc.c
@@ -259,8 +259,14 @@ static void
gnss_sv_info_received (QmiClientLoc *client,
QmiIndicationLocGnssSvInfoOutput *output)
{
- GArray *satellite_infos = NULL;
- guint i;
+ GArray *satellite_infos = NULL;
+ guint i;
+ gboolean altitude_assumed;
+
+ if (qmi_indication_loc_gnss_sv_info_output_get_altitude_assumed (output, &altitude_assumed, NULL))
+ g_print ("[gnss sv info] Altitude assumed: %s\n", altitude_assumed ? "yes" : "no");
+ else
+ g_print ("[gnss sv info] Altitude assumed: n/a\n");
qmi_indication_loc_gnss_sv_info_output_get_list (output, &satellite_infos, NULL);