WebSVN - FlightCtrl - Diff - Rev 624 and 683 - /branches/V0.68d Code Redesign killagreg/uart.c

 #include "main.h"
 #include "uart.h"
 unsigned char DebugGetAnforderung = 0,DebugDisplayAnforderung = 0,DebugDataAnforderung = 0,GetVersionAnforderung = 0;
 unsigned volatile char SioTmp = 0;
-unsigned volatile char SendeBuffer[MAX_SENDE_BUFF];
+unsigned volatile char txd_buffer[TXD_BUFFER_LEN];
-unsigned volatile char RxdBuffer[MAX_EMPFANGS_BUFF];
+unsigned volatile char rxd_buffer[RXD_BUFFER_LEN];
 unsigned volatile char NMEABuffer[MAX_EMPFANGS_BUFF];
 unsigned volatile char NeuerDatensatzEmpfangen = 0;
 unsigned volatile char NeueKoordinateEmpfangen = 0;
 unsigned volatile char UebertragungAbgeschlossen = 1;
 unsigned volatile char CntCrcError = 0;
 unsigned char RemotePollDisplayLine = 0;
 unsigned char NurKanalAnforderung = 0;
 unsigned char DebugTextAnforderung = 255;
 unsigned char PcZugriff = 100;
 unsigned char MotorTest[4] = {0,0,0,0};
 unsigned char DubWiseKeys[4] = {0,0,0,0};
 unsigned char MeineSlaveAdresse;
 unsigned char ConfirmFrame;
 struct str_DebugOut    DebugOut;
 struct str_ExternControl  ExternControl;
 struct str_VersionInfo VersionInfo;
 int Debug_Timer;
 const unsigned char ANALOG_TEXT[32][16] =
 {
    //1234567890123456
     "IntegralNick    ", //0
     "IntegralRoll    ",
     "AccNick         ",
     "AccRoll         ",
     "GyroGier        ",
     "HoehenWert      ", //5
     "AccZ            ",
     "StickRoll       "
 };
+/****************************************************************/
+/*              Initialization of the USART0                    */
+/****************************************************************/
+void USART0_Init (void)
+{
+        uint8_t sreg = SREG;
+        uint16_t ubrr = (uint16_t) ((uint32_t) SYSCLK/(8 * USART0_BAUD) - 1);
+        // disable all interrupts before configuration
+        cli();
+        // disable RX-Interrupt
+        UCSR0B &= ~(1 << RXCIE0);
+        // disable TX-Interrupt
+        UCSR0B &= ~(1 << TXCIE0);
+        // set direction of RXD0 and TXD0 pins
+        // set RXD0 (PD0) as an input pin
+        PORTD |= (1 << PORTD0);
+        DDRD &= ~(1 << DDD0);
+        // set TXD0 (PD1) as an output pin
+        PORTD |= (1 << PORTD1);
+        DDRD |=  (1 << DDD1);
+        // USART0 Baud Rate Register
+        // set clock divider
+        UBRR0H = (uint8_t)(ubrr >> 8);
+        UBRR0L = (uint8_t)ubrr;
+        // USART0 Control and Status Register A, B, C
+        // enable double speed operation in
+        UCSR0A |= (1 << U2X0);
+        // enable receiver and transmitter in
+        UCSR0B = (1 << TXEN0) | (1 << RXEN0);
+        // set asynchronous mode
+        UCSR0C &= ~(1 << UMSEL01);
+        UCSR0C &= ~(1 << UMSEL00);
+        // no parity
+        UCSR0C &= ~(1 << UPM01);
+        UCSR0C &= ~(1 << UPM00);
+        // 1 stop bit
+        UCSR0C &= ~(1 << USBS0);
+        // 8-bit
+        UCSR0B &= ~(1 << UCSZ02);
+        UCSR0C |=  (1 << UCSZ01);
+        UCSR0C |=  (1 << UCSZ00);
+                // flush receive buffer
+        while ( UCSR0A & (1<<RXC0) ) UDR0;
+        // enable interrupts at the end
+        // enable RX-Interrupt
+        UCSR0B |= (1 << RXCIE0);
+        // enable TX-Interrupt
+        UCSR0B |= (1 << TXCIE0);
+        // restore global interrupt flags
+    SREG = sreg;
+}
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/****************************************************************/
-//++ Sende-Part der Datenübertragung
+/*               USART0 transmitter ISR                         */
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/****************************************************************/
-SIGNAL(INT_VEC_TX)
+ISR(USART0_TX_vect)
 {
- static unsigned int ptr = 0;
+ static uint16_t ptr = 0;
- unsigned char tmp_tx;
+ uint8_t tmp_tx;
  if(!UebertragungAbgeschlossen)
   {
    ptr++;                    // die [0] wurde schon gesendet
-   tmp_tx = SendeBuffer[ptr];
+   tmp_tx = txd_buffer[ptr];
-   if((tmp_tx == '\r') || (ptr == MAX_SENDE_BUFF))
+   if((tmp_tx == '\r') || (ptr == TXD_BUFFER_LEN))
+    {
      ptr = 0;
      UebertragungAbgeschlossen = 1;
+    }
-   UDR = tmp_tx;
+   UDR0 = tmp_tx; // send byte will trigger this ISR again
   }
   else ptr = 0;
 }
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/****************************************************************/
-//++ Empfangs-Part der Datenübertragung, incl. CRC-Auswertung
+/*               USART0 receiver ISR                            */
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/****************************************************************/
-SIGNAL(INT_VEC_RX)
+ISR(USART0_RX_vect)
 {
- static unsigned int crc;
+ static uint16_t crc;
- static unsigned char crc1,crc2,buf_ptr;
+ static uint8_t crc1,crc2,buf_ptr;
- static unsigned char UartState = 0;
+ static uint8_t UartState = 0;
- unsigned char CrcOkay = 0;
+ uint8_t CrcOkay = 0;
- SioTmp = UDR;
+ SioTmp = UDR0;
- if(buf_ptr >= MAX_EMPFANGS_BUFF)    UartState = 0;
+ if(buf_ptr >= RXD_BUFFER_LEN)    UartState = 0;
  if(SioTmp == '\r' && UartState == 2)
+  {
    UartState = 0;
-   crc -= RxdBuffer[buf_ptr-2];
+   crc -= rxd_buffer[buf_ptr-2];
-   crc -= RxdBuffer[buf_ptr-1];
+   crc -= rxd_buffer[buf_ptr-1];
    crc %= 4096;
    crc1 = '=' + crc / 64;
    crc2 = '=' + crc % 64;
    CrcOkay = 0;
-   if((crc1 == RxdBuffer[buf_ptr-2]) && (crc2 == RxdBuffer[buf_ptr-1])) CrcOkay = 1; else { CrcOkay = 0; CntCrcError++;};
+   if((crc1 == rxd_buffer[buf_ptr-2]) && (crc2 == rxd_buffer[buf_ptr-1])) CrcOkay = 1; else { CrcOkay = 0; CntCrcError++;};
    if(!NeuerDatensatzEmpfangen && CrcOkay) // Datensatz schon verarbeitet
     {
      NeuerDatensatzEmpfangen = 1;
          AnzahlEmpfangsBytes = buf_ptr;
-     RxdBuffer[buf_ptr] = '\r';
+     rxd_buffer[buf_ptr] = '\r';
-         if(RxdBuffer[2] == 'R') wdt_enable(WDTO_250MS); // Reset-Commando
+         if(rxd_buffer[2] == 'R') wdt_enable(WDTO_250MS); // Reset-Commando
+        }
+  }
   else
   switch(UartState)
   {
    case 0:
           if(SioTmp == '#' && !NeuerDatensatzEmpfangen) UartState = 1;  // Startzeichen und Daten schon verarbeitet
                   buf_ptr = 0;
-                  RxdBuffer[buf_ptr++] = SioTmp;
+                  rxd_buffer[buf_ptr++] = SioTmp;
                   crc = SioTmp;
           break;
    case 1: // Adresse auswerten
                   UartState++;
-                  RxdBuffer[buf_ptr++] = SioTmp;
+                  rxd_buffer[buf_ptr++] = SioTmp;
                   crc += SioTmp;
                   break;
    case 2: //  Eingangsdaten sammeln
-                  RxdBuffer[buf_ptr] = SioTmp;
+                  rxd_buffer[buf_ptr] = SioTmp;
-                  if(buf_ptr < MAX_EMPFANGS_BUFF) buf_ptr++;
+                  if(buf_ptr < RXD_BUFFER_LEN) buf_ptr++;
                   else UartState = 0;
                   crc += SioTmp;
                   break;
    default:
+          UartState = 0;
-          UartState = 0;
+          break;
           break;
+}
-}
 // --------------------------------------------------------------------------
 void AddCRC(unsigned int wieviele)
+{
- unsigned int tmpCRC = 0,i;
+ uint16_t tmpCRC = 0,i;
  for(i = 0; i < wieviele;i++)
   {
-   tmpCRC += SendeBuffer[i];
+   tmpCRC += txd_buffer[i];
   }
    tmpCRC %= 4096;
-   SendeBuffer[i++] = '=' + tmpCRC / 64;
+   txd_buffer[i++] = '=' + tmpCRC / 64;
-   SendeBuffer[i++] = '=' + tmpCRC % 64;
+   txd_buffer[i++] = '=' + tmpCRC % 64;
-   SendeBuffer[i++] = '\r';
+   txd_buffer[i++] = '\r';
   UebertragungAbgeschlossen = 0;
-  UDR = SendeBuffer[0];
+  UDR0 = txd_buffer[0];
 }
 // --------------------------------------------------------------------------
-void SendOutData(unsigned char cmd,unsigned char modul, unsigned char *snd, unsigned char len)
+void SendOutData(uint8_t cmd,uint8_t modul, uint8_t *snd, uint8_t len)
+{
- unsigned int pt = 0;
+ uint16_t pt = 0;
- unsigned char a,b,c;
+ uint8_t a,b,c;
- unsigned char ptr = 0;
+ uint8_t ptr = 0;
- SendeBuffer[pt++] = '#';               // Startzeichen
+ txd_buffer[pt++] = '#';               // Startzeichen
- SendeBuffer[pt++] = modul;             // Adresse (a=0; b=1,...)
+ txd_buffer[pt++] = modul;             // Adresse (a=0; b=1,...)
- SendeBuffer[pt++] = cmd;                       // Commando
+ txd_buffer[pt++] = cmd;                        // Commando
  while(len)
+  {
    if(len) { a = snd[ptr++]; len--;} else a = 0;
    if(len) { b = snd[ptr++]; len--;} else b = 0;
    if(len) { c = snd[ptr++]; len--;} else c = 0;
-   SendeBuffer[pt++] = '=' + (a >> 2);
+   txd_buffer[pt++] = '=' + (a >> 2);
-   SendeBuffer[pt++] = '=' + (((a & 0x03) << 4) | ((b & 0xf0) >> 4));
+   txd_buffer[pt++] = '=' + (((a & 0x03) << 4) | ((b & 0xf0) >> 4));
-   SendeBuffer[pt++] = '=' + (((b & 0x0f) << 2) | ((c & 0xc0) >> 6));
+   txd_buffer[pt++] = '=' + (((b & 0x0f) << 2) | ((c & 0xc0) >> 6));
-   SendeBuffer[pt++] = '=' + ( c & 0x3f);
+   txd_buffer[pt++] = '=' + ( c & 0x3f);
+  }
  AddCRC(pt);
 }
 // --------------------------------------------------------------------------
-void Decode64(unsigned char *ptrOut, unsigned char len, unsigned char ptrIn,unsigned char max)  // Wohin mit den Daten; Wie lang; Wo im RxdBuffer
+void Decode64(uint8_t *ptrOut, uint8_t len, uint8_t ptrIn, uint8_t max)  // Wohin mit den Daten; Wie lang; Wo im rxd_buffer
+{
- unsigned char a,b,c,d;
+ uint8_t a,b,c,d;
 // --------------------------------------------------------------------------
 void BearbeiteRxDaten(void)
+{
  if(!NeuerDatensatzEmpfangen) return;
-// unsigned int tmp_int_arr1[1];
-// unsigned int tmp_int_arr2[2];
-// unsigned int tmp_int_arr3[3];
- unsigned char tmp_char_arr2[2];
-// unsigned char tmp_char_arr3[3];
-// unsigned char tmp_char_arr4[4];
+ uint8_t tmp_char_arr2[2];
  //if(!MotorenEin)
  PcZugriff = 255;
-  switch(RxdBuffer[2])
+  switch(rxd_buffer[2])
+  {
    case 'a':// Texte der Analogwerte
-            Decode64((unsigned char *) &tmp_char_arr2[0],sizeof(tmp_char_arr2),3,AnzahlEmpfangsBytes);
+            Decode64((uint8_t *) &tmp_char_arr2[0],sizeof(tmp_char_arr2),3,AnzahlEmpfangsBytes);
             DebugTextAnforderung = tmp_char_arr2[0];
                         break;
    case 'b':
-                        Decode64((unsigned char *) &ExternControl,sizeof(ExternControl),3,AnzahlEmpfangsBytes);
+                        Decode64((uint8_t *) &ExternControl,sizeof(ExternControl),3,AnzahlEmpfangsBytes);
                         RemoteTasten |= ExternControl.RemoteTasten;
             ConfirmFrame = ExternControl.Frame;
             break;
    case 'c':
-                        Decode64((unsigned char *) &ExternControl,sizeof(ExternControl),3,AnzahlEmpfangsBytes);
+                        Decode64((uint8_t *) &ExternControl,sizeof(ExternControl),3,AnzahlEmpfangsBytes);
                         RemoteTasten |= ExternControl.RemoteTasten;
             ConfirmFrame = ExternControl.Frame;
             DebugDataAnforderung = 1;
             break;
    case 'h':// x-1 Displayzeilen
-            Decode64((unsigned char *) &tmp_char_arr2[0],sizeof(tmp_char_arr2),3,AnzahlEmpfangsBytes);
+            Decode64((uint8_t *) &tmp_char_arr2[0],sizeof(tmp_char_arr2),3,AnzahlEmpfangsBytes);
             RemoteTasten |= tmp_char_arr2[0];
                         if(tmp_char_arr2[1] == 255) NurKanalAnforderung = 1; else NurKanalAnforderung = 0; // keine Displaydaten
                         DebugDisplayAnforderung = 1;
                         break;
    case 't':// Motortest
-            Decode64((unsigned char *) &MotorTest[0],sizeof(MotorTest),3,AnzahlEmpfangsBytes);
+            Decode64((uint8_t *) &MotorTest[0],sizeof(MotorTest),3,AnzahlEmpfangsBytes);
                         break;
    case 'k':// Keys von DubWise
-            Decode64((unsigned char *) &DubWiseKeys[0],sizeof(DubWiseKeys),3,AnzahlEmpfangsBytes);
+            Decode64((uint8_t *) &DubWiseKeys[0],sizeof(DubWiseKeys),3,AnzahlEmpfangsBytes);
                         ConfirmFrame = DubWiseKeys[3];
                         break;
    case 'v': // Version-Anforderung     und Ausbaustufe
             GetVersionAnforderung = 1;
             break;
    case 'g':// "Get"-Anforderung für Debug-Daten
             // Bei Get werden die vom PC einstellbaren Werte vom PC zurückgelesen
             DebugGetAnforderung = 1;
             break;
    case 'q':// "Get"-Anforderung für Settings
             // Bei Get werden die vom PC einstellbaren Werte vom PC zurückgelesen
-            Decode64((unsigned char *) &tmp_char_arr2[0],sizeof(tmp_char_arr2),3,AnzahlEmpfangsBytes);
+            Decode64((uint8_t *) &tmp_char_arr2[0],sizeof(tmp_char_arr2),3,AnzahlEmpfangsBytes);
             if(tmp_char_arr2[0] != 0xff)
+             {
                           if(tmp_char_arr2[0] > 5) tmp_char_arr2[0] = 5;
-                  ReadParameterSet(tmp_char_arr2[0], (unsigned char *) &EE_Parameter.Kanalbelegung[0], STRUCT_PARAM_LAENGE);
+                  ReadParameterSet(tmp_char_arr2[0], (uint8_t *) &EE_Parameter.Kanalbelegung[0], STRUCT_PARAM_LAENGE);
-                  SendOutData('L' + tmp_char_arr2[0] -1,MeineSlaveAdresse,(unsigned char *) &EE_Parameter.Kanalbelegung[0],STRUCT_PARAM_LAENGE);
+                  SendOutData('L' + tmp_char_arr2[0] -1,MeineSlaveAdresse,(uint8_t *) &EE_Parameter.Kanalbelegung[0],STRUCT_PARAM_LAENGE);
              }
              else
-                  SendOutData('L' + GetActiveParamSetNumber()-1,MeineSlaveAdresse,(unsigned char *) &EE_Parameter.Kanalbelegung[0],STRUCT_PARAM_LAENGE);
+                  SendOutData('L' + GetActiveParamSetNumber()-1,MeineSlaveAdresse,(uint8_t *) &EE_Parameter.Kanalbelegung[0],STRUCT_PARAM_LAENGE);
             break;
    case 'l':
    case 'm':
    case 'n':
    case 'o':
    case 'p': // Parametersatz speichern
-            Decode64((unsigned char *) &EE_Parameter.Kanalbelegung[0],STRUCT_PARAM_LAENGE,3,AnzahlEmpfangsBytes);
+            Decode64((uint8_t *) &EE_Parameter.Kanalbelegung[0],STRUCT_PARAM_LAENGE,3,AnzahlEmpfangsBytes);
-                        WriteParameterSet(RxdBuffer[2] - 'l' + 1, (unsigned char *) &EE_Parameter.Kanalbelegung[0], STRUCT_PARAM_LAENGE);
+                        WriteParameterSet(rxd_buffer[2] - 'l' + 1, (uint8_t *) &EE_Parameter.Kanalbelegung[0], STRUCT_PARAM_LAENGE);
-            eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACTIVE_SET], RxdBuffer[2] - 'l' + 1);  // aktiven Datensatz merken
+            eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACTIVE_SET], rxd_buffer[2] - 'l' + 1);  // aktiven Datensatz merken
-            Umschlag180Nick = (long) EE_Parameter.WinkelUmschlagNick * 2500L;
+            Umschlag180Nick = (int32_t) EE_Parameter.WinkelUmschlagNick * 2500L;
-            Umschlag180Roll = (long) EE_Parameter.WinkelUmschlagRoll * 2500L;
+            Umschlag180Roll = (int32_t) EE_Parameter.WinkelUmschlagRoll * 2500L;
             Piep(GetActiveParamSetNumber());
          break;
+  }
 // DebugOut.AnzahlZyklen =  Debug_Timer_Intervall;
  NeuerDatensatzEmpfangen = 0;
+}
 //############################################################################
 //Routine für die Serielle Ausgabe
-int uart_putchar (char c)
+int16_t uart_putchar (int8_t c)
 //############################################################################
+{
         if (c == '\n')
                 uart_putchar('\r');
         //Warten solange bis Zeichen gesendet wurde
-        loop_until_bit_is_set(USR, UDRE);
+        loop_until_bit_is_set(UCSR0A, UDRE0);
         //Ausgabe des Zeichens
-        UDR = c;
+        UDR0 = c;
         return (0);
+}
   //if (ProgramLocation == IN_RAM) Buffer[pos] = wert;
   // else eeprom_write_byte(&EE_Buffer[pos], wert);
   // Buffer[pos] = wert;
+}
-//############################################################################
-//INstallation der Seriellen Schnittstelle
-void UART_Init (void)
-//############################################################################
-{
-        //Enable TXEN im Register UCR TX-Data Enable & RX Enable
-        UCR=(1 << TXEN) | (1 << RXEN);
-    // UART Double Speed (U2X)
-        USR   |= (1<<U2X);
-        // RX-Interrupt Freigabe
-        UCSRB |= (1<<RXCIE);
-        // TX-Interrupt Freigabe
-        UCSRB |= (1<<TXCIE);
-        //Teiler wird gesetzt
-        UBRR=(SYSCLK / (BAUD_RATE * 8L) - 1);
-        //UBRR = 33;
-        //öffnet einen Kanal für printf (STDOUT)
-        //fdevopen (uart_putchar, 0);
-        //sbi(PORTD,4);
   Debug_Timer = SetDelay(200);
-}
 //---------------------------------------------------------------------------------------------
 void DatenUebertragung(void)
 {
  if(!UebertragungAbgeschlossen) return;
    if(DebugGetAnforderung && UebertragungAbgeschlossen)               // Bei Get werden die vom PC einstellbaren Werte vom PC zurückgelesen
    {
-      SendOutData('G',MeineSlaveAdresse,(unsigned char *) &ExternControl,sizeof(ExternControl));
+      SendOutData('G',MeineSlaveAdresse,(uint8_t *) &ExternControl,sizeof(ExternControl));
           DebugGetAnforderung = 0;
+   }
     if((CheckDelay(Debug_Timer) || DebugDataAnforderung) && UebertragungAbgeschlossen)
+         {
-          SendOutData('D',MeineSlaveAdresse,(unsigned char *) &DebugOut,sizeof(DebugOut));
+          SendOutData('D',MeineSlaveAdresse,(uint8_t *) &DebugOut,sizeof(DebugOut));
           DebugDataAnforderung = 0;
           Debug_Timer = SetDelay(MIN_DEBUG_INTERVALL);
+         }
     if(DebugTextAnforderung != 255) // Texte für die Analogdaten
+     {
-      SendOutData('A',DebugTextAnforderung + '0',(unsigned char *) ANALOG_TEXT[DebugTextAnforderung],16);
+      SendOutData('A',DebugTextAnforderung + '0',(uint8_t *) ANALOG_TEXT[DebugTextAnforderung],16);
       DebugTextAnforderung = 255;
          }
      if(ConfirmFrame && UebertragungAbgeschlossen)   // Datensatz ohne CRC bestätigen
+         {
-      SendeBuffer[0] = '#';
+      txd_buffer[0] = '#';
-      SendeBuffer[1] = ConfirmFrame;
+      txd_buffer[1] = ConfirmFrame;
-      SendeBuffer[2] = '\r';
+      txd_buffer[2] = '\r';
       UebertragungAbgeschlossen = 0;
       ConfirmFrame = 0;
-      UDR = SendeBuffer[0];
+      UDR0 = txd_buffer[0];
      }
      if(DebugDisplayAnforderung && UebertragungAbgeschlossen)
          {
       Menu();
           DebugDisplayAnforderung = 0;
       if(++RemotePollDisplayLine == 4 || NurKanalAnforderung)
       {
-       SendOutData('4',0,(unsigned char *)&PPM_in,sizeof(PPM_in));   // DisplayZeile übertragen
+       SendOutData('4',0,(uint8_t *)&PPM_in,sizeof(PPM_in));   // DisplayZeile übertragen
        RemotePollDisplayLine = -1;
       }
-      else  SendOutData('0' + RemotePollDisplayLine,0,(unsigned char *)&DisplayBuff[20 * RemotePollDisplayLine],20);   // DisplayZeile übertragen
+      else  SendOutData('0' + RemotePollDisplayLine,0,(uint8_t *)&DisplayBuff[20 * RemotePollDisplayLine],20);   // DisplayZeile übertragen
+         }
     if(GetVersionAnforderung && UebertragungAbgeschlossen)

Subversion Repositories FlightCtrl

(root)/branches/V0.68d Code Redesign killagreg/uart.c @ 683 - Rev 624 → 683