Ftp

keywords.txt

@@ -9,6 +9,7 @@ NB	KEYWORD1
 NB_SMS	KEYWORD1
 GPRS	KEYWORD1
 NBClient	KEYWORD1
+NBFTP	KEYWORD1
 NBModem	KEYWORD1
 NBScanner	KEYWORD1
 NBPIN	KEYWORD1
@@ -46,6 +47,22 @@ hostByName	KEYWORD2
 getTime	KEYWORD2
 setTime	KEYWORD2
 getLocalTime	KEYWORD2
+configure	KEYWORD2
+configureIP	KEYWORD2
+configureHost	KEYWORD2
+configurePort	KEYWORD2
+configureUsername	KEYWORD2
+configurePassword	KEYWORD2
+configurePassive	KEYWORD2
+configureAccount	KEYWORD2
+configureAuth	KEYWORD2
+deleteFile	KEYWORD2
+renameFile	KEYWORD2
+getFile	KEYWORD2
+sendFile	KEYWORD2
+changeDir	KEYWORD2
+makeDir	KEYWORD2
+rmDir	KEYWORD2
 
 #######################################
 # Constants

src/MKRNB.h

@@ -24,6 +24,7 @@
 #include "NB_SMS.h"
 #include "GPRS.h"
 #include "NBClient.h"
+#include "NBFTP.h"
 #include "NBModem.h"
 #include "NBScanner.h"
 #include "NBPIN.h"

src/Modem.cpp

@@ -226,6 +226,15 @@ int ModemClass::ready()
   return _ready;
 }
 
+int ModemClass::read()
+{
+  if (_uart->available()) {
+    return _uart->read();
+  } else {
+    return -1;
+  }
+}
+
 void ModemClass::poll()
 {
   while (_uart->available()) {

src/Modem.h

@@ -56,6 +56,8 @@ class ModemClass {
   int waitForPrompt(unsigned long timeout = 500);
   int waitForResponse(unsigned long timeout = 200, String* responseDataStorage = NULL);
   int ready();
+
+  int read();
   void poll();
   void setResponseDataStorage(String* responseDataStorage);
 

src/NB.cpp

@@ -124,8 +124,9 @@ int NB::isAccessAlive()
 
 bool NB::shutdown()
 {
-  if (_state == NB_READY) {
+  if (_state == NB_READY || _state == ERROR) {
     MODEM.send("AT+CPWROFF");
+    // shouldn't this return false if nothing is returned?
     MODEM.waitForResponse(40000);
   }
   MODEM.end();
@@ -441,6 +442,16 @@ unsigned long NB::getTime()
 
   struct tm now;
 
+  time_t delta = ((response.charAt(26) - '0') * 10 + (response.charAt(27) - '0')) * (15 * 60);
+
+  if (response.charAt(25) == '-') {
+    delta = -delta;
+  } else if (response.charAt(25) == '+') {
+    delta = delta;
+  } else {
+    delta = 0;
+  }
+
   int dashIndex = response.lastIndexOf('-');
   if (dashIndex != -1) {
     response.remove(dashIndex);
@@ -450,15 +461,8 @@ unsigned long NB::getTime()
     // adjust for timezone offset which is +/- in 15 minute increments
 
     time_t result = mktime(&now);
-    time_t delta = ((response.charAt(26) - '0') * 10 + (response.charAt(27) - '0')) * (15 * 60);
 
-    if (response.charAt(25) == '-') {
-      result += delta;
-    } else if (response.charAt(25) == '+') {
-      result -= delta;
-    }
-
-    return result;
+    return result + delta;
   }
 
   return 0;