Skip to content

Commit 2f280f4

Browse files
JianyuWang0623xiaoxiang781216
authored andcommitted
uORB/sensor: Rename GPS to GNSS
Signed-off-by: wangjianyu3 <[email protected]>
1 parent 027ded4 commit 2f280f4

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

system/uorb/sensor/gps.c renamed to system/uorb/sensor/gnss.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/****************************************************************************
2-
* apps/system/uorb/sensor/gps.c
2+
* apps/system/uorb/sensor/gnss.c
33
*
44
* Licensed to the Apache Software Foundation (ASF) under one or more
55
* contributor license agreements. See the NOTICE file distributed with
@@ -22,19 +22,19 @@
2222
* Included Files
2323
****************************************************************************/
2424

25-
#include <sensor/gps.h>
25+
#include <sensor/gnss.h>
2626

2727
/****************************************************************************
2828
* Private Functions
2929
****************************************************************************/
3030

3131
#ifdef CONFIG_DEBUG_UORB
32-
static const char sensor_gps_format[] =
32+
static const char sensor_gnss_format[] =
3333
"timestamp:%" PRIu64 ",time_utc:%" PRIu64 ",latitude:%hf,longitude:%hf,"
3434
"altitude:%hf,altitude_ellipsoid:%hf,eph:%hf,epv:%hf,hdop:%hf,pdop:%hf,"
3535
"vdop:%hf,ground_speed:%hf,course:%hf,satellites_used:%" PRIu32 "";
3636

37-
static const char sensor_gps_satellite_format[] =
37+
static const char sensor_gnss_satellite_format[] =
3838
"timestamp:%" PRIu64 ",count:%" PRIu32 ",satellites:%" PRIu32 ","
3939
"svid0:%" PRIu32 ",elevation0:%" PRIu32 ",azimuth0:%" PRIu32 ","
4040
"snr0:%" PRIu32 ",svid1:%" PRIu32 ",elevation1:%" PRIu32 ","
@@ -48,6 +48,6 @@ static const char sensor_gps_satellite_format[] =
4848
* Public Data
4949
****************************************************************************/
5050

51-
ORB_DEFINE(sensor_gps, struct sensor_gps, sensor_gps_format);
52-
ORB_DEFINE(sensor_gps_satellite, struct sensor_gps_satellite,
53-
sensor_gps_satellite_format);
51+
ORB_DEFINE(sensor_gnss, struct sensor_gnss, sensor_gnss_format);
52+
ORB_DEFINE(sensor_gnss_satellite, struct sensor_gnss_satellite,
53+
sensor_gnss_satellite_format);

system/uorb/sensor/gps.h renamed to system/uorb/sensor/gnss.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/****************************************************************************
2-
* apps/system/uorb/sensor/gps.h
2+
* apps/system/uorb/sensor/gnss.h
33
*
44
* Licensed to the Apache Software Foundation (ASF) under one or more
55
* contributor license agreements. See the NOTICE file distributed with
@@ -18,8 +18,8 @@
1818
*
1919
****************************************************************************/
2020

21-
#ifndef __APPS_SYSTEM_UORB_SENSOR_GPS_H
22-
#define __APPS_SYSTEM_UORB_SENSOR_GPS_H
21+
#ifndef __APPS_SYSTEM_UORB_SENSOR_GNSS_H
22+
#define __APPS_SYSTEM_UORB_SENSOR_GNSS_H
2323

2424
/****************************************************************************
2525
* Included Files
@@ -33,7 +33,7 @@
3333

3434
/* register this as object request broker structure */
3535

36-
ORB_DECLARE(sensor_gps);
37-
ORB_DECLARE(sensor_gps_satellite);
36+
ORB_DECLARE(sensor_gnss);
37+
ORB_DECLARE(sensor_gnss_satellite);
3838

3939
#endif

system/uorb/sensor/topics.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include <sensor/ecg.h>
4040
#include <sensor/force.h>
4141
#include <sensor/gas.h>
42-
#include <sensor/gps.h>
42+
#include <sensor/gnss.h>
4343
#include <sensor/gyro.h>
4444
#include <sensor/gesture.h>
4545
#include <sensor/hall.h>
@@ -82,8 +82,8 @@ static FAR const struct orb_metadata *g_sensor_list[] =
8282
ORB_ID(sensor_ecg),
8383
ORB_ID(sensor_force),
8484
ORB_ID(sensor_gas),
85-
ORB_ID(sensor_gps),
86-
ORB_ID(sensor_gps_satellite),
85+
ORB_ID(sensor_gnss),
86+
ORB_ID(sensor_gnss_satellite),
8787
ORB_ID(sensor_gyro),
8888
ORB_ID(sensor_gyro_uncal),
8989
ORB_ID(sensor_hall),

0 commit comments

Comments
 (0)