teste de publish
Dependencies: DS1820 HighSpeedAnalogIn devices mbed
Diff: modem.cpp
- Revision:
- 34:348991c54ff3
- Parent:
- 33:a60abda630f7
- Child:
- 36:fd239680e427
--- a/modem.cpp Wed May 30 04:24:55 2018 +0000 +++ b/modem.cpp Sat Jun 02 14:48:26 2018 +0000 @@ -59,7 +59,7 @@ uint16_t numeroByteSendoEnviado; sprintf(aux,"AT+CIPSEND=%u,%lu\r\n",sId,bufferLength); - if(modemCom::sendToModem(aux,1,&modemCom::status.PROMPT_ENVIO_COMMAND_MODE,NULL,500,10,1)) { + if(modemCom::sendToModem(aux,1,&modemCom::status.PROMPT_ENVIO_COMMAND_MODE,NULL,500,2,1)) { for(numeroByteSendoEnviado = 0; numeroByteSendoEnviado<bufferLength; numeroByteSendoEnviado++) { modem.printf("%c",buffer[numeroByteSendoEnviado]); if(debug){ @@ -77,7 +77,7 @@ void modemCom::leMAC(void) { char *ptr; - if(modemCom::sendToModem("AT+CIPSTAMAC?\r\n",1,&modemCom::status.modemResponse,NULL,500,20,1)){ + if(modemCom::sendToModem("AT+CIPSTAMAC?\r\n",1,&modemCom::status.modemResponse,NULL,500,2,1)){ //resposta: +CIPSTAMAC:"18:fe:34:f4:5f:c4" ptr = strtok(bufModem.getRowBuffer(),"\""); ptr = strtok(NULL,"\""); @@ -281,7 +281,7 @@ headerTam = strlen(header); sprintf(aux,"AT+CIPSEND=1,%u\r\n",headerTam); - if(modemCom::sendToModem(aux,1,&modemCom::status.PROMPT_ENVIO_COMMAND_MODE,NULL,1000,10,1)) { + if(modemCom::sendToModem(aux,1,&modemCom::status.PROMPT_ENVIO_COMMAND_MODE,NULL,1000,1,1)) { if(!modemCom::sendToModem(header,1,&modemCom::status.SEND_OK,NULL,1000,1,1)) { sdCard::fechaArquivo(arquivo); modemCom::status.emComunicacao = false; @@ -312,7 +312,7 @@ } while((maxTentativas)&&(!passaParaProximaParte)) { sprintf(aux,"AT+CIPSEND=1,%u\r\n",numeroDeBytesPorEnvio); - if(modemCom::sendToModem(aux,1,&modemCom::status.PROMPT_ENVIO_COMMAND_MODE,NULL,1000,20,1)) { + if(modemCom::sendToModem(aux,1,&modemCom::status.PROMPT_ENVIO_COMMAND_MODE,NULL,1000,1,1)) { if(maxTentativas!=maxRetentativasEnvioParteArquivo) { //Estou realizando reenvio desta parte logo preciso fazer fseek para a quantidade de bytes do envio anterior fseek(arquivo->fp,-numeroDeBytesPorEnvio,SEEK_CUR); @@ -364,7 +364,7 @@ maxTentativas = maxRetentativasEnvioParteArquivo; while((maxTentativas)&&(!passaParaProximaParte)) { sprintf(aux,"AT+CIPSEND=1,%u\r\n",restoDoEnvio+strlen("\r\n--xxBOUNDARYxx--\r\n\r\n")); //Para incluir "\n--xxBOUNDARYxx--\n\n" no fim da msg http - if(modemCom::sendToModem(aux,1,&modemCom::status.PROMPT_ENVIO_COMMAND_MODE,NULL,1000,3,1)) { + if(modemCom::sendToModem(aux,1,&modemCom::status.PROMPT_ENVIO_COMMAND_MODE,NULL,1000,1,1)) { for(numeroByteSendoEnviado=0; numeroByteSendoEnviado<restoDoEnvio; numeroByteSendoEnviado++) { //Envio os bytes aqui! Menos o ultimo para ter o check; c = fgetc(arquivo->fp); @@ -396,7 +396,7 @@ } } else { maxTentativas--; - modemCom::sendToModem("AT\r\n",1,&modemCom::status.OK,NULL,1000,20,1); + modemCom::sendToModem("AT\r\n",1,&modemCom::status.OK,NULL,1000,1,1); } } @@ -498,7 +498,7 @@ return 2; } sprintf(command,"AT+CIPCLOSE=%u\r\n",*id); - if(modemCom::sendToModem(command,1,NULL,",CLOSED",1000,3,300)){ + if(modemCom::sendToModem(command,1,NULL,",CLOSED",1000,1,300)){ *id = 255; return 1; } @@ -704,7 +704,7 @@ char *ptr; int16_t RSSI = 255; - if(modemCom::sendToModem("AT+CWJAP?\r\n",1,&modemCom::status.OK,NULL,10000,2,1000)){ + if(modemCom::sendToModem("AT+CWJAP?\r\n",1,&modemCom::status.OK,NULL,10000,1,1000)){ ptr = strstr(modemCom::bufIn,(const char*)modemCom::status.ssid); if(ptr){ ptr = strtok(ptr,","); //Descarta SSID @@ -740,7 +740,7 @@ //modemCom::leParametrosConexaoSDCard(); //AT+CWJAP=\"\",\"\"\r\n sprintf(aux,"AT+CWJAP=\"%s\",\"%s\"\r\n",modemCom::status.ssid,modemCom::status.password); - if(modemCom::sendToModem(aux,1,&modemCom::status.wifi_connected,NULL,5000,2,5000)) { + if(modemCom::sendToModem(aux,1,&modemCom::status.wifi_connected,NULL,7000,2,1000)) { if(debug){pc.printf("WiFi Conectado.\n");} return true; }else{ @@ -1068,18 +1068,18 @@ } - if(modemCom::sendToModem("AT+CIPMUX=1\r\n",1,&modemCom::status.OK,NULL,1000,4,250)) { + if(modemCom::sendToModem("AT+CIPMUX=1\r\n",1,&modemCom::status.OK,NULL,500,2,100)) { pc.printf("Recebeu o comando AT+CIPMUX=1.\n"); } //AT+CIPSERVER=1,portaLidaDoSDCard sprintf(aux,"AT+CIPSERVER=1,%s\r\n",modemCom::status.port); - if(modemCom::sendToModem(aux,1,&modemCom::status.OK,NULL,1000,4,250)) { + if(modemCom::sendToModem(aux,1,&modemCom::status.OK,NULL,400,2,100)) { pc.printf("Recebeu o comando <%s>.\n",aux); } - if(modemCom::sendToModem("AT+CIPSTO=10\r\n",1,&modemCom::status.OK,NULL,500,3,250)) { + if(modemCom::sendToModem("AT+CIPSTO=10\r\n",1,&modemCom::status.OK,NULL,400,2,100)) { pc.printf("Recebeu o comando AT+CIPSTO=10.\n"); } @@ -1089,23 +1089,23 @@ } - if(modemCom::sendToModem("AT+CIPAP_CUR=\"192.168.4.1\",\"192.168.4.1\",\"255.255.255.0\"\r\n",1,&modemCom::status.OK,NULL,500,4,300)) { + if(modemCom::sendToModem("AT+CIPAP_CUR=\"192.168.4.1\",\"192.168.4.1\",\"255.255.255.0\"\r\n",1,&modemCom::status.OK,NULL,500,2,100)) { pc.printf("Recebeu o comando AT+CIPAP_CUR=\"192.168.4.1\",\"192.168.4.1\",\"255.255.255.0\".\n"); } //Aqui decido se uso DHCP ou não. if(strstr(modemCom::status.gateway,"dhcp")||(strlen(modemCom::status.gateway)==0)){ //usando dhcp - if(modemCom::sendToModem("AT+CWDHCP_CUR=2,1\r\n",1,&modemCom::status.OK,NULL,500,4,300)) { + if(modemCom::sendToModem("AT+CWDHCP_CUR=2,1\r\n",1,&modemCom::status.OK,NULL,500,2,100)) { pc.printf("Recebeu o comando AT+CWDHCP_CUR=2,1.\n"); } }else{ - if(modemCom::sendToModem("AT+CWDHCP_CUR=2,0\r\n",1,&modemCom::status.OK,NULL,500,4,300)) { + if(modemCom::sendToModem("AT+CWDHCP_CUR=2,0\r\n",1,&modemCom::status.OK,NULL,500,2,100)) { pc.printf("Recebeu o comando AT+CWDHCP_CUR=2,0.\n"); } //AT+CIPSTA_DEF="192.168.6.100","192.168.6.1","255.255.255.0" sprintf(aux,"AT+CIPSTA_CUR=\"%s\",\"%s\",\"%s\"\r\n",modemCom::status.STAIP,modemCom::status.gateway,modemCom::status.subnetmask); - if(modemCom::sendToModem(aux,1,&modemCom::status.OK,NULL,500,4,300)) { + if(modemCom::sendToModem(aux,1,&modemCom::status.OK,NULL,500,2,100)) { pc.printf("Recebeu o comando <%s>.\n",aux); }