Fixed swapped paremeters in the HID state memory copy call while processing a HID...

[pub/USBasp.git] / Projects / Benito / Benito.c

diff --git a/Projects/Benito/Benito.c b/Projects/Benito/Benito.c
index d7e0413..afe29b4 100644 (file)
--- a/Projects/Benito/Benito.c
+++ b/Projects/Benito/Benito.c
@@ -102,7 +102,7 @@ int main(void)
                        /* Check if the LEDs should be ping-ponging (during enumeration) */\r
                        if (PingPongMSRemaining && !(--PingPongMSRemaining))\r
                        {\r
                        /* Check if the LEDs should be ping-ponging (during enumeration) */\r
                        if (PingPongMSRemaining && !(--PingPongMSRemaining))\r
                        {\r

-                               LEDs_ToggleLEDs(LEDMASK_BUSY);\r
+                               LEDs_ToggleLEDs(LEDMASK_TX | LEDMASK_RX);\r

                                PingPongMSRemaining = PING_PONG_LED_PULSE_MS;\r
                        }\r
                \r
                                PingPongMSRemaining = PING_PONG_LED_PULSE_MS;\r
                        }\r
                \r


@@ -141,6 +141,7 @@ void SetupHardware(void)
        clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r

+       Serial_Init(9600, false);\r

        LEDs_Init();\r
        USB_Init();\r
 \r
        LEDs_Init();\r
        USB_Init();\r
 \r


@@ -165,17 +166,17 @@ void EVENT_USB_Device_Connect(void)
 void EVENT_USB_Device_Disconnect(void)\r
 {\r
        PingPongMSRemaining = 0;\r
 void EVENT_USB_Device_Disconnect(void)\r
 {\r
        PingPongMSRemaining = 0;\r

-       LEDs_TurnOffLEDs(LEDMASK_BUSY);\r
+       LEDs_SetAllLEDs(LEDS_NO_LEDS);\r

 }\r
 \r
 /** Event handler for the library USB Configuration Changed event. */\r
 void EVENT_USB_Device_ConfigurationChanged(void)\r
 {\r
        PingPongMSRemaining = 0;\r
 }\r
 \r
 /** Event handler for the library USB Configuration Changed event. */\r
 void EVENT_USB_Device_ConfigurationChanged(void)\r
 {\r
        PingPongMSRemaining = 0;\r

-       LEDs_TurnOffLEDs(LEDMASK_BUSY);\r
+       LEDs_SetAllLEDs(LEDS_NO_LEDS);\r

 \r
        if (!(CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface)))\r
 \r
        if (!(CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface)))\r

-         LEDs_TurnOnLEDs(LEDMASK_ERROR);\r
+         LEDs_SetAllLEDs(LEDMASK_ERROR);\r

 }\r
 \r
 /** Event handler for the library USB Unhandled Control Request event. */\r
 }\r
 \r
 /** Event handler for the library USB Unhandled Control Request event. */\r


@@ -233,9 +234,9 @@ void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const C
        /* Check if the DTR line has been asserted - if so, start the target AVR's reset pulse */\r
        if (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR)\r
        {\r
        /* Check if the DTR line has been asserted - if so, start the target AVR's reset pulse */\r
        if (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR)\r
        {\r

-               LEDs_TurnOnLEDs(LEDMASK_BUSY);\r
+               LEDs_SetAllLEDs(LEDMASK_BUSY);\r

        \r
        \r

-               AVR_RESET_LINE_DDR |= AVR_RESET_LINE_MASK;\r
-               ResetPulseMSRemaining = AVR_RESET_PULSE_MS;\r
+               AVR_RESET_LINE_DDR    |= AVR_RESET_LINE_MASK;\r
+               ResetPulseMSRemaining  = AVR_RESET_PULSE_MS;\r

        }\r
 }\r
        }\r
 }\r