Heaters PID enabled per configuration. USB reinitialized. new HW handling with error report

2 files changed, 6 insertions, 21 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/Control_File_System.c b/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/Control_File_System.c
index ef842bf68..5b8bc40fd 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/Control_File_System.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/Control_File_System.c
@@ -118,11 +118,7 @@ FRESULT Init_Flash_File_System(bool Need_mkfs)
     }
 
     if(Need_mkfs == true)
-       iFResult = f_mkfs( 0, 0, 512 ); //Create File System on the Drive
-//        if(iFResult != FR_OK)
-//        {
-//           while(1);
-//        }
+        iFResult = f_mkfs( 0, 0, 512 ); //Create File System on the Drive
 
     return iFResult;
 }
@@ -207,17 +203,6 @@ int FFS_Directory()
     {
         return(fresult);
     }
-
-//    //
-//    // Close the current directory
-//    //
-//    fresult |= f_closedir(&g_sDirObject);
-//    if(fresult != FR_OK)
-//    {
-//        return(fresult);
-//    }
-
-
     return 0;
 }
 
diff --git a/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c b/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c
index 0d42057b8..76592f0d5 100644
--- a/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c
+++ b/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c
@@ -770,21 +770,21 @@ void USBCDCD_init(void)
 void USBCDCD_Reinit(void)
 {
 
-    //USBDCDCTerm(USBDComposite);
+    USBDCDCTerm(USBDComposite);
     /* State specific variables */
-    //state = USBCDCD_STATE_UNCONFIGURED;
+    state = USBCDCD_STATE_UNCONFIGURED;
 
     /* Set the USB stack mode to Device mode with VBUS monitoring */
-    //USBStackModeSet(0, eUSBModeForceDevice, 0);
+    USBStackModeSet(0, eUSBModeForceDevice, 0);
 
     USBBufferInit(&txBuffer);
     USBBufferInit(&rxBuffer);
 
-    /*USBDComposite = USBDCDCInit(0, &g_sCDCDevice);
+    USBDComposite = USBDCDCInit(0, &g_sCDCDevice);
     if (!USBDComposite)
     {
         System_abort("Error initializing the serial device");
-    }*/
+    }
 
 }