add msc host setWriteCompleteCallback()

Author: hathach

examples/DualRole/msc_data_logger/msc_data_logger.ino

@@ -40,7 +40,7 @@
 #define HOST_PIN_VBUS_EN_STATE  1
 
 
-#define LOG_FILE        "cpu_temp.txt"
+#define LOG_FILE        "cpu_temp.csv"
 #define LOG_INTERVAL    5000
 
 // USB Host object
@@ -62,7 +62,7 @@ volatile bool is_mounted = false;
 
 void setup()
 {
-  Serial1.begin(115200);
+  pinMode(LED_BUILTIN, OUTPUT);
 
   Serial.begin(115200);
   //while ( !Serial ) delay(10);   // wait for native usb
@@ -72,17 +72,25 @@ void setup()
 
 void loop()
 {
-  // nothing to do
-  if (!is_mounted) return;
+  if (!is_mounted) {
+    // nothing to do
+    delay(1000);
+    return;
+  }
+
+  // Turn on LED when start writing
+  digitalWrite(LED_BUILTIN, HIGH);
 
   f_log = fatfs.open(LOG_FILE, O_WRITE | O_APPEND | O_CREAT);
 
   if (!f_log) {
     Serial.println("Cannot create file: " LOG_FILE);
   }else {
     float cpu_temp = analogReadTemp();
+    uint32_t ms = millis();
 
-    f_log.printf("%u\t%.02f\r\n", millis(), cpu_temp);
+    Serial.printf("%u,%.02f\r\n", millis(), cpu_temp);
+    f_log.printf("%u,%.02f\r\n", millis(), cpu_temp);
 
     f_log.close();
   }
@@ -157,6 +165,8 @@ void tuh_msc_mount_cb(uint8_t dev_addr)
   // For simplicity this example only support LUN 0
   msc_block_dev.setActiveLUN(0);
 
+  msc_block_dev.setWriteCompleteCallback(write_complete_callback);
+
   is_mounted = fatfs.begin(&msc_block_dev);
 
   if (is_mounted) {
@@ -179,3 +189,17 @@ void tuh_msc_umount_cb(uint8_t dev_addr)
   msc_block_dev.end();
 }
 
+
+bool write_complete_callback(uint8_t dev_addr, tuh_msc_complete_data_t const* cb_data)
+{
+  (void) dev_addr;
+  (void) cb_data;
+
+  // turn off LED after write is complete
+  // Note this only marks the usb transfer is complete, device can take longer to actual
+  // write data to physical flash
+  digitalWrite(LED_BUILTIN, LOW);
+
+  return true;
+}
+

examples/DualRole/msc_file_explorer/msc_file_explorer.ino

@@ -55,8 +55,6 @@ bool is_mounted = false;
 
 void setup()
 {
-  Serial1.begin(115200);
-
   Serial.begin(115200);
   //while ( !Serial ) delay(10);   // wait for native usb
 

src/arduino/msc/Adafruit_USBH_MSC.cpp

@@ -34,6 +34,7 @@
 Adafruit_USBH_MSC_BlockDevice::Adafruit_USBH_MSC_BlockDevice() {
   _daddr = _lun = 0;
   _busy = false;
+  _wr_cb = NULL;
 }
 
 bool Adafruit_USBH_MSC_BlockDevice::begin(uint8_t dev_addr) {
@@ -45,6 +46,9 @@ bool Adafruit_USBH_MSC_BlockDevice::setActiveLUN(uint8_t lun) {
   _lun = lun;
   return true;
 }
+void Adafruit_USBH_MSC_BlockDevice::setWriteCompleteCallback(tuh_msc_complete_cb_t cb) {
+  _wr_cb = cb;
+}
 
 void Adafruit_USBH_MSC_BlockDevice::end(void) { _daddr = _lun = 0; }
 
@@ -70,6 +74,15 @@ bool Adafruit_USBH_MSC_BlockDevice::_io_complete_cb(
 
   // TODO skip csw status: assuming io is successful
   _busy = false;
+
+  switch(cb_data->cbw->command[0]) {
+    case SCSI_CMD_WRITE_10:
+      if (_wr_cb) {
+        _wr_cb(dev_addr, cb_data);
+      }
+    break;
+  }
+
   return true;
 }
 

src/arduino/msc/Adafruit_USBH_MSC.h

@@ -39,10 +39,11 @@ class Adafruit_USBH_MSC_BlockDevice : public FsBlockDeviceInterface {
   bool begin(uint8_t dev_addr);
   void end(void);
 
+  bool mounted(void);
+
   // Set active LUN
   bool setActiveLUN(uint8_t lun);
-
-  bool mounted(void);
+  void setWriteCompleteCallback(tuh_msc_complete_cb_t cb);
 
   //------------- SdFat v2 FsBlockDeviceInterface API -------------//
   virtual bool isBusy();
@@ -66,6 +67,8 @@ class Adafruit_USBH_MSC_BlockDevice : public FsBlockDeviceInterface {
   // implementation
   volatile bool _busy;
 
+  tuh_msc_complete_cb_t _wr_cb;
+
   bool wait_for_io(void);
 };