Add main functions to handle ftp actions

Author: carrascoacd

Http.cpp

@@ -108,8 +108,8 @@ Result HTTP::connect() {
     }
   }
 
-  if (sendCmdAndWaitForResp(HTTP_INIT, OK, 2000) == FALSE)
-    result = ERROR_HTTP_INIT;
+  //if (sendCmdAndWaitForResp(HTTP_INIT, OK, 2000) == FALSE)
+  //  result = ERROR_HTTP_INIT;
 
   return result;
 }
@@ -168,6 +168,58 @@ Result HTTP::get(const char *uri, char *response) {
   return result;
 }
 
+Result HTTP::putBegin(const char *fileName, 
+                      const char *server, 
+                      const char *usr, 
+                      const char *pass,
+                      const char *path){
+  Result result;
+
+  char buffer[64];
+
+  sendCmdAndWaitForResp("AT+FTPCID=1\r\n", OK, 2000);
+
+  sprintf(buffer, "AT+FTPSERV=\"%s\"\r\n", server);
+  sendCmdAndWaitForResp(buffer, OK, 2000);
+
+  //sendCmdAndWaitForResp("AT+FTPPORT=21\r\n", OK, 2000);
+  //sendCmdAndWaitForResp("AT+FTPSSL=2\r\n", OK, 2000);
+
+  sprintf(buffer, "AT+FTPUN=\"%s\"\r\n", usr);
+  sendCmdAndWaitForResp(buffer, OK, 20000);
+
+  sprintf(buffer, "AT+FTPPW=\"%s\"\r\n", pass);
+  sendCmdAndWaitForResp(buffer, OK, 20000);
+  
+  sprintf(buffer, "AT+FTPPUTNAME=\"%s\"\r\n", fileName);
+  sendCmdAndWaitForResp(buffer, OK, 20000);
+
+  sprintf(buffer, "AT+FTPPUTPATH=\"%s\"\r\n", path);
+  sendCmdAndWaitForResp(buffer, OK, 20000);
+  sendCmdAndWaitForResp("AT+FTPPUT=1\r\n", "1,1", 20000);
+
+  return result;
+}
+
+Result HTTP::putWrite(const char *data, unsigned int size){
+  Result result;
+
+  char ftpUpload[32];
+  sprintf(ftpUpload, "AT+FTPPUT=2,%d\r\n", size);
+  sendCmdAndWaitForResp(ftpUpload, "+FTPPUT: 2", 20000);
+
+  write(data, size);
+  waitForResp("1,1", 20000);
+  return result;
+}
+
+Result HTTP::putEnd(){
+  Result result;
+  serialSIM800.flush();
+  sendCmdAndWaitForResp("AT+FTPPUT=2,0\r\n", "1,0", 20000);
+  return result;
+}
+
 void HTTP::sleep(bool force){
   if (force){
     sendCmdAndWaitForResp(SLEEP_MODE_1, OK, 2000);

Http.h

@@ -64,6 +64,13 @@ class HTTP : public SIM800 {
     Result disconnect();
     Result get(const char *uri, char *response);
     Result post(const char *uri, const char *body, char *response);
+    Result putBegin(const char *fileName, 
+                      const char *server, 
+                      const char *usr, 
+                      const char *pass,
+                      const char *path = "/");
+    Result putWrite(const char *data, unsigned int size);
+    Result putEnd();
     void sleep(bool force = FALSE);
     void wakeUp();
     unsigned int readVoltage();

Sim800.cpp

@@ -88,7 +88,7 @@ void SIM800::sendCmd(const char* cmd)
     serialSIM800.listen();
     serialSIM800.flush();
     delay(500);
-    serialSIM800.write(cmd);
+    write(cmd);
     serialSIM800.flush();
 }
 
@@ -151,4 +151,16 @@ void SIM800::serialDebug(void)
 void SIM800::purgeSerial()
 {
   while (serialSIM800.available()) serialSIM800.read();
+}
+
+void SIM800::write(const char* data)
+{
+    serialSIM800.listen();
+    serialSIM800.write(data);
+}
+
+void SIM800::write(const char* data, unsigned int size)
+{
+    serialSIM800.listen();
+    serialSIM800.write(data, size);
 }

Sim800.h

@@ -121,7 +121,10 @@ class SIM800
 
     void purgeSerial();
 
-private:
+    void write(const char* data);
+    void write(const char* data, unsigned int size);
+
+protected:
 
     SoftwareSerial serialSIM800;
     bool debugMode;