Merge pull request #21 from mondalaci/fix-ringbuffer-example

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

diff --git a/Projects/LEDNotifier/LEDNotifier.c b/Projects/LEDNotifier/LEDNotifier.c
index 886bf53..0745576 100644 (file)
--- a/Projects/LEDNotifier/LEDNotifier.c
+++ b/Projects/LEDNotifier/LEDNotifier.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2013.
+     Copyright (C) Dean Camera, 2014.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2014  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -44,7 +44,7 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
        {
                .Config =
                        {
        {
                .Config =
                        {

-                               .ControlInterfaceNumber   = 0,
+                               .ControlInterfaceNumber   = INTERFACE_ID_CDC_CCI,

                                .DataINEndpoint           =
                                        {
                                                .Address          = CDC_TX_EPADDR,
                                .DataINEndpoint           =
                                        {
                                                .Address          = CDC_TX_EPADDR,


@@ -66,20 +66,20 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
                        },
        };
 
                        },
        };
 

-/** Counter for the software PWM */
+/** Counter for the software PWM. */

 static volatile uint8_t SoftPWM_Count;
 
 static volatile uint8_t SoftPWM_Count;
 

-/** Duty cycle for the first software PWM channel */
+/** Duty cycle for the first software PWM channel. */

 static volatile uint8_t SoftPWM_Channel1_Duty;
 
 static volatile uint8_t SoftPWM_Channel1_Duty;
 

-/** Duty cycle for the second software PWM channel */
+/** Duty cycle for the second software PWM channel. */

 static volatile uint8_t SoftPWM_Channel2_Duty;
 
 static volatile uint8_t SoftPWM_Channel2_Duty;
 

-/** Duty cycle for the third software PWM channel */
+/** Duty cycle for the third software PWM channel. */

 static volatile uint8_t SoftPWM_Channel3_Duty;
 
 /** Standard file stream for the CDC interface when set up, so that the virtual CDC COM port can be
 static volatile uint8_t SoftPWM_Channel3_Duty;
 
 /** Standard file stream for the CDC interface when set up, so that the virtual CDC COM port can be

- *  used like any regular character stream in the C APIs
+ *  used like any regular character stream in the C APIs.

  */
 static FILE USBSerialStream;
 
  */
 static FILE USBSerialStream;
 


@@ -142,12 +142,14 @@ int main(void)
 /** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware(void)
 {
 /** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware(void)
 {

+#if (ARCH == ARCH_AVR8)

        /* Disable watchdog if enabled by bootloader/fuses */
        MCUSR &= ~(1 << WDRF);
        wdt_disable();
 
        /* Disable clock division */
        clock_prescale_set(clock_div_1);
        /* Disable watchdog if enabled by bootloader/fuses */
        MCUSR &= ~(1 << WDRF);
        wdt_disable();
 
        /* Disable clock division */
        clock_prescale_set(clock_div_1);

+#endif

 
        /* Hardware Initialization */
        LEDs_Init();
 
        /* Hardware Initialization */
        LEDs_Init();