Merge branch 'master' into hw_serial_cdc_as_component_example

Author: SuGlider

libraries/FFat/src/FFat.cpp

@@ -152,13 +152,4 @@ size_t F_Fat::freeBytes() {
   return free_sect * sect_size;
 }
 
-bool F_Fat::exists(const char *path) {
-  File f = open(path, "r", false);
-  return (f == true) && !f.isDirectory();
-}
-
-bool F_Fat::exists(const String &path) {
-  return exists(path.c_str());
-}
-
 F_Fat FFat = F_Fat(FSImplPtr(new VFSImpl()));

libraries/FFat/src/FFat.h

@@ -32,8 +32,6 @@ class F_Fat : public FS {
   size_t usedBytes();
   size_t freeBytes();
   void end();
-  bool exists(const char *path);
-  bool exists(const String &path);
 
 private:
   wl_handle_t _wl_handle = WL_INVALID_HANDLE;

libraries/LittleFS/src/LittleFS.cpp

@@ -33,16 +33,10 @@ class LittleFSImpl : public VFSImpl {
 public:
   LittleFSImpl();
   virtual ~LittleFSImpl() {}
-  virtual bool exists(const char *path);
 };
 
 LittleFSImpl::LittleFSImpl() {}
 
-bool LittleFSImpl::exists(const char *path) {
-  File f = open(path, "r", false);
-  return (f == true);
-}
-
 LittleFSFS::LittleFSFS() : FS(FSImplPtr(new LittleFSImpl())), partitionLabel_(NULL) {}
 
 LittleFSFS::~LittleFSFS() {

libraries/PPP/src/PPP.cpp

@@ -324,8 +324,17 @@ bool PPPClass::begin(ppp_modem_model_t model, uint8_t uart_num, int baud_rate) {
   } else {
     // try to communicate with the modem
     if (esp_modem_sync(_dce) != ESP_OK) {
-      log_v("Modem does not respond to AT, maybe in DATA mode? ...exiting network mode");
+      log_v("Modem does not respond to AT! Switching to COMMAND mode.");
       esp_modem_set_mode(_dce, ESP_MODEM_MODE_COMMAND);
+      if (esp_modem_sync(_dce) != ESP_OK) {
+        log_v("Modem does not respond to AT! Switching to CMUX mode.");
+        if (esp_modem_set_mode(_dce, ESP_MODEM_MODE_CMUX) != ESP_OK) {
+          log_v("Modem failed to switch to CMUX mode!");
+        } else {
+          log_v("Switching back to COMMAND mode");
+          esp_modem_set_mode(_dce, ESP_MODEM_MODE_COMMAND);
+        }
+      }
       if (esp_modem_sync(_dce) != ESP_OK) {
         log_e("Modem failed to respond to AT!");
         goto err;