Skip to content

Commit 6c48d2e

Browse files
committed
added status functions and fixed begin
Former-commit-id: 56b5182
1 parent 501ac20 commit 6c48d2e

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

libraries/WiFiS3/src/Modem.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,7 @@ bool ModemClass::write(const string &prompt, string &data_res, char * fmt, ...){
3737
va_end (va);
3838
#ifdef MODEM_DEBUG
3939
Serial.print("tx_buff: ");
40-
for(int i =0; i<MAX_BUFF_SIZE; i++) {
41-
Serial.print(tx_buff[i], HEX);
42-
Serial.print(" ");
43-
}
44-
Serial.println();
4540
Serial.write(tx_buff,strlen((char *)tx_buff));
46-
Serial.println("ciao");
4741
#endif
4842
_serial->write(tx_buff,strlen((char *)tx_buff));
4943
return buf_read(prompt,data_res);;
@@ -57,7 +51,6 @@ bool ModemClass::buf_read(const string &prompt, string &data_res) {
5751
while(_serial->available()){
5852
char c = _serial->read();
5953
data_res += c;
60-
Serial.print(c);
6154
if(string::npos != data_res.rfind(PROMPT_OK)){
6255
data_res.substr(0, data_res.length() - sizeof(PROMPT_OK));
6356
if(prompt != DO_NOT_CHECK_CMD) {

libraries/WiFiS3/src/WiFi.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ int CWifi::begin(const char* ssid, const char *passphrase) {
2525
/* -------------------------------------------------------------------------- */
2626
modem.begin();
2727
string res = "";
28-
if(modem.write(string(PROMPT(_BEGINSTA)),res, "%s%s,%s\r\n" , CMD_WRITE(_BEGINSTA), ssid, passphrase)) {
28+
if(modem.write(string(PROMPT(_BEGINSTA)),res, "%s%s,\"%s\"\r\n" , CMD_WRITE(_BEGINSTA), ssid, passphrase)) {
2929
return atoi(res.c_str());
3030
}
3131
return 0;
@@ -286,7 +286,11 @@ uint8_t CWifi::encryptionType() {
286286
/* -------------------------------------------------------------------------- */
287287
uint8_t CWifi::status() {
288288
/* -------------------------------------------------------------------------- */
289-
return 0;
289+
string res = "";
290+
if(modem.write(string(PROMPT(_GETSTATUS)), res, CMD_READ(_GETSTATUS))) {
291+
return atoi(res.c_str());
292+
}
293+
return 0;
290294
}
291295

292296
/* -------------------------------------------------------------------------- */

0 commit comments

Comments
 (0)