Diff: DMX.cpp

Revision:

20:b1942f266f49

Parent:

19:8a86e35e54a9

Child:

21:59c200304b47

--- a/DMX.cpp	Thu Mar 26 17:09:33 2015 +0000
+++ b/DMX.cpp	Thu Mar 26 17:11:02 2015 +0000
@@ -11,7 +11,8 @@
 #include "mbed.h"
 #include "DMX.h"
 
-DMX::DMX (PinName p_tx, PinName p_rx) : _dmx(p_tx, p_rx) {
+DMX::DMX (PinName p_tx, PinName p_rx) : _dmx(p_tx, p_rx)
+{
 
     clear();
 //    mode_tx = DMX_MODE_BEGIN;
@@ -22,58 +23,52 @@
 
 #if defined(TARGET_LPC1768) || defined(TARGET_LPC2368)
     if (p_rx == P0_3) {
-      _uart = (LPC_UART_TypeDef*)LPC_UART0;
-      NVIC_SetPriority(UART0_IRQn, 1);
-    } else
-    if (p_rx == p14) {
-      _uart = (LPC_UART_TypeDef*)LPC_UART1;
-      NVIC_SetPriority(UART1_IRQn, 1);
-    } else
-    if (p_rx == p27) {
-      _uart = LPC_UART2;
-      NVIC_SetPriority(UART2_IRQn, 1);
-    } else
-    if (p_rx == p10) {
-      _uart = LPC_UART3;
-      NVIC_SetPriority(UART3_IRQn, 1);
+        _uart = (LPC_UART_TypeDef*)LPC_UART0;
+        NVIC_SetPriority(UART0_IRQn, 1);
+    } else if (p_rx == p14) {
+        _uart = (LPC_UART_TypeDef*)LPC_UART1;
+        NVIC_SetPriority(UART1_IRQn, 1);
+    } else if (p_rx == p27) {
+        _uart = LPC_UART2;
+        NVIC_SetPriority(UART2_IRQn, 1);
+    } else if (p_rx == p10) {
+        _uart = LPC_UART3;
+        NVIC_SetPriority(UART3_IRQn, 1);
     }
 #elif defined(TARGET_KL46Z)
-/**
-    Need to associate the _uart private variable with the user selected pin.
-    Hook the interrupt pin. 
-*/
-    if ((p_rx == PTE21) || (p_rx == PTA1)){
-      _uart = (UARTLP_Type *)UART0;
-      NVIC_SetPriority(UART0_IRQn, 1);
-    } else
-    if (p_rx == PTE1) {
-      _uart = (UARTLP_Type *)UART1;
-      NVIC_SetPriority(UART1_IRQn, 1);
-    } else
-    if ((p_rx == PTE23) || (p_rx == PTE17)) {
-      _uart = (UARTLP_Type *)UART2;
-      NVIC_SetPriority(UART2_IRQn, 1);
-    } 
-   
+    /**
+        Need to associate the _uart private variable with the user selected pin.
+        Hook the interrupt pin.
+    */
+    if ((p_rx == PTE21) || (p_rx == PTA1)) {
+        _uart = (UARTLP_Type *)UART0;
+        NVIC_SetPriority(UART0_IRQn, 1);
+    } else if (p_rx == PTE1) {
+        _uart = (UARTLP_Type *)UART1;
+        NVIC_SetPriority(UART1_IRQn, 1);
+    } else if ((p_rx == PTE23) || (p_rx == PTE17)) {
+        _uart = (UARTLP_Type *)UART2;
+        NVIC_SetPriority(UART2_IRQn, 1);
+    }
+
 #elif defined(TARGET_LPC4088)
     if (p_rx == p10) {
-      _uart = LPC_UART3;
-      NVIC_SetPriority(UART3_IRQn, 1);
-    } else
-    if (p_rx == p31) {
-      _uart = (LPC_UART_TypeDef*)LPC_UART4;
-      NVIC_SetPriority(UART4_IRQn, 1);
+        _uart = LPC_UART3;
+        NVIC_SetPriority(UART3_IRQn, 1);
+    } else if (p_rx == p31) {
+        _uart = (LPC_UART_TypeDef*)LPC_UART4;
+        NVIC_SetPriority(UART4_IRQn, 1);
     }
 #elif defined(TARGET_LPC11UXX)
     if (p_rx == p10) {
-      _uart = LPC_USART;
-      NVIC_SetPriority(UART_IRQn, 1);
+        _uart = LPC_USART;
+        NVIC_SetPriority(UART_IRQn, 1);
     }
 #elif defined(TARGET_LPC11XX)
     // LPC1114 support by Stanly Chen
     if (p_rx == P1_6) {
-      _uart = (LPC_UART_TypeDef*)UART_0;
-      NVIC_SetPriority(UART_IRQn, 1);
+        _uart = (LPC_UART_TypeDef*)UART_0;
+        NVIC_SetPriority(UART_IRQn, 1);
     }
 #endif
 
@@ -84,97 +79,103 @@
 //    timeout01.attach_us(this, &DMX::int_timer, DMX_TIME_BETWEEN);
 }
 
-void DMX::put (int addr, int data) {
+void DMX::put (int addr, int data)
+{
     if (addr < 0 || addr >= DMX_SIZE) return;
     data_tx[addr] = data;
 }
 
-void DMX::put (unsigned char *buf, int addr, int len) {
+void DMX::put (unsigned char *buf, int addr, int len)
+{
     if (addr < 0 || addr >= DMX_SIZE) return;
     if (len > DMX_SIZE - addr) len = DMX_SIZE - addr;
     memcpy(&data_tx[addr], buf, len);
 }
 
-int DMX::get (int addr) {
+int DMX::get (int addr)
+{
     if (addr < 0 || addr >= DMX_SIZE) return -1;
     return data_rx[addr];
 }
 
-void DMX::get (unsigned char *buf, int addr, int len) {
+void DMX::get (unsigned char *buf, int addr, int len)
+{
     if (addr < 0 || addr >= DMX_SIZE) return;
     if (len > DMX_SIZE - addr) len = DMX_SIZE - addr;
     memcpy(buf, &data_rx[addr], len);
 }
 
-void DMX::int_timer () {
+void DMX::int_timer ()
+{
 
     switch (mode_tx) {
-    case DMX_MODE_BEGIN:
-        // Break Time
-        timeout01.detach();
-        #if defined(TARGET_KL46Z)
-        /// Chapter 31.2  of the Freescale KE02 Sub-Famely Reference
-        /// UARTx_C2 page 553 enable the transmitter and reciever
-        ///  Sending a break we write a one, then write a zero.....  This sets send break bit
+        case DMX_MODE_BEGIN:
+            // Break Time
+            timeout01.detach();
+#if defined(TARGET_KL46Z)
+            /// Chapter 31.2  of the Freescale KE02 Sub-Famely Reference
+            /// UARTx_C2 page 553 enable the transmitter and reciever
+            ///  Sending a break we write a one, then write a zero.....  This sets send break bit
             _uart->C2 |= UART_C2_SBK_MASK | UART_C2_TE_MASK | UART_C2_RE_MASK;
-        #else
-        /// Bit 6 in the LCR enables the break signal.....
+#else
+            /// Bit 6 in the LCR enables the break signal.....
             _uart->LCR |= (1 << 6);
-        #endif
-        mode_tx = DMX_MODE_BREAK;
-        timeout01.attach_us(this, &DMX::int_timer, DMX_TIME_BREAK);
-        break;
+#endif
+            mode_tx = DMX_MODE_BREAK;
+            timeout01.attach_us(this, &DMX::int_timer, DMX_TIME_BREAK);
+            break;
 
-    case DMX_MODE_BREAK:
-        // Mark After Break
-        timeout01.detach();
-        #if defined(TARGET_KL46Z)
-        /// This sets the break charcter to zero to send the break.
-        _uart->C2 &= ~UART_C2_SBK_MASK;
-        #else
-        _uart->LCR &= ~(1 << 6);
-        #endif
-        mode_tx = DMX_MODE_MAB;
-        timeout01.attach_us(this, &DMX::int_timer, DMX_TIME_MAB);
-        break;
+        case DMX_MODE_BREAK:
+            // Mark After Break
+            timeout01.detach();
+#if defined(TARGET_KL46Z)
+            /// This sets the break charcter to zero to send the break.
+            _uart->C2 &= ~UART_C2_SBK_MASK;
+#else
+            _uart->LCR &= ~(1 << 6);
+#endif
+            mode_tx = DMX_MODE_MAB;
+            timeout01.attach_us(this, &DMX::int_timer, DMX_TIME_MAB);
+            break;
 
-    case DMX_MODE_MAB:
-        // Start code
-        timeout01.detach();
-        addr_tx = 0;
-        mode_tx = DMX_MODE_DATA;
-        _dmx.attach(this, &DMX::int_tx, Serial::TxIrq);
+        case DMX_MODE_MAB:
+            // Start code
+            timeout01.detach();
+            addr_tx = 0;
+            mode_tx = DMX_MODE_DATA;
+            _dmx.attach(this, &DMX::int_tx, Serial::TxIrq);
 #ifdef DMX_UART_DIRECT
-        
-        
-        #if defined(TARGET_KL46Z)
-        /// Check the TDRE (Transmit Data Register Empty) flag... page 555
-        /// The data is placed in D on the Freescale
-        while(!(_uart->S1 & UART_S1_TDRE_MASK));
-        _uart->D = DMX_START_CODE; // Freescale
-        #else
-        /// Bit 5 of the LSR indicates the THR (Transmit Holding Register) is empty
-        while(!(_uart->LSR & (1<<5)));
-        _uart->THR = DMX_START_CODE;
-        #endif
+
+
+#if defined(TARGET_KL46Z)
+            /// Check the TDRE (Transmit Data Register Empty) flag... page 555
+            /// The data is placed in D on the Freescale
+            while(!(_uart->S1 & UART_S1_TDRE_MASK));
+            _uart->D = DMX_START_CODE; // Freescale
 #else
-        _dmx.putc(DMX_START_CODE);
+            /// Bit 5 of the LSR indicates the THR (Transmit Holding Register) is empty
+            while(!(_uart->LSR & (1<<5)));
+            _uart->THR = DMX_START_CODE;
 #endif
-        break;
+#else
+            _dmx.putc(DMX_START_CODE);
+#endif
+            break;
     }
 }
 
-void DMX::int_tx () {
+void DMX::int_tx ()
+{
     // Data
     if (mode_tx == DMX_MODE_DATA) {
         if (addr_tx < DMX_SIZE) {
 #ifdef DMX_UART_DIRECT
-            
-            #if defined(TARGET_KL46Z)
+
+#if defined(TARGET_KL46Z)
             _uart->D = (uint8_t)data_tx[addr_tx]; // Freescale
-            #else
+#else
             _uart->THR = (uint8_t)data_tx[addr_tx];
-            #endif
+#endif
 #else
             _dmx.putc(data_tx[addr_tx]);
 #endif
@@ -188,26 +189,27 @@
     }
 }
 
-void DMX::int_rx () {
+void DMX::int_rx ()
+{
     int flg, dat;
     int tmp1,tmp2;
-    #if defined(TARGET_KL46Z)  
+#if defined(TARGET_KL46Z)
     /// looking for (7)erroneous data,(3) Framming Error, (4) Break
     tmp1 = (_uart->S1 & (UART_S1_NF_MASK|UART_S1_FE_MASK));         // NF,FE
     tmp2 = (_uart->S2 & UART_S2_LBKDIF_MASK);         //LBKDIF
     flg = (tmp1<<1) | tmp2;
-    #else
-    flg = _uart->LSR;  
-    #endif
-    
+#else
+    flg = _uart->LSR;
+#endif
+
 #ifdef DMX_UART_DIRECT
-    #if defined(TARGET_KL46Z)
+#if defined(TARGET_KL46Z)
     dat = _uart->D;  // Freescale
-    #else
+#else
     dat = _uart->RBR;
-    #endif
-      
-   
+#endif
+
+
 #else
     dat = _dmx.getc();
 #endif
@@ -231,8 +233,7 @@
             mode_rx = DMX_MODE_ERROR;
         }
 
-    } else
-    if (mode_rx == DMX_MODE_DATA) {
+    } else if (mode_rx == DMX_MODE_DATA) {
 
         // Data
         data_rx[addr_rx] = dat;
@@ -245,7 +246,8 @@
     }
 }
 
-void DMX::start () {
+void DMX::start ()
+{
     if (mode_tx == DMX_MODE_STOP) {
         mode_tx = DMX_MODE_BEGIN;
         is_sent = 0;
@@ -253,13 +255,15 @@
     }
 }
 
-void DMX::stop () {
+void DMX::stop ()
+{
     _dmx.attach(0, Serial::TxIrq);
     timeout01.detach();
     mode_tx = DMX_MODE_STOP;
 }
 
-void DMX::clear () {
+void DMX::clear ()
+{
     int i;
 
     for (i = 0; i < DMX_SIZE; i ++) {