UART0 on Teensy 3.0 now functional

diff --git a/Lib/mk20dx128.h b/Lib/mk20dx128.h
index 7ab6773c88a8b2e82f23c3acbf351752ace7a0eb..49711d0bfdb98757ef09a978d507e254d7bb3ed7 100644 (file)
--- a/Lib/mk20dx128.h
+++ b/Lib/mk20dx128.h
@@ -1087,7 +1087,7 @@ extern "C" {
 #define UART_S2_RXINV                  (uint8_t)0x10                   // RX Line Inversion Enable
 #define UART_S2_MSBF                   (uint8_t)0x20                   // MSBF Format Enabled
 #define UART0_C3                *(volatile uint8_t  *)0x4006A006 // UART Control Register 3
-#define UART_S2_TXINV                  (uint8_t)0x10                   // TX Line Inversion Enable
+#define UART_C3_TXINV                  (uint8_t)0x10                   // TX Line Inversion Enable
 #define UART0_D                 *(volatile uint8_t  *)0x4006A007 // UART Data Register
 #define UART0_MA1               *(volatile uint8_t  *)0x4006A008 // UART Match Address Registers 1
 #define UART0_MA2               *(volatile uint8_t  *)0x4006A009 // UART Match Address Registers 2

diff --git a/Scan/MBC-55X/scan_loop.c b/Scan/MBC-55X/scan_loop.c
index f0cf245670ab8902096b89055f97713174fb118c..79fbeb73b237186e4bcca0fdfe77edbde7256725 100644 (file)
--- a/Scan/MBC-55X/scan_loop.c
+++ b/Scan/MBC-55X/scan_loop.c
@@ -71,28 +71,24 @@ void uart0_status_isr(void)
 {
        cli(); // Disable Interrupts
 
-       // Read part of the scan code (3 8bit chunks) from USART
+       // Variable for UART data read
+       uint8_t tmp = 0x00;
+
 #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
-       uint8_t tmp = UDR1;
+       tmp = UDR1;
 #elif defined(_mk20dx128_) // ARM
-       // Exit out if nothing to do
-       /*
-       if ( !(UART0_S1 & UART_S1_RDRF ) )
+       // UART0_S1 must be read for the interrupt to be cleared
+       if ( UART0_S1 & UART_S1_RDRF )
        {
-               sei();
-               return;
+               // Only doing single byte FIFO here
+               tmp = UART0_D;
        }
-       */
-
-       // Only doing single byte FIFO here
-       uint8_t tmp = UART0_D;
-       print("YAYA");
 #endif
 
        // Debug
        char tmpStr[6];
        hexToStr( tmp, tmpStr );
-       dPrintStrsNL( tmpStr, " " ); // Debug
+       dPrintStrs( tmpStr, " " ); // Debug
 
        // TODO
 
@@ -148,7 +144,10 @@ inline void scan_setup()
        UART0_BDL = (uint8_t)baud;
 
        // 8 bit, Even Parity, Idle Character bit after stop
-       UART0_C1 = ~UART_C1_M | ~UART_C1_PE | UART_C1_PT | UART_C1_ILT;
+       // NOTE: For 8 bit with Parity you must enable 9 bit transmission (pg. 1065)
+       //       You only need to use UART0_D for 8 bit reading/writing though
+       // UART_C1_M UART_C1_PE UART_C1_PT UART_C1_ILT
+       UART0_C1 = UART_C1_M | UART_C1_PE | UART_C1_ILT;
 
        // Number of bytes in FIFO before TX Interrupt
        UART0_TWFIFO = 1;
@@ -161,15 +160,18 @@ inline void scan_setup()
        //  0x0 - 1 dataword
        //  0x1 - 4 dataword
        //  0x2 - 8 dataword
-       UART0_PFIFO = ~UART_PFIFO_TXFE | /*TXFIFOSIZE*/ (0x0 << 4) | ~UART_PFIFO_RXFE | /*RXFIFOSIZE*/ (0x0);
+       //UART0_PFIFO = UART_PFIFO_TXFE | /*TXFIFOSIZE*/ (0x0 << 4) | UART_PFIFO_RXFE | /*RXFIFOSIZE*/ (0x0);
 
        // Reciever Inversion Disabled, LSBF
-       UART0_S2 = ~UART_S2_RXINV | UART_S2_MSBF;
+       // UART_S2_RXINV UART_S2_MSBF
+       UART0_S2 |= 0x00;
 
        // Transmit Inversion Disabled
-       UART0_C3 = ~UART_S2_TXINV;
+       // UART_C3_TXINV
+       UART0_C3 |= 0x00;
 
        // TX Disabled, RX Enabled, RX Interrupt Enabled
+       // UART_C2_TE UART_C2_RE UART_C2_RIE
        UART0_C2 = UART_C2_TE | UART_C2_RE | UART_C2_RIE;
 
        // Add interrupt to the vector table
@@ -185,6 +187,7 @@ inline void scan_setup()
 inline uint8_t scan_loop()
 {
        UART0_D = 0x56;
+       _delay_ms( 10 );
        UART0_D = 0x1C;
        _delay_ms( 100 );
        return 0;