Skip to content

Commit 006d2c0

Browse files
sfe-SparkFrosfe-SparkFro
committed
Fix PDP and UTIME command prefixes
1 parent 59e9aa7 commit 006d2c0

File tree

3 files changed

+33
-30
lines changed

3 files changed

+33
-30
lines changed

‎src/SparkFun_u-blox_SARA-R5_Arduino_Library.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,11 @@
8383
#define SARA_R5_COMMAND_BAUD UBX_CELL_COMMAND_BAUD
8484
// ### Packet switched data services
8585
#define SARA_R5_MESSAGE_PDP_DEF UBX_CELL_MESSAGE_PDP_DEF
86+
#define SARA_R5_MESSAGE_PDP_CONFIG UBX_CELL_MESSAGE_PDP_CONFIG
87+
#define SARA_R5_MESSAGE_PDP_ACTION UBX_CELL_MESSAGE_PDP_ACTION
8688
#define SARA_R5_MESSAGE_PDP_CONTEXT_ACTIVATE UBX_CELL_MESSAGE_PDP_CONTEXT_ACTIVATE
8789
#define SARA_R5_MESSAGE_ENTER_PPP UBX_CELL_MESSAGE_ENTER_PPP
90+
#define SARA_R5_NETWORK_ASSIGNED_DATA UBX_CELL_NETWORK_ASSIGNED_DATA
8891
// ### GPIO
8992
#define SARA_R5_COMMAND_GPIO UBX_CELL_COMMAND_GPIO
9093
// ### IP

‎src/sfe_sara_r5.cpp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ UBX_CELL_error_t SARA_R5::setUtimeMode(UBX_CELL_utime_mode_t mode, UBX_CELL_utim
55
UBX_CELL_error_t err;
66
char *command;
77

8-
command = ubx_cell_calloc_char(strlen(SARA_R5_GNSS_REQUEST_TIME) + 16);
8+
command = ubx_cell_calloc_char(strlen(UBX_CELL_GNSS_REQUEST_TIME) + 16);
99
if (command == nullptr)
1010
return UBX_CELL_ERROR_OUT_OF_MEMORY;
1111
if (mode == UBX_CELL_UTIME_MODE_STOP) // stop UTIME does not require a sensor
12-
sprintf(command, "%s=%d", SARA_R5_GNSS_REQUEST_TIME, mode);
12+
sprintf(command, "%s=%d", UBX_CELL_GNSS_REQUEST_TIME, mode);
1313
else
14-
sprintf(command, "%s=%d,%d", SARA_R5_GNSS_REQUEST_TIME, mode, sensor);
14+
sprintf(command, "%s=%d,%d", UBX_CELL_GNSS_REQUEST_TIME, mode, sensor);
1515

1616
err = sendCommandWithResponse(command, UBX_CELL_RESPONSE_OK_OR_ERROR,
1717
nullptr, UBX_CELL_10_SEC_TIMEOUT);
@@ -28,10 +28,10 @@ UBX_CELL_error_t SARA_R5::getUtimeMode(UBX_CELL_utime_mode_t *mode, UBX_CELL_uti
2828
UBX_CELL_utime_mode_t m;
2929
UBX_CELL_utime_sensor_t s;
3030

31-
command = ubx_cell_calloc_char(strlen(SARA_R5_GNSS_REQUEST_TIME) + 2);
31+
command = ubx_cell_calloc_char(strlen(UBX_CELL_GNSS_REQUEST_TIME) + 2);
3232
if (command == nullptr)
3333
return UBX_CELL_ERROR_OUT_OF_MEMORY;
34-
sprintf(command, "%s?", SARA_R5_GNSS_REQUEST_TIME);
34+
sprintf(command, "%s?", UBX_CELL_GNSS_REQUEST_TIME);
3535

3636
response = ubx_cell_calloc_char(minimumResponseAllocation);
3737
if (response == nullptr)
@@ -80,10 +80,10 @@ UBX_CELL_error_t SARA_R5::setUtimeIndication(UBX_CELL_utime_urc_configuration_t
8080
UBX_CELL_error_t err;
8181
char *command;
8282

83-
command = ubx_cell_calloc_char(strlen(SARA_R5_GNSS_TIME_INDICATION) + 16);
83+
command = ubx_cell_calloc_char(strlen(UBX_CELL_GNSS_TIME_INDICATION) + 16);
8484
if (command == nullptr)
8585
return UBX_CELL_ERROR_OUT_OF_MEMORY;
86-
sprintf(command, "%s=%d", SARA_R5_GNSS_TIME_INDICATION, config);
86+
sprintf(command, "%s=%d", UBX_CELL_GNSS_TIME_INDICATION, config);
8787

8888
err = sendCommandWithResponse(command, UBX_CELL_RESPONSE_OK_OR_ERROR,
8989
nullptr, UBX_CELL_STANDARD_RESPONSE_TIMEOUT);
@@ -99,10 +99,10 @@ UBX_CELL_error_t SARA_R5::getUtimeIndication(UBX_CELL_utime_urc_configuration_t
9999

100100
UBX_CELL_utime_urc_configuration_t c;
101101

102-
command = ubx_cell_calloc_char(strlen(SARA_R5_GNSS_TIME_INDICATION) + 2);
102+
command = ubx_cell_calloc_char(strlen(UBX_CELL_GNSS_TIME_INDICATION) + 2);
103103
if (command == nullptr)
104104
return UBX_CELL_ERROR_OUT_OF_MEMORY;
105-
sprintf(command, "%s?", SARA_R5_GNSS_TIME_INDICATION);
105+
sprintf(command, "%s?", UBX_CELL_GNSS_TIME_INDICATION);
106106

107107
response = ubx_cell_calloc_char(minimumResponseAllocation);
108108
if (response == nullptr)
@@ -144,13 +144,13 @@ UBX_CELL_error_t SARA_R5::setUtimeConfiguration(int32_t offsetNanoseconds, int32
144144
UBX_CELL_error_t err;
145145
char *command;
146146

147-
command = ubx_cell_calloc_char(strlen(SARA_R5_GNSS_TIME_CONFIGURATION) + 48);
147+
command = ubx_cell_calloc_char(strlen(UBX_CELL_GNSS_TIME_CONFIGURATION) + 48);
148148
if (command == nullptr)
149149
return UBX_CELL_ERROR_OUT_OF_MEMORY;
150150
#if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
151-
sprintf(command, "%s=%d,%d", SARA_R5_GNSS_TIME_CONFIGURATION, offsetNanoseconds, offsetSeconds);
151+
sprintf(command, "%s=%d,%d", UBX_CELL_GNSS_TIME_CONFIGURATION, offsetNanoseconds, offsetSeconds);
152152
#else
153-
sprintf(command, "%s=%ld,%ld", SARA_R5_GNSS_TIME_CONFIGURATION, offsetNanoseconds, offsetSeconds);
153+
sprintf(command, "%s=%ld,%ld", UBX_CELL_GNSS_TIME_CONFIGURATION, offsetNanoseconds, offsetSeconds);
154154
#endif
155155

156156
err = sendCommandWithResponse(command, UBX_CELL_RESPONSE_OK_OR_ERROR,
@@ -168,10 +168,10 @@ UBX_CELL_error_t SARA_R5::getUtimeConfiguration(int32_t *offsetNanoseconds, int3
168168
int32_t ons;
169169
int32_t os;
170170

171-
command = ubx_cell_calloc_char(strlen(SARA_R5_GNSS_TIME_CONFIGURATION) + 2);
171+
command = ubx_cell_calloc_char(strlen(UBX_CELL_GNSS_TIME_CONFIGURATION) + 2);
172172
if (command == nullptr)
173173
return UBX_CELL_ERROR_OUT_OF_MEMORY;
174-
sprintf(command, "%s?", SARA_R5_GNSS_TIME_CONFIGURATION);
174+
sprintf(command, "%s?", UBX_CELL_GNSS_TIME_CONFIGURATION);
175175

176176
response = ubx_cell_calloc_char(minimumResponseAllocation);
177177
if (response == nullptr)
@@ -220,10 +220,10 @@ UBX_CELL_error_t SARA_R5::setPDPconfiguration(int profile, UBX_CELL_pdp_configur
220220
if (profile >= UBX_CELL_NUM_PSD_PROFILES)
221221
return UBX_CELL_ERROR_ERROR;
222222

223-
command = ubx_cell_calloc_char(strlen(SARA_R5_MESSAGE_PDP_CONFIG) + 24);
223+
command = ubx_cell_calloc_char(strlen(UBX_CELL_MESSAGE_PDP_CONFIG) + 24);
224224
if (command == nullptr)
225225
return UBX_CELL_ERROR_OUT_OF_MEMORY;
226-
sprintf(command, "%s=%d,%d,%d", SARA_R5_MESSAGE_PDP_CONFIG, profile, parameter,
226+
sprintf(command, "%s=%d,%d,%d", UBX_CELL_MESSAGE_PDP_CONFIG, profile, parameter,
227227
value);
228228

229229
err = sendCommandWithResponse(command, UBX_CELL_RESPONSE_OK_OR_ERROR, nullptr,
@@ -246,10 +246,10 @@ UBX_CELL_error_t SARA_R5::setPDPconfiguration(int profile, UBX_CELL_pdp_configur
246246
if (profile >= UBX_CELL_NUM_PSD_PROFILES)
247247
return UBX_CELL_ERROR_ERROR;
248248

249-
command = ubx_cell_calloc_char(strlen(SARA_R5_MESSAGE_PDP_CONFIG) + 64);
249+
command = ubx_cell_calloc_char(strlen(UBX_CELL_MESSAGE_PDP_CONFIG) + 64);
250250
if (command == nullptr)
251251
return UBX_CELL_ERROR_OUT_OF_MEMORY;
252-
sprintf(command, "%s=%d,%d,\"%s\"", SARA_R5_MESSAGE_PDP_CONFIG, profile, parameter,
252+
sprintf(command, "%s=%d,%d,\"%s\"", UBX_CELL_MESSAGE_PDP_CONFIG, profile, parameter,
253253
value.c_str());
254254

255255
err = sendCommandWithResponse(command, UBX_CELL_RESPONSE_OK_OR_ERROR, nullptr,
@@ -267,10 +267,10 @@ UBX_CELL_error_t SARA_R5::setPDPconfiguration(int profile, UBX_CELL_pdp_configur
267267
if (profile >= UBX_CELL_NUM_PSD_PROFILES)
268268
return UBX_CELL_ERROR_ERROR;
269269

270-
command = ubx_cell_calloc_char(strlen(SARA_R5_MESSAGE_PDP_CONFIG) + 64);
270+
command = ubx_cell_calloc_char(strlen(UBX_CELL_MESSAGE_PDP_CONFIG) + 64);
271271
if (command == nullptr)
272272
return UBX_CELL_ERROR_OUT_OF_MEMORY;
273-
sprintf(command, "%s=%d,%d,\"%d.%d.%d.%d\"", SARA_R5_MESSAGE_PDP_CONFIG, profile, parameter,
273+
sprintf(command, "%s=%d,%d,\"%d.%d.%d.%d\"", UBX_CELL_MESSAGE_PDP_CONFIG, profile, parameter,
274274
value[0], value[1], value[2], value[3]);
275275

276276
err = sendCommandWithResponse(command, UBX_CELL_RESPONSE_OK_OR_ERROR, nullptr,
@@ -288,10 +288,10 @@ UBX_CELL_error_t SARA_R5::performPDPaction(int profile, UBX_CELL_pdp_actions_t a
288288
if (profile >= UBX_CELL_NUM_PSD_PROFILES)
289289
return UBX_CELL_ERROR_ERROR;
290290

291-
command = ubx_cell_calloc_char(strlen(SARA_R5_MESSAGE_PDP_ACTION) + 32);
291+
command = ubx_cell_calloc_char(strlen(UBX_CELL_MESSAGE_PDP_ACTION) + 32);
292292
if (command == nullptr)
293293
return UBX_CELL_ERROR_OUT_OF_MEMORY;
294-
sprintf(command, "%s=%d,%d", SARA_R5_MESSAGE_PDP_ACTION, profile, action);
294+
sprintf(command, "%s=%d,%d", UBX_CELL_MESSAGE_PDP_ACTION, profile, action);
295295

296296
err = sendCommandWithResponse(command, UBX_CELL_RESPONSE_OK_OR_ERROR, nullptr,
297297
UBX_CELL_STANDARD_RESPONSE_TIMEOUT);
@@ -310,10 +310,10 @@ UBX_CELL_error_t SARA_R5::getNetworkAssignedIPAddress(int profile, IPAddress *ad
310310
int paramTag = 0; // 0: IP address: dynamic IP address assigned during PDP context activation
311311
int paramVals[4];
312312

313-
command = ubx_cell_calloc_char(strlen(SARA_R5_NETWORK_ASSIGNED_DATA) + 16);
313+
command = ubx_cell_calloc_char(strlen(UBX_CELL_NETWORK_ASSIGNED_DATA) + 16);
314314
if (command == nullptr)
315315
return UBX_CELL_ERROR_OUT_OF_MEMORY;
316-
sprintf(command, "%s=%d,%d", SARA_R5_NETWORK_ASSIGNED_DATA, profile, paramTag);
316+
sprintf(command, "%s=%d,%d", UBX_CELL_NETWORK_ASSIGNED_DATA, profile, paramTag);
317317

318318
response = ubx_cell_calloc_char(minimumResponseAllocation);
319319
if (response == nullptr)

‎src/sfe_sara_r5.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
#include "sfe_ublox_cellular.h"
55

6-
const char SARA_R5_MESSAGE_PDP_CONFIG[] = "+UPSD"; // Packet switched Data Profile configuration
7-
const char SARA_R5_MESSAGE_PDP_ACTION[] = "+UPSDA"; // Perform the action for the specified PSD profile
8-
const char SARA_R5_NETWORK_ASSIGNED_DATA[] = "+UPSND"; // Packet switched network-assigned data
9-
const char SARA_R5_GNSS_REQUEST_TIME[] = "+UTIME"; // Ask for time information from cellular modem (CellTime)
10-
const char SARA_R5_GNSS_TIME_INDICATION[] = "+UTIMEIND"; // Time information request status unsolicited indication
11-
const char SARA_R5_GNSS_TIME_CONFIGURATION[] = "+UTIMECFG"; // Sets time configuration
6+
const char UBX_CELL_MESSAGE_PDP_CONFIG[] = "+UPSD"; // Packet switched Data Profile configuration
7+
const char UBX_CELL_MESSAGE_PDP_ACTION[] = "+UPSDA"; // Perform the action for the specified PSD profile
8+
const char UBX_CELL_NETWORK_ASSIGNED_DATA[] = "+UPSND"; // Packet switched network-assigned data
9+
const char UBX_CELL_GNSS_REQUEST_TIME[] = "+UTIME"; // Ask for time information from cellular modem (CellTime)
10+
const char UBX_CELL_GNSS_TIME_INDICATION[] = "+UTIMEIND"; // Time information request status unsolicited indication
11+
const char UBX_CELL_GNSS_TIME_CONFIGURATION[] = "+UTIMECFG"; // Sets time configuration
1212

1313
// Base SARA-R5 class
1414
class SARA_R5: public UBX_CELL

0 commit comments

Comments
 (0)