Changed the XPLAINBridge software UART to use the regular CTC mode instead of the...

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index b5d36c9..402865f 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -11,13 +11,14 @@
   *  - Core:
   *   - None
   *  - Library Applications:
   *  - Core:
   *   - None
   *  - Library Applications:

-  *   - None
+  *   - Added new incomplete MIDIToneGenerator project

   *
   *  <b>Changed:</b>
   *  - Core:
   *   - None
   *  - Library Applications:
   *
   *  <b>Changed:</b>
   *  - Core:
   *   - None
   *  - Library Applications:

-  *   - None
+  *   - Changed the XPLAINBridge software UART to use the regular CTC mode instead of the alternative CTC mode
+  *     via the Input Capture register, to reduce user confusion

   *
   *  <b>Fixed:</b>
   *  - Core:
   *
   *  <b>Fixed:</b>
   *  - Core:

diff --git a/Projects/Webserver/Lib/uip/clock.c b/Projects/Webserver/Lib/uip/clock.c
index 0906e61..71eaf2b 100644 (file)
--- a/Projects/Webserver/Lib/uip/clock.c
+++ b/Projects/Webserver/Lib/uip/clock.c
@@ -11,7 +11,7 @@
 volatile clock_time_t clock_datetime = 0;
 
 //Overflow interrupt
 volatile clock_time_t clock_datetime = 0;
 
 //Overflow interrupt

-ISR(TIMER1_COMPA_vect)
+ISR(TIMER1_COMPA_vect, ISR_BLOCK)

 {
        clock_datetime += 1;
 }
 {
        clock_datetime += 1;
 }

diff --git a/Projects/XPLAINBridge/Lib/SoftUART.c b/Projects/XPLAINBridge/Lib/SoftUART.c
index 4b38a0b..9df42c5 100644 (file)
--- a/Projects/XPLAINBridge/Lib/SoftUART.c
+++ b/Projects/XPLAINBridge/Lib/SoftUART.c
@@ -67,11 +67,11 @@ void SoftUART_Init(void)
        SoftUART_SetBaud(9600);
 
        /* Setup reception timer compare ISR */
        SoftUART_SetBaud(9600);
 
        /* Setup reception timer compare ISR */

-       TIMSK1 = (1 << ICIE1);
+       TIMSK1 = (1 << OC1E1A);

 
        /* Setup transmission timer compare ISR and start the timer */
 
        /* Setup transmission timer compare ISR and start the timer */

-       TIMSK3 = (1 << ICIE3);
-       TCCR3B = ((1 << CS30) | (1 << WGM33) | (1 << WGM32));
+       TIMSK3 = (1 << OC1E3A);
+       TCCR3B = ((1 << CS30) | (1 << WGM32));

 }
 
 /** ISR to detect the start of a bit being sent to the software UART. */
 }
 
 /** ISR to detect the start of a bit being sent to the software UART. */


@@ -90,12 +90,12 @@ ISR(INT0_vect, ISR_BLOCK)
                EIMSK = 0;
 
                /* Start the reception timer */
                EIMSK = 0;
 
                /* Start the reception timer */

-               TCCR1B = ((1 << CS10) | (1 << WGM13) | (1 << WGM12));
+               TCCR1B = ((1 << CS10) | (1 << WGM12));

        }
 }
 
 /** ISR to manage the reception of bits to the software UART. */
        }
 }
 
 /** ISR to manage the reception of bits to the software UART. */

-ISR(TIMER1_CAPT_vect, ISR_BLOCK)
+ISR(TIMER1_COMPA_vect, ISR_BLOCK)

 {
        /* Cache the current RX pin value for later checking */
        uint8_t SRX_Cached = (SRXPIN & (1 << SRX));
 {
        /* Cache the current RX pin value for later checking */
        uint8_t SRX_Cached = (SRXPIN & (1 << SRX));


@@ -125,7 +125,7 @@ ISR(TIMER1_CAPT_vect, ISR_BLOCK)
 }
 
 /** ISR to manage the transmission of bits via the software UART. */
 }
 
 /** ISR to manage the transmission of bits via the software UART. */

-ISR(TIMER3_CAPT_vect, ISR_BLOCK)
+ISR(TIMER3_COMPA_vect, ISR_BLOCK)

 {
        /* Check if transmission has finished */
        if (TX_BitsRemaining)
 {
        /* Check if transmission has finished */
        if (TX_BitsRemaining)

diff --git a/Projects/XPLAINBridge/Lib/SoftUART.h b/Projects/XPLAINBridge/Lib/SoftUART.h
index 6dedf61..803e1e5 100644 (file)
--- a/Projects/XPLAINBridge/Lib/SoftUART.h
+++ b/Projects/XPLAINBridge/Lib/SoftUART.h
@@ -60,8 +60,8 @@
                {
                        uint16_t BitTime = ((F_CPU / Baud) - 1);
 
                {
                        uint16_t BitTime = ((F_CPU / Baud) - 1);
 

-                       ICR1 = BitTime;
-                       ICR3 = BitTime;
+                       OCR1A = BitTime;
+                       OCR3A = BitTime;

                }
 
        /* Function Prototypes: */
                }
 
        /* Function Prototypes: */