Skip to content

Commit cffe268

Browse files
david-cermakdavid-cermak
authored
Merge pull request #531 from david-cermak/fix/modem_minor_prs
[esp_modem]: Accept some PRs
2 parents 38de23f + 08a62cc commit cffe268

File tree

4 files changed

+37
-82
lines changed

4 files changed

+37
-82
lines changed

‎components/esp_modem/examples/pppos_client/main/Kconfig.projbuild

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -63,26 +63,6 @@ menu "Example Configuration"
6363
help
6464
Set APN (Access Point Name), a logical name to choose data network
6565

66-
config EXAMPLE_MODEM_PPP_AUTH_USERNAME
67-
string "Set username for authentication"
68-
default "espressif"
69-
depends on !EXAMPLE_MODEM_PPP_AUTH_NONE
70-
help
71-
Set username for PPP Authentication.
72-
73-
config EXAMPLE_MODEM_PPP_AUTH_PASSWORD
74-
string "Set password for authentication"
75-
default "esp32"
76-
depends on !EXAMPLE_MODEM_PPP_AUTH_NONE
77-
help
78-
Set password for PPP Authentication.
79-
80-
config EXAMPLE_MODEM_PPP_AUTH_NONE
81-
bool "Skip PPP authentication"
82-
default n
83-
help
84-
Set to true for the PPP client to skip authentication
85-
8666
config EXAMPLE_SEND_MSG
8767
bool "Short message (SMS)"
8868
default n

‎components/esp_modem/examples/simple_cmux_client/components/SIM7070_gnss/SIM7070_gnss.cpp

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ std::unique_ptr<DCE_gnss> create_SIM7070_GNSS_dce(const esp_modem::dce_config *c
4949
return gnss_factory::LocalFactory::create(config, std::move(dte), netif);
5050
}
5151

52-
esp_modem::command_result get_gnss_information_sim70xx_lib(esp_modem::CommandableIf *t, esp_modem_gps_t &gps)
52+
esp_modem::command_result get_gnss_information_sim70xx_lib(esp_modem::CommandableIf *t, sim70xx_gps_t &gps)
5353
{
5454

5555
ESP_LOGV(TAG, "%s", __func__ );
@@ -67,24 +67,26 @@ esp_modem::command_result get_gnss_information_sim70xx_lib(esp_modem::Commandabl
6767
}
6868
/**
6969
* Parsing +CGNSINF:
70-
* <GNSS run status>,
71-
* <Fix status>,
72-
* <UTC date & Time>,
73-
* <Latitude>,
74-
* <Longitude>,
75-
* <MSL Altitude>,
76-
* <Speed Over Ground>,
77-
* <Course Over Ground>,
78-
* <Fix Mode>,
79-
* <Reserved1>,
80-
* <HDOP>,
81-
* <PDOP>,
82-
* <VDOP>,
83-
* <Reserved2>,
84-
* <GNSS Satellites in View>,
85-
* <Reserved3>,
86-
* <HPA>,
87-
* <VPA>
70+
| **Index** | **Parameter** | **Unit** | **Range** | **Length** |
71+
|-----------|------------------------|--------------------|--------------------------------------------------------------------------------------|------------|
72+
| 1 | GNSS run status | -- | 0-1 | 1 |
73+
| 2 | Fix status | -- | 0-1 | 1 |
74+
| 3 | UTC date & Time | yyyyMMddhhmmss.sss | yyyy: [1980,2039] MM : [1,12] dd: [1,31] hh: [0,23] mm: [0,59] ss.sss:[0.000,60.999] | 18 |
75+
| 4 | Latitude | ±dd.dddddd | [-90.000000,90.000000] | 10 |
76+
| 5 | Longitude | ±dd.dddddd | -180.000000,180.000000] | 11 |
77+
| 6 | MSL Altitude | meters | [0,999.99] | 8 |
78+
| 7 | Speed Over Ground | Km/hour | [0,360.00] | 6 |
79+
| 8 | Course Over Ground | degrees | 0,1,2[1] | 6 |
80+
| 9 | Fix Mode | -- | | 1 |
81+
| 10 | Reserved1 | | | 0 |
82+
| 11 | HDOP | -- | [0,99.9] | 4 |
83+
| 12 | PDOP | -- | [0,99.9] | 4 |
84+
| 13 | VDOP | -- | [0,99.9] | 4 |
85+
| 14 | Reserved2 | | | 0 |
86+
| 15 | GPS Satellites in View | -- | -- [0,99] | 2 |
87+
| 16 | Reserved3 | | | 0 |
88+
| 17 | HPA[2] | meters | [0,9999.9] | 6 |
89+
| 18 | VPA[2] | meters | [0,9999.9] | 6 |
8890
*/
8991
out = out.substr(pattern.size());
9092
int pos = 0;
@@ -291,11 +293,11 @@ esp_modem::command_result get_gnss_information_sim70xx_lib(esp_modem::Commandabl
291293
{
292294
std::string_view sats_in_view = out.substr(0, pos);
293295
if (sats_in_view.length() > 1) {
294-
if (std::from_chars(out.data(), out.data() + pos, gps.sats_in_view).ec == std::errc::invalid_argument) {
296+
if (std::from_chars(out.data(), out.data() + pos, gps.sat.num).ec == std::errc::invalid_argument) {
295297
return esp_modem::command_result::FAIL;
296298
}
297299
} else {
298-
gps.sats_in_view = 0;
300+
gps.sat.num = 0;
299301
}
300302
} //clean up sats_in_view
301303

@@ -330,12 +332,12 @@ esp_modem::command_result get_gnss_information_sim70xx_lib(esp_modem::Commandabl
330332
return esp_modem::command_result::OK;
331333
}
332334

333-
esp_modem::command_result SIM7070_gnss::get_gnss_information_sim70xx(esp_modem_gps_t &gps)
335+
esp_modem::command_result SIM7070_gnss::get_gnss_information_sim70xx(sim70xx_gps_t &gps)
334336
{
335337
return get_gnss_information_sim70xx_lib(dte.get(), gps);
336338
}
337339

338-
esp_modem::command_result DCE_gnss::get_gnss_information_sim70xx(esp_modem_gps_t &gps)
340+
esp_modem::command_result DCE_gnss::get_gnss_information_sim70xx(sim70xx_gps_t &gps)
339341
{
340342
return device->get_gnss_information_sim70xx(gps);
341343
}

‎components/esp_modem/examples/simple_cmux_client/components/SIM7070_gnss/SIM7070_gnss.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include "cxx_include/esp_modem_dce_factory.hpp"
1515
#include "cxx_include/esp_modem_dce_module.hpp"
16-
#include "nmea_parser.h"
16+
#include "sim70xx_gps.h"
1717

1818
/**
1919
* @brief Definition of a custom SIM7070 class with GNSS capabilities.
@@ -23,7 +23,7 @@
2323
class SIM7070_gnss: public esp_modem::SIM7070 {
2424
using SIM7070::SIM7070;
2525
public:
26-
esp_modem::command_result get_gnss_information_sim70xx(esp_modem_gps_t &gps);
26+
esp_modem::command_result get_gnss_information_sim70xx(sim70xx_gps_t &gps);
2727
};
2828

2929
/**
@@ -47,7 +47,7 @@ class DCE_gnss : public esp_modem::DCE_T<SIM7070_gnss> {
4747

4848
#undef ESP_MODEM_DECLARE_DCE_COMMAND
4949

50-
esp_modem::command_result get_gnss_information_sim70xx(esp_modem_gps_t &gps);
50+
esp_modem::command_result get_gnss_information_sim70xx(sim70xx_gps_t &gps);
5151

5252
};
5353

‎components/esp_modem/examples/simple_cmux_client/components/SIM7070_gnss/nmea_parser.h renamed to ‎components/esp_modem/examples/simple_cmux_client/components/SIM7070_gnss/sim70xx_gps.h

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ extern "C" {
1717
#define GPS_MAX_SATELLITES_IN_VIEW (16)
1818

1919

20-
2120
/**
2221
* @brief GPS fix type
2322
*
@@ -53,9 +52,6 @@ typedef enum {
5352
*/
5453
typedef struct {
5554
uint8_t num; /*!< Satellite number */
56-
uint8_t elevation; /*!< Satellite elevation */
57-
uint16_t azimuth; /*!< Satellite azimuth */
58-
uint8_t snr; /*!< Satellite signal noise ratio */
5955
} gps_satellite_t;
6056

6157
/**
@@ -79,54 +75,31 @@ typedef struct {
7975
uint16_t year; /*!< Year (start from 2000) */
8076
} gps_date_t;
8177

82-
/**
83-
* @brief NMEA Statement
84-
*
85-
*/
86-
typedef enum {
87-
STATEMENT_UNKNOWN = 0, /*!< Unknown statement */
88-
STATEMENT_GGA, /*!< GGA */
89-
STATEMENT_GSA, /*!< GSA */
90-
STATEMENT_RMC, /*!< RMC */
91-
STATEMENT_GSV, /*!< GSV */
92-
STATEMENT_GLL, /*!< GLL */
93-
STATEMENT_VTG /*!< VTG */
94-
} nmea_statement_t;
95-
9678
/**
9779
* @brief GPS object
9880
*
9981
*/
100-
struct esp_modem_gps {
101-
float latitude; /*!< Latitude (degrees) */
102-
float longitude; /*!< Longitude (degrees) */
103-
float altitude; /*!< Altitude (meters) */
82+
struct sim70xx_gps {
10483
gps_run_t run; /*!< run status */
10584
gps_fix_t fix; /*!< Fix status */
106-
uint8_t sats_in_use; /*!< Number of satellites in use */
85+
gps_date_t date; /*!< Fix date */
10786
gps_time_t tim; /*!< time in UTC */
87+
float latitude; /*!< Latitude (degrees) */
88+
float longitude; /*!< Longitude (degrees) */
89+
float altitude; /*!< Altitude (meters) */
90+
float speed; /*!< Ground speed, unit: m/s */
91+
float cog; /*!< Course over ground */
10892
gps_fix_mode_t fix_mode; /*!< Fix mode */
10993
float dop_h; /*!< Horizontal dilution of precision */
11094
float dop_p; /*!< Position dilution of precision */
11195
float dop_v; /*!< Vertical dilution of precision */
112-
uint8_t sats_in_view; /*!< Number of satellites in view */
113-
gps_date_t date; /*!< Fix date */
114-
float speed; /*!< Ground speed, unit: m/s */
115-
float cog; /*!< Course over ground */
96+
gps_satellite_t sat; /*!< Number of satellites in view */
11697
float hpa; /*!< Horizontal Position Accuracy */
11798
float vpa; /*!< Vertical Position Accuracy */
11899
};
119100

120-
typedef struct esp_modem_gps esp_modem_gps_t;
101+
typedef struct sim70xx_gps sim70xx_gps_t;
121102

122-
/**
123-
* @brief NMEA Parser Event ID
124-
*
125-
*/
126-
typedef enum {
127-
GPS_UPDATE, /*!< GPS information has been updated */
128-
GPS_UNKNOWN /*!< Unknown statements detected */
129-
} nmea_event_id_t;
130103

131104
#ifdef __cplusplus
132105
}

0 commit comments

Comments
 (0)