Subversion Repositories FlightCtrl

Rev

Rev 515 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 515 Rev 525
Line 28... Line 28...
28 
unsigned char MeineSlaveAdresse;
 28 
unsigned char MeineSlaveAdresse;
29 
struct str_DebugOut    DebugOut;
 29 
struct str_DebugOut    DebugOut;
30 
struct str_Debug       DebugIn;
 30 
struct str_Debug       DebugIn;
31 
struct str_VersionInfo VersionInfo;
 31 
struct str_VersionInfo VersionInfo;
32 
int Debug_Timer;
 32 
int Debug_Timer;
- 
 
 33 
//Salvo 26.10.2007
- 
 
 34 
int dataset_cnt=0; //Zahelt die uebertragenen Debugdaten
- 
 
 35 
//Salvo End
Line 33... Line 36...
33 
 
 36 
 
34 
const unsigned char ANALOG_TEXT[32][16] =
 37 
const unsigned char ANALOG_TEXT[32][16] =
35 
{
 38 
{
36 
   //1234567890123456
39 
   //1234567890123456
Line 41... Line 44...
41 
    "GyroGier        ",
 44 
    "GyroGier        ",
42 
    "HoehenWert      ", //5
 45 
    "HoehenWert      ", //5
43 
    "AccZ            ",
 46 
    "AccZ            ",
44 
    "Gas             ",
 47 
    "Gas             ",
45 
    "KompassValue    ",
 48 
    "KompassValue    ",
46 
    "Spannung        ",
 49 
    "Ersatzkompass   ",
47 
    "Empfang         ", //10
 50 
    "Empfang         ", //10
48 
    "Analog11        ",
 51 
    "Analog11        ",
49 
    "Motor_Vorne     ",
 52 
    "Motor_Vorne     ",
50 
    "Motor_Hinten    ",
 53 
    "Motor_Hinten    ",
51 
    "Motor_Links     ",
 54 
    "Motor_Links     ",
52 
    "Motor_Rechts    ", //15
 55 
    "Motor_Rechts    ", //15
53 
    "Acc_Z           ",
 56 
    "Index           ",
54 
    "MittelAccNick   ",
 57 
    "UBat            ",
55 
    "MittelAccRoll   ",
 58 
    "Messwert_Nick   ",
56 
    "IntegralErrNick ",
 59 
    "Messwert_Roll   ",
57 
    "IntegralErrRoll ", //20
 60 
    "Messwert_Gier   ", //20
58 
    "MittelIntNick   ",
 61 
    "Stick_Nick      ",
59 
    "MittelIntRoll       ",
 62 
    "Stick_Roll          ",
60 
    "NeutralNick     ",
 63 
    "Stick_Gier      ",
61 
    "RollOffset      ",
 64 
    "RollOffset      ",
62 
    "IntRoll*Faktor  ", //25
 65 
    "IntRoll*Faktor  ", //25
63 
    "Analog26        ",
 66 
    "utm_east        ",
64 
    "DirektAusglRoll ",
 67 
    "utm_north       ",
65 
    "MesswertRoll    ",
 68 
    "utm_alt         ",
66 
    "AusgleichRoll   ",
 69 
    "gps_state       ",
67 
    "I-LageRoll      ", //30
 70 
    "I-LageRoll      ", //30
68 
    "StickRoll       "
 71 
    "StickRoll       "
69 
};
 72 
};
Line 100... Line 103...
100 
 static unsigned char crc1,crc2,buf_ptr;
 103 
 static unsigned char crc1,crc2,buf_ptr;
101 
 static unsigned char UartState = 0;
 104 
 static unsigned char UartState = 0;
102 
 unsigned char CrcOkay = 0;
 105 
 unsigned char CrcOkay = 0;
Line 103... Line 106...
103 
 
 106 
 
- 
 
 107 
 SioTmp = UDR;
- 
 
 108 
 //Salvo 11.9.2007 GPS Daten holen
- 
 
 109 
 Get_Ublox_Msg(SioTmp); // Daten vom GPS Modul holen
104 
 SioTmp = UDR;
 110 
 // Salvo End
105 
 if(buf_ptr >= MAX_EMPFANGS_BUFF)    UartState = 0;
 111 
 if(buf_ptr >= MAX_EMPFANGS_BUFF)    UartState = 0;
106 
 if(SioTmp == '\r' && UartState == 2)
 112 
 if(SioTmp == '\r' && UartState == 2)
107 
  {
 113 
  {
108 
   UartState = 0;
 114 
   UartState = 0;
Line 345... Line 351...
345 
}
 351 
}
Line 346... Line 352...
346 
 
 352 
 
347 
//---------------------------------------------------------------------------------------------
 353 
//---------------------------------------------------------------------------------------------
348 
void DatenUebertragung(void)  
 354 
void DatenUebertragung(void)  
- 
 
 355 
{
349 
{
 356 
 static char dis_zeile = 0;
Line 350... Line 357...
350 
 if(!UebertragungAbgeschlossen) return;
 357 
 if(!UebertragungAbgeschlossen) return;
351 
 
 358 
 
352 
   if(DebugGetAnforderung && UebertragungAbgeschlossen)               // Bei Get werden die vom PC einstellbaren Werte vom PC zurückgelesen
 359 
   if(DebugGetAnforderung && UebertragungAbgeschlossen)               // Bei Get werden die vom PC einstellbaren Werte vom PC zurückgelesen
Line 357... Line 364...
357 
 
 364 
 
358 
    if((CheckDelay(Debug_Timer) || DebugDataAnforderung) && UebertragungAbgeschlossen)  
 365 
    if((CheckDelay(Debug_Timer) || DebugDataAnforderung) && UebertragungAbgeschlossen)  
359 
         {
 366 
         {
360 
          SendOutData('D',MeineSlaveAdresse,(unsigned char *) &DebugOut,sizeof(DebugOut));
 367 
          SendOutData('D',MeineSlaveAdresse,(unsigned char *) &DebugOut,sizeof(DebugOut));
- 
 
 368 
          DebugDataAnforderung = 0;
- 
 
 369 
                  //Salvo 26.10.2007  Counter fuer Erkennung von fehlenden Daten per Bluetoothuebertragung
- 
 
 370 
                  dataset_cnt++;
361 
          DebugDataAnforderung = 0;
 371 
                  // Salvo End
362 
          Debug_Timer = SetDelay(MIN_DEBUG_INTERVALL);  
 372 
          Debug_Timer = SetDelay(MIN_DEBUG_INTERVALL);  
363 
         }
 373 
         }
364 
    if(DebugTextAnforderung != 255) // Texte für die Analogdaten
 374 
    if(DebugTextAnforderung != 255) // Texte für die Analogdaten
365 
     {
 375 
     {