#include "MissileLauncher.h"\r
\r
/** Launcher first init command report data sequence */\r
-static const uint8_t CMD_INITA[8] = { 85, 83, 66, 67, 0, 0, 4, 0 };\r
+uint8_t CMD_INITA[8] = { 85, 83, 66, 67, 0, 0, 4, 0 };\r
\r
/** Launcher second init command report data sequence */\r
-static const uint8_t CMD_INITB[8] = { 85, 83, 66, 67, 0, 64, 2, 0 };\r
+uint8_t CMD_INITB[8] = { 85, 83, 66, 67, 0, 64, 2, 0 };\r
\r
/** Launcher command report data sequence to stop all movement */\r
-static const uint8_t CMD_STOP[8] = { 0, 0, 0, 0, 0, 0, 8, 8 };\r
+uint8_t CMD_STOP[8] = { 0, 0, 0, 0, 0, 0, 8, 8 };\r
\r
/** Launcher command report data sequence to move left */\r
-static const uint8_t CMD_LEFT[8] = { 0, 1, 0, 0, 0, 0, 8, 8 };\r
+uint8_t CMD_LEFT[8] = { 0, 1, 0, 0, 0, 0, 8, 8 };\r
\r
/** Launcher command report data sequence to move right */\r
-static const uint8_t CMD_RIGHT[8] = { 0, 0, 1, 0, 0, 0, 8, 8 };\r
+uint8_t CMD_RIGHT[8] = { 0, 0, 1, 0, 0, 0, 8, 8 };\r
\r
/** Launcher command report data sequence to move up */\r
-static const uint8_t CMD_UP[8] = { 0, 0, 0, 1, 0, 0, 8, 8 };\r
+uint8_t CMD_UP[8] = { 0, 0, 0, 1, 0, 0, 8, 8 };\r
\r
/** Launcher command report data sequence to move down */\r
-static const uint8_t CMD_DOWN[8] = { 0, 0, 0, 0, 1, 0, 8, 8 };\r
+uint8_t CMD_DOWN[8] = { 0, 0, 0, 0, 1, 0, 8, 8 };\r
\r
/** Launcher command report data sequence to move left and up */\r
-static const uint8_t CMD_LEFTUP[8] = { 0, 1, 0, 1, 0, 0, 8, 8 };\r
+uint8_t CMD_LEFTUP[8] = { 0, 1, 0, 1, 0, 0, 8, 8 };\r
\r
/** Launcher command report data sequence to move right and up */\r
-static const uint8_t CMD_RIGHTUP[8] = { 0, 0, 1, 1, 0, 0, 8, 8 };\r
+uint8_t CMD_RIGHTUP[8] = { 0, 0, 1, 1, 0, 0, 8, 8 };\r
\r
/** Launcher command report data sequence to move left and down */\r
-static const uint8_t CMD_LEFTDOWN[8] = { 0, 1, 0, 0, 1, 0, 8, 8 };\r
+uint8_t CMD_LEFTDOWN[8] = { 0, 1, 0, 0, 1, 0, 8, 8 };\r
\r
/** Launcher command report data sequence to move right and down */\r
-static const uint8_t CMD_RIGHTDOWN[8] = { 0, 0, 1, 0, 1, 0, 8, 8 };\r
+uint8_t CMD_RIGHTDOWN[8] = { 0, 0, 1, 0, 1, 0, 8, 8 };\r
\r
/** Launcher command report data sequence to fire a missile */\r
-static const uint8_t CMD_FIRE[8] = { 0, 0, 0, 0, 0, 1, 8, 8 };\r
+uint8_t CMD_FIRE[8] = { 0, 0, 0, 0, 0, 1, 8, 8 };\r
\r
/** Last command sent to the launcher, to determine what new command (if any) must be sent */\r
uint8_t* CmdState;\r
void Read_Joystick_Status(void)\r
{\r
uint8_t JoyStatus_LCL = Joystick_GetStatus();\r
+ uint8_t Buttons_LCL = Buttons_GetStatus();\r
\r
- if (BUTTONS_BUTTON1 && Buttons_GetStatus())\r
+ if (Buttons_LCL & BUTTONS_BUTTON1)\r
Send_Command(CMD_FIRE);\r
else if (JoyStatus_LCL & JOY_UP)\r
Send_Command(CMD_UP);\r
\r
/** Lower level send routine, copies report into a larger buffer and sends.\r
*\r
- * \param Report Report data to send.\r
- * \param ReportSize Report length in bytes.\r
+ * \param[in] Report Report data to send.\r
+ * \param[in] ReportSize Report length in bytes.\r
*/\r
void Send_Command_Report(uint8_t *Report, uint16_t ReportSize)\r
{\r
WriteNextReport(CmdBuffer, ReportSize);\r
}\r
\r
-/** Send one of the CMD_* command constants listed above.\r
+/** Sends one of the CMD_* command constants to the attached device.\r
*\r
- * \param Command One of the command constants.\r
+ * \param[in] Command One of the command constants.\r
*/\r
void Send_Command(uint8_t* Command)\r
{\r
if ((CmdState == CMD_STOP && Command != CMD_STOP) ||\r
(CmdState != CMD_STOP && Command == CMD_STOP))\r
{\r
- LEDs_ChangeLEDs(LEDS_LED4, ~LEDs_GetLEDs() & LEDS_LED4);\r
+ LEDs_ToggleLEDs(LEDS_LED4);\r
\r
Send_Command_Report(CMD_INITA, 8);\r
Send_Command_Report(CMD_INITB, 8);\r
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and\r
* starts the library USB task to begin the enumeration and USB management process.\r
*/\r
-void EVENT_USB_DeviceAttached(void)\r
+void EVENT_USB_Host_DeviceAttached(void)\r
{\r
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
}\r
/** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and\r
* stops the library USB task management process.\r
*/\r
-void EVENT_USB_DeviceUnattached(void)\r
+void EVENT_USB_Host_DeviceUnattached(void)\r
{\r
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
}\r
/** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully\r
* enumerated by the host and is now ready to be used by the application.\r
*/\r
-void EVENT_USB_DeviceEnumerationComplete(void)\r
+void EVENT_USB_Host_DeviceEnumerationComplete(void)\r
{\r
LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
}\r
\r
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */\r
-void EVENT_USB_HostError(const uint8_t ErrorCode)\r
+void EVENT_USB_Host_HostError(const uint8_t ErrorCode)\r
{\r
USB_ShutDown();\r
\r
/** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while\r
* enumerating an attached USB device.\r
*/\r
-void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)\r
+void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)\r
{\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
}\r
\r
/** Writes a report to the attached device.\r
*\r
- * \param ReportOUTData Buffer containing the report to send to the device\r
- * \param ReportLength Length of the report to send\r
+ * \param[in] ReportOUTData Buffer containing the report to send to the device\r
+ * \param[in] ReportLength Length of the report to send\r
*/\r
void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength)\r
{\r
/* Class specific request to send a HID report to the device */\r
USB_ControlRequest = (USB_Request_Header_t)\r
{\r
- .bmRequestType = 0x21,\r
+ .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
.bRequest = 0x09,\r
.wValue = 0x02,\r
.wIndex = 0x01,\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
\r
/* Wait until USB device disconnected */\r
- while (USB_IsConnected);\r
+ USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
break;\r
}\r
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
\r
/* Wait until USB device disconnected */\r
- while (USB_IsConnected);\r
+ USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
break;\r
}\r
\r
USB_HostState = HOST_STATE_Configured;\r
break;\r
case HOST_STATE_Configured:\r
- USB_HostState = HOST_STATE_Ready;\r
- break;\r
- case HOST_STATE_Ready:\r
DiscardNextReport();\r
\r
break;\r
projects / pub / USBasp.git / blobdiff