Converted Host mode demos to schedulerless. Fixed host mode broken due to earlier...

[pub/USBasp.git] / Demos / Host / LowLevel / StillImageHost / StillImageHost.h

diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.h b/Demos/Host/LowLevel/StillImageHost/StillImageHost.h
index b563767..1896b8f 100644 (file)
--- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.h
+++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.h
@@ -47,29 +47,31 @@
                #include "Lib/PIMACodes.h"\r
                #include "Lib/StillImageCommands.h"\r
 \r
                #include "Lib/PIMACodes.h"\r
                #include "Lib/StillImageCommands.h"\r
 \r

-               #include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes\r
-               #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r
-               #include <LUFA/Drivers/Peripheral/SerialStream.h>        // Serial stream driver\r
-               #include <LUFA/Drivers/Board/LEDs.h>                     // LED driver\r
-               #include <LUFA/Scheduler/Scheduler.h>                    // Simple scheduler for task management\r
+               #include <LUFA/Drivers/Misc/TerminalCodes.h>\r
+               #include <LUFA/Drivers/USB/USB.h>\r
+               #include <LUFA/Drivers/Peripheral/SerialStream.h>\r
+               #include <LUFA/Drivers/Board/LEDs.h>\r
+               \r
+       /* Macros: */\r
+               /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
+               #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
+\r
+               /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */\r
+               #define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)\r

 \r
 \r

-       /* Enums: */\r
-               /** Enum for the possible status codes for passing to the UpdateStatus() function. */\r
-               enum StillImageHost_StatusCodes_t\r
-               {\r
-                       Status_USBNotReady      = 0, /**< USB is not ready (disconnected from a USB device) */\r
-                       Status_USBEnumerating   = 1, /**< USB interface is enumerating */\r
-                       Status_USBReady         = 2, /**< USB interface is connected and ready */\r
-                       Status_EnumerationError = 3, /**< Software error while enumerating the attached USB device */\r
-                       Status_HardwareError    = 4, /**< Hardware error while enumerating the attached USB device */\r
-                       Status_Busy             = 5, /**< Busy reading or writing to the attached Still Image device */\r
-                       Status_PIMACommandError = 6, /**< Error while sending or receiving a PIM command to the attached device */\r
-               };\r
+               /** LED mask for the library LED driver, to indicate that the USB interface is ready. */\r
+               #define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)\r

 \r
 \r

-       /* Task Definitions: */\r
-               TASK(USB_SImage_Host);\r
+               /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
+               #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r

 \r
 \r

+               /** LED mask for the library LED driver, to indicate that the USB interface is busy. */\r
+               #define LEDMASK_USB_BUSY         (LEDS_LED2)\r
+               \r

        /* Function Prototypes: */\r
        /* Function Prototypes: */\r

+               void StillImage_Task(void);\r
+               void SetupHardware(void);\r
+       \r

                void EVENT_USB_HostError(const uint8_t ErrorCode);\r
                void EVENT_USB_DeviceAttached(void);\r
                void EVENT_USB_DeviceUnattached(void);\r
                void EVENT_USB_HostError(const uint8_t ErrorCode);\r
                void EVENT_USB_DeviceAttached(void);\r
                void EVENT_USB_DeviceUnattached(void);\r


@@ -78,6 +80,5 @@
 \r
                void UnicodeToASCII(uint8_t* restrict UnicodeString, char* restrict Buffer);\r
                void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError);\r
 \r
                void UnicodeToASCII(uint8_t* restrict UnicodeString, char* restrict Buffer);\r
                void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError);\r

-               void UpdateStatus(uint8_t CurrentStatus);\r

                \r
 #endif\r
                \r
 #endif\r