1
+
2
+
1
3
#include " ArduinoCellular.h"
2
4
3
5
unsigned long ArduinoCellular::getTime () {
@@ -41,16 +43,16 @@ void ArduinoCellular::begin() {
41
43
42
44
}
43
45
44
- bool ArduinoCellular::connect (String apn, String gprsUser, String gprsPass, String pin){
46
+ bool ArduinoCellular::connect (const char * apn, const char * gprsUser, const char * gprsPass, const char * pin){
45
47
SimStatus simStatus = getSimStatus ();
46
48
if (simStatus == SimStatus::SIM_LOCKED) {
47
- unlockSIM (pin. c_str () );
49
+ unlockSIM (pin);
48
50
}
49
51
50
52
simStatus = getSimStatus ();
51
53
if (simStatus == SimStatus::SIM_READY) {
52
54
if (awaitNetworkRegistration ()){
53
- if (connectToGPRS (apn. c_str () , gprsUser. c_str () , gprsPass. c_str () )){
55
+ if (connectToGPRS (apn, gprsUser, gprsPass)){
54
56
Serial.println (" Setting DNS..." );
55
57
Serial.println (this ->sendATCommand (" +QIDNSCFG=1,\" 8.8.8.8\" ,\" 8.8.4.4\" " ));
56
58
return true ;
@@ -130,6 +132,10 @@ HttpClient ArduinoCellular::getHTTPSClient(const char * server, const int port){
130
132
return HttpClient (* new BearSSLClient (* new TinyGsmClient (modem)), server, port);
131
133
}
132
134
135
+ BearSSLClient ArduinoCellular::getSecureNetworkClient (){
136
+ return BearSSLClient (* new TinyGsmClient (modem));
137
+ }
138
+
133
139
bool ArduinoCellular::isConnectedToOperator (){
134
140
return modem.isNetworkConnected ();
135
141
}
@@ -194,7 +200,6 @@ bool ArduinoCellular::enableGPS(bool assisted){
194
200
195
201
modem.enableGPS ();
196
202
// delay(10000);
197
- // TODO: ^ move this to the sketch
198
203
}
199
204
200
205
String ArduinoCellular::sendATCommand ( char * command, unsigned long timeout){
@@ -297,4 +302,28 @@ std::vector<SMS> ArduinoCellular::getUnreadSMS(){
297
302
} else {
298
303
return parseSMSData (rawMessages);
299
304
}
300
- }
305
+ }
306
+
307
+
308
+
309
+ bool ArduinoCellular::connect (String apn, String gprsUser, String gprsPass, String pin){
310
+ SimStatus simStatus = getSimStatus ();
311
+ if (simStatus == SimStatus::SIM_LOCKED) {
312
+ unlockSIM (pin.c_str ());
313
+ }
314
+
315
+ simStatus = getSimStatus ();
316
+ if (simStatus == SimStatus::SIM_READY) {
317
+ if (awaitNetworkRegistration ()){
318
+ if (connectToGPRS (apn.c_str (), gprsUser.c_str (), gprsPass.c_str ())){
319
+ Serial.println (" Setting DNS..." );
320
+ Serial.println (this ->sendATCommand (" +QIDNSCFG=1,\" 8.8.8.8\" ,\" 8.8.4.4\" " ));
321
+ return true ;
322
+ }
323
+ } else {
324
+ return false ;
325
+ }
326
+ } else {
327
+ return false ;
328
+ }
329
+ }
0 commit comments