1 files changed, 29 insertions, 81 deletions

diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
index 197e832f6..318e25731 100644
--- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
+++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
@@ -36,19 +36,28 @@
 

 #include "StillImageHost.h"

 

-/* Scheduler Task List */

-TASK_LIST

-{

-	{ .Task = USB_USBTask          , .TaskStatus = TASK_STOP },

-	{ .Task = USB_SImage_Host      , .TaskStatus = TASK_STOP },

-};

-

-

 /** Main program entry point. This routine configures the hardware required by the application, then

  *  starts the scheduler to run the application tasks.

  */

 int main(void)

 {

+	SetupHardware();

+

+	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY

+	       "Still Image Host Demo running.\r\n" ESC_INVERSE_OFF));

+

+	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

+

+	for (;;)

+	{

+		StillImage_Task();

+		USB_USBTask();

+	}

+}

+

+/** Configures the board hardware and chip peripherals for the demo's functionality. */

+void SetupHardware(void)

+{

 	/* Disable watchdog if enabled by bootloader/fuses */

 	MCUSR &= ~(1 << WDRF);

 	wdt_disable();

@@ -60,22 +69,7 @@ int main(void)
 	/* Hardware Initialization */

 	SerialStream_Init(9600, false);

 	LEDs_Init();

-	

-	/* Indicate USB not ready */

-	UpdateStatus(Status_USBNotReady);

-	

-	/* Initialize Scheduler so that it can be used */

-	Scheduler_Init();

-

-	/* Initialize USB Subsystem */

 	USB_Init();

-

-	/* Start-up message */

-	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY

-	       "Still Image Host Demo running.\r\n" ESC_INVERSE_OFF));

-		   

-	/* Scheduling - routine never returns, so put this last in the main function */

-	Scheduler_Start();

 }

 

 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and

@@ -84,10 +78,7 @@ int main(void)
 void EVENT_USB_DeviceAttached(void)

 {

 	puts_P(PSTR("Device Attached.\r\n"));

-	UpdateStatus(Status_USBEnumerating);

-	

-	/* Start USB management task to enumerate the device */

-	Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);

+	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

 /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and

@@ -95,12 +86,8 @@ void EVENT_USB_DeviceAttached(void)
  */

 void EVENT_USB_DeviceUnattached(void)

 {

-	/* Stop USB management and Still Image tasks */

-	Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);

-	Scheduler_SetTaskMode(USB_SImage_Host, TASK_STOP);

-

 	puts_P(PSTR("\r\nDevice Unattached.\r\n"));

-	UpdateStatus(Status_USBNotReady);

+	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

 /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully

@@ -108,11 +95,7 @@ void EVENT_USB_DeviceUnattached(void)
  */

 void EVENT_USB_DeviceEnumerationComplete(void)

 {

-	/* Once device is fully enumerated, start the Still Image Host task */

-	Scheduler_SetTaskMode(USB_SImage_Host, TASK_RUN);

-

-	/* Indicate device enumeration complete */

-	UpdateStatus(Status_USBReady);

+	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 }

 

 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */

@@ -123,7 +106,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 	puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));

 	printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);

 

-	UpdateStatus(Status_HardwareError);

+	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 	for(;;);

 }

 

@@ -137,13 +120,13 @@ void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t Su
 	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);

 	printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);

 	

-	UpdateStatus(Status_EnumerationError);

+	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

 

 /** Task to set the configuration of the attached device after it has been enumerated, and to print device information

  *  through the serial port.

  */

-TASK(USB_SImage_Host)

+void StillImage_Task(void)

 {

 	uint8_t ErrorCode;

 

@@ -169,7 +152,7 @@ TASK(USB_SImage_Host)
 				puts_P(PSTR("Control error.\r\n"));

 

 				/* Indicate error via status LEDs */

-				UpdateStatus(Status_EnumerationError);

+				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 

 				/* Wait until USB device disconnected */

 				while (USB_IsConnected);

@@ -192,7 +175,7 @@ TASK(USB_SImage_Host)
 				printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);

 				

 				/* Indicate error via status LEDs */

-				UpdateStatus(Status_EnumerationError);

+				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 

 				/* Wait until USB device disconnected */

 				while (USB_IsConnected);

@@ -205,8 +188,8 @@ TASK(USB_SImage_Host)
 			break;

 		case HOST_STATE_Ready:

 			/* Indicate device busy via the status LEDs */

-			UpdateStatus(Status_Busy);

-

+			LEDs_SetAllLEDs(LEDMASK_USB_BUSY);

+			

 			puts_P(PSTR("Retrieving Device Info...\r\n"));

 			

 			PIMA_SendBlock = (PIMA_Container_t)

@@ -345,7 +328,7 @@ TASK(USB_SImage_Host)
 			puts_P(PSTR("Done.\r\n"));

 

 			/* Indicate device no longer busy */

-			UpdateStatus(Status_USBReady);

+			LEDs_SetAllLEDs(LEDMASK_USB_READY);

 			

 			/* Wait until USB device disconnected */

 			while (USB_IsConnected);

@@ -379,41 +362,6 @@ void UnicodeToASCII(uint8_t* UnicodeString, char* Buffer)
 	*Buffer = 0;

 }

 

-/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to

- *  log to a serial port, or anything else that is suitable for status updates.

- *

- *  \param CurrentStatus  Current status of the system, from the StillImageHost_StatusCodes_t enum

- */

-void UpdateStatus(uint8_t CurrentStatus)

-{

-	uint8_t LEDMask = LEDS_NO_LEDS;

-	

-	/* Set the LED mask to the appropriate LED mask based on the given status code */

-	switch (CurrentStatus)

-	{

-		case Status_USBNotReady:

-			LEDMask = (LEDS_LED1);

-			break;

-		case Status_USBEnumerating:

-			LEDMask = (LEDS_LED1 | LEDS_LED2);

-			break;

-		case Status_USBReady:

-			LEDMask = (LEDS_LED2);

-			break;

-		case Status_EnumerationError:

-		case Status_HardwareError:

-		case Status_PIMACommandError:

-			LEDMask = (LEDS_LED1 | LEDS_LED3);

-			break;

-		case Status_Busy:

-			LEDMask = (LEDS_LED1 | LEDS_LED3 | LEDS_LED4);

-			break;

-	}

-	

-	/* Set the board LEDs to the new LED mask */

-	LEDs_SetAllLEDs(LEDMask);

-}

-

 /** Displays a PIMA command error via the device's serial port.

  *

  *  \param ErrorCode          Error code of the function which failed to complete successfully

@@ -427,7 +375,7 @@ void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError)
 	printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);

 			

 	/* Indicate error via status LEDs */

-	UpdateStatus(Status_PIMACommandError);

+	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 				

 	/* Wait until USB device disconnected */

 	while (USB_IsConnected);