Move headers and update examples

Author: manchoz

examples/DirList/DirList.ino

@@ -0,0 +1,93 @@
+/*
+  Portenta - FileRead
+
+  The sketch shows how to mount an usb storage device and how to
+  read from an existing file.
+  to use this sketch create a .txt file named Arduino.txt,
+  in your storage device and write some content inside.
+  
+  The circuit:
+   - Portenta H7
+    
+  This example code is in the public domain.
+*/
+#include <DigitalOut.h>
+#include <FATFileSystem.h>
+#include <USBHostMbed5.h>
+
+USBHostMSD msd;
+mbed::FATFileSystem usb("usb");
+
+mbed::DigitalOut pin5(PC_6, 0);
+
+// If you are using a Portenta Machine Control uncomment the following line
+mbed::DigitalOut otg(PB_14, 0);
+
+#define BUFFER_MAX_LEN 64
+void setup()
+{
+    Serial.begin(115200);
+    while (!Serial)
+        ;
+
+    delay(2500);
+    Serial.println("Starting USB Dir List example...");
+
+    // if you are using a Max Carrier uncomment the following line
+    //start_hub();
+
+    while (!msd.connect()) {
+        //while (!port.connected()) {
+        delay(1000);
+    }
+
+    Serial.print("Mounting USB device... ");
+    int err = usb.mount(&msd);
+    if (err) {
+        Serial.print("Error mounting USB device ");
+        Serial.println(err);
+        while (1)
+            ;
+    }
+    Serial.println("done.");
+
+    char buf[256] {};
+    // Display the root directory
+    Serial.print("Opening the root directory... ");
+    DIR* d = opendir("/usb/");
+    Serial.println(!d ? "Fail :(" : "Done");
+    if (!d) {
+        snprintf(buf, sizeof(buf), "error: %s (%d)\r\n", strerror(errno), -errno);
+        Serial.print(buf);
+    }
+    Serial.println("done.");
+
+    Serial.println("Root directory:");
+    unsigned int count { 0 };
+    while (true) {
+        struct dirent* e = readdir(d);
+        if (!e) {
+            break;
+        }
+        count++;
+        snprintf(buf, sizeof(buf), "    %s\r\n", e->d_name);
+        Serial.print(buf);
+    }
+    Serial.print(count);
+    Serial.println(" files found!");
+
+    snprintf(buf, sizeof(buf), "Closing the root directory... ");
+    Serial.print(buf);
+    fflush(stdout);
+    err = closedir(d);
+    snprintf(buf, sizeof(buf), "%s\r\n", (err < 0 ? "Fail :(" : "OK"));
+    Serial.print(buf);
+    if (err < 0) {
+        snprintf(buf, sizeof(buf), "error: %s (%d)\r\n", strerror(errno), -errno);
+        Serial.print(buf);
+    }
+}
+
+void loop()
+{
+}

examples/FileRead/FileRead.ino

@@ -11,36 +11,35 @@
     
   This example code is in the public domain.
 */
-#include "USBHostMbed5.h"
-#include "USBHostMSD/USBHostMSD.h"
-#include "USBHostHub/USBHostHub.h"
-#include "USBHostSerial/USBHostSerial.h"
-#include "DigitalOut.h"
-#include "FATFileSystem.h"
+#include <USBHostMbed5.h>
+#include <DigitalOut.h>
+#include <FATFileSystem.h>
 
 USBHostMSD msd;
-mbed::FATFileSystem fs("fs");
+mbed::FATFileSystem usb("usb");
 
 mbed::DigitalOut pin5(PC_6, 0);
 
 // If you are using a Portenta Machine Control uncomment the following line
-//mbed::DigitalOut otg(PB_8, 1);
+mbed::DigitalOut otg(PB_14, 0);
 
 #define BUFFER_MAX_LEN 64
 void setup() {
   Serial.begin(115200);
   while (!Serial);
 
+  delay(2500);
+  Serial.println("Starting USB File Read example...");
+
   // if you are using a Max Carrier uncomment the following line
   //start_hub();
 
   while (!msd.connect()) {
-    //while (!port.connected()) {
     delay(1000);
   }
 
   Serial.println("Mounting USB device...");
-  int err =  fs.mount(&msd);
+  int err =  usb.mount(&msd);
   if (err) {
     Serial.print("Error mounting USB device ");
     Serial.println(err);
@@ -52,12 +51,12 @@ void setup() {
   int dirIndex = 0;
   int res = 0;
   Serial.println("Open file..");
-  FILE *f = fopen("/fs/Arduino.txt", "r+");
-  char buf[2];
-  Serial.println("File conntet:");
+  FILE *f = fopen("/usb/Arduino.txt", "r+");
+  char buf[256];
+  Serial.println("File content:");
 
-  while (fgets(buf, 2, f) != NULL) {
-    Serial.println(buf);
+  while (fgets(buf, 256, f) != NULL) {
+    Serial.print(buf);
   }
 
   Serial.println("File closing");
@@ -76,4 +75,4 @@ void setup() {
 
 void loop() {
 
-}
+}

examples/FileWrite/FileWrite.ino

@@ -1,14 +1,11 @@
-#include "USBHostMbed5.h"
-#include "USBHostMSD/USBHostMSD.h"
-#include "USBHostHub/USBHostHub.h"
-#include "USBHostSerial/USBHostSerial.h"
-#include "DigitalOut.h"
-#include "FATFileSystem.h"
+#include <USBHostMbed5.h>
+#include <DigitalOut.h>
+#include <FATFileSystem.h>
 
 USBHostMSD msd;
-mbed::FATFileSystem fs("fs");
+mbed::FATFileSystem usb("usb");
 
-mbed::DigitalOut pin5(PC_6, 0);
+// mbed::DigitalOut pin5(PC_6, 0);
 mbed::DigitalOut otg(PB_8, 1);
 
 void setup() {
@@ -22,7 +19,7 @@ void setup() {
   }
 
   Serial.println("Mounting USB device...");
-  int err =  fs.mount(&msd);
+  int err =  usb.mount(&msd);
   if (err) {
     Serial.print("Error mounting USB device ");
     Serial.println(err);
@@ -33,8 +30,8 @@ void setup() {
   struct dirent *ent;
   int dirIndex = 0;
   int res = 0;
-  Serial.println("Open /fs/numbers.txt");
-  FILE *f = fopen("/fs/numbers.txt", "w+");
+  Serial.println("Open /usb/numbers.txt");
+  FILE *f = fopen("/usb/numbers.txt", "w+");
   for (int i = 0; i < 10; i++) {
     Serial.print("Writing numbers (");
     Serial.print(i);

src/USBHostMbed5.h

@@ -0,0 +1,4 @@
+#pragma once
+#include "USBHostHub/USBHostHub.h"
+#include "USBHostMSD/USBHostMSD.h"
+#include "USBHostSerial/USBHostSerial.h"