The incomplete StandaloneProgrammer project now uses Host and Device Mass storage classes, so that program data can either be loaded onto the device's Dataflash storage, or read off an attached USB memory stick.

The USB target family and allowable USB mode tokens are now public and documented (USB_CAN_BE_*, USB_SERIES_*_AVR).

The SCSI_Request_Sense_Response_t and SCSI_Inquiry_Response_t type defines are now part of the Mass Storage Class driver common defines, rather than being defined in the Host mode Class driver section only.

The USB_MODE_HOST token is now defined even when host mode is not available.

Added missing CDC_Host_CreateBlockingStream() function code to the CDC Host Class driver.

1 files changed, 8 insertions, 8 deletions

diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c b/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c
index 2f3d95ba6..e8ee8e37c 100644
--- a/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c
+++ b/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c
@@ -44,7 +44,7 @@ bool ProgrammerConfig_ProcessConfiguration(void)
 

 	if (!(pf_open("CONF.txt") == FR_OK))

 	{

-		fputs(" >> ERROR: CONF.txt File Not Found.\r\n", &USBSerialStream);

+		puts(" >> ERROR: CONF.txt File Not Found.\r\n");

 		return false;

 	}

 	

@@ -53,7 +53,7 @@ bool ProgrammerConfig_ProcessConfiguration(void)
 			

 	do

 	{

-		CurrentLine = fgets(LineBuff, sizeof(LineBuff), &DataflashStream);

+		CurrentLine = fgets(LineBuff, sizeof(LineBuff), &DiskStream);

 		

 		if (CurrentLine)

 		{

@@ -66,12 +66,12 @@ bool ProgrammerConfig_ProcessConfiguration(void)
 		}

 	} while (CurrentLine);

 	

-	fprintf(&USBSerialStream, " >> *** Configuration: ***\r\n");

-	fprintf(&USBSerialStream, " >> Device Signature: 0x%02x 0x%02x 0x%02x 0x%02x\r\n", ProgrammerConfig.SigBytes[0],

-			                                                                           ProgrammerConfig.SigBytes[1],

-			                                                                           ProgrammerConfig.SigBytes[2],

-			                                                                           ProgrammerConfig.SigBytes[3]);

-	fprintf(&USBSerialStream, " >> Programming Speed: %lu Hz\r\n", ProgrammerConfig.ProgrammingSpeed);

+	printf(" >> *** Configuration: ***\r\n");

+	printf(" >> Device Signature: 0x%02x 0x%02x 0x%02x 0x%02x\r\n", ProgrammerConfig.SigBytes[0],

+			                                                        ProgrammerConfig.SigBytes[1],

+			                                                        ProgrammerConfig.SigBytes[2],

+			                                                        ProgrammerConfig.SigBytes[3]);

+	printf(" >> Programming Speed: %lu Hz\r\n", ProgrammerConfig.ProgrammingSpeed);

 	

 	return true;

 }