Fixed Benito and USBtoSerial projects not turning off the USART before reconfiguring...

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 69a712c..1a7303b 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -60,6 +60,8 @@
   *  - Fixed HID device class driver still using PrevReportINBuffer for GetReport control requests even when it has been
   *    set to NULL by the user application (thanks to Axel Rohde)
   *  - Fixed MIDI_Device_SendEventPacket() not correctly waiting for the endpoint to become ready (thanks to Robin Green)
   *  - Fixed HID device class driver still using PrevReportINBuffer for GetReport control requests even when it has been
   *    set to NULL by the user application (thanks to Axel Rohde)
   *  - Fixed MIDI_Device_SendEventPacket() not correctly waiting for the endpoint to become ready (thanks to Robin Green)

+  *  - Fixed Benito and USBtoSerial projects not turning off the USART before reconfiguring it, which could cause incorrect
+  *    operation to occur (thanks to Bob Paddock)

   *
   *  \section Sec_ChangeLog100513 Version 100513
   *  <b>New:</b>
   *
   *  \section Sec_ChangeLog100513 Version 100513
   *  <b>New:</b>

diff --git a/Projects/Benito/Benito.c b/Projects/Benito/Benito.c
index 71b187b..834554b 100644 (file)
--- a/Projects/Benito/Benito.c
+++ b/Projects/Benito/Benito.c
@@ -235,10 +235,18 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCI
                        break;
        }
        
                        break;
        }
        

-       UCSR1A = (1 << U2X1);
-       UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));
-       UCSR1C = ConfigMask;    
+       /* Must turn off USART before reconfiguring it, otherwise incorrect operation may occur */
+       UCSR1A = 0;
+       UCSR1B = 0;
+       UCSR1C = 0;
+
+       /* Set the new baud rate before configuring the USART */

        UBRR1  = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);
        UBRR1  = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);

+       
+       /* Reconfigure the USART in double speed mode for a wider baud rate range at the expense of accuracy */
+       UCSR1A = (1 << U2X1);   
+       UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));
+       UCSR1C = ConfigMask;

 }
 
 /** ISR to manage the reception of data from the serial port, placing received bytes into a circular buffer
 }
 
 /** ISR to manage the reception of data from the serial port, placing received bytes into a circular buffer

diff --git a/Projects/USBtoSerial/USBtoSerial.c b/Projects/USBtoSerial/USBtoSerial.c
index 1cd6f55..b59a364 100644 (file)
--- a/Projects/USBtoSerial/USBtoSerial.c
+++ b/Projects/USBtoSerial/USBtoSerial.c
@@ -120,7 +120,6 @@ void SetupHardware(void)
        clock_prescale_set(clock_div_1);
 
        /* Hardware Initialization */
        clock_prescale_set(clock_div_1);
 
        /* Hardware Initialization */

-       Serial_Init(9600, false);

        LEDs_Init();
        USB_Init();
 
        LEDs_Init();
        USB_Init();
 


@@ -199,9 +198,17 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCI
                        ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));
                        break;
        }
                        ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));
                        break;
        }

+
+       /* Must turn off USART before reconfiguring it, otherwise incorrect operation may occur */
+       UCSR1A = 0;
+       UCSR1B = 0;
+       UCSR1C = 0;
+
+       /* Set the new baud rate before configuring the USART */
+       UBRR1  = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);

        
        

+       /* Reconfigure the USART in double speed mode for a wider baud rate range at the expense of accuracy */

        UCSR1A = (1 << U2X1);   
        UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));
        UCSR1A = (1 << U2X1);   
        UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));

-       UCSR1C = ConfigMask;    
-       UBRR1  = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);
+       UCSR1C = ConfigMask;

 }
 }