Reverted GPRS init to SAPBR as CSTT does not set bearer settings

Revert most of the changed done with c903441

Author: blemasle

src/SIM808.Gprs.cpp

@@ -1,15 +1,26 @@
 #include "SIM808.h"
 
-AT_COMMAND(SET_BEARER_SETTING_CONTYPE_GPRS, "+SAPBR=3,1,\"CONTYPE\",\"GPRS\"");
+AT_COMMAND(SET_BEARER_SETTING_PARAMETER, "+SAPBR=3,1,\"%S\",\"%s\"");
 AT_COMMAND(SET_BEARER_SETTING, "+SAPBR=%d,%d");
-AT_COMMAND(GPRS_START_TASK, "+CSTT=\"%s\",\"%s\",\"%s\"");
 AT_COMMAND(GPRS_ATTACH, "+CGATT=%d");
 
+AT_COMMAND_PARAMETER(BEARER, CONTYPE);
+AT_COMMAND_PARAMETER(BEARER, APN);
+AT_COMMAND_PARAMETER(BEARER, USER);
+AT_COMMAND_PARAMETER(BEARER, PWD);
+
+TOKEN_TEXT(GPRS, "GPRS");
 TOKEN_TEXT(CGATT, "+CGATT");
 TOKEN_TEXT(CIPSHUT, "+CIPSHUT");
 TOKEN_TEXT(SHUT_OK, "SHUT OK");
 TOKEN_TEXT(CGREG, "+CGREG");
 
+bool SIM808::setBearerSetting(ATConstStr parameter, const char* value)
+{
+	sendFormatAT(TO_F(AT_COMMAND_SET_BEARER_SETTING_PARAMETER), parameter, value);
+	return waitResponse() == 0;
+}
+
 bool SIM808::getGprsPowerState(bool *state)
 {
 	uint8_t result;
@@ -27,14 +38,19 @@ bool SIM808::getGprsPowerState(bool *state)
 
 bool SIM808::enableGprs(const char *apn, const char* user = NULL, const char *password = NULL)
 {
+	char gprsToken[5];
+	strcpy_P(gprsToken, TOKEN_GPRS);
+
 	return 
 		(sendAT(TO_F(TOKEN_CIPSHUT)), waitResponse(65000L, TO_F(TOKEN_SHUT_OK)) == 0) &&					//AT+CIPSHUT
 		(sendFormatAT(TO_F(AT_COMMAND_GPRS_ATTACH), 1), waitResponse(10000L) == 0) &&						//AT+CGATT=1
 
-		(sendFormatAT(TO_F(AT_COMMAND_SET_BEARER_SETTING), 0, 1), waitResponse(65000L) != -1) &&			//AT+SAPBR=0,1
-		(sendAT(TO_F(AT_COMMAND_SET_BEARER_SETTING_CONTYPE_GPRS)), waitResponse() == 0) && 					//AT+SAPBR=3,1,"CONTYPE","GPRS"
+		(setBearerSetting(TO_F(AT_COMMAND_PARAMETER_BEARER_CONTYPE), gprsToken)) &&							//AT+SAPBR=3,1,"CONTYPE","GPRS"
+
+		(setBearerSetting(TO_F(AT_COMMAND_PARAMETER_BEARER_APN), apn)) &&									//AT+SAPBR=3,1,"APN","xxx"
+		(user == NULL || setBearerSetting(TO_F(AT_COMMAND_PARAMETER_BEARER_USER), user)) &&					//AT+SAPBR=3,1,"USER","xxx"
+		(password == NULL || setBearerSetting(TO_F(AT_COMMAND_PARAMETER_BEARER_PWD), password)) &&			//AT+SAPBR=3,1,"PWD","xxx"
 
-		(sendFormatAT(TO_F(AT_COMMAND_GPRS_START_TASK), apn, user, password), waitResponse() == 0) &&		//AT+CSTT="apn","user","password"
 		(sendFormatAT(TO_F(AT_COMMAND_SET_BEARER_SETTING), 1, 1), waitResponse(65000L) == 0);				//AT+SAPBR=1,1
 }
 

src/SIM808.h

@@ -46,6 +46,10 @@ class SIM808 : public SIMComAT
 	 * Terminate the HTTP service.
 	 */
 	bool httpEnd();
+	/**
+	 * Set one of the bearer settings for application based on IP.
+	 */
+	bool setBearerSetting(ATConstStr parameter, const char* value);
 
 public:
 	SIM808(uint8_t resetPin, uint8_t pwrKeyPin, uint8_t statusPin);