Subversion Repositories FlightCtrl

Rev

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

Rev 2180 Rev 2183
Line 126... Line 126...
126 
    "Gyro Compass    ",
 126 
    "Gyro Compass    ",
127 
    "Motor 1         ",
 127 
    "Motor 1         ",
128 
    "Motor 2         ",
 128 
    "Motor 2         ",
129 
    "Motor 3         ",
 129 
    "Motor 3         ",
130 
    "Motor 4         ", //15
 130 
    "Motor 4         ", //15
131 
    "16              ",
 131 
    "16 Vario        ",
132 
    "17              ",
 132 
    "17 HightDeviatio",
133 
    "18              ",
 133 
    "18 I Gas        ",
134 
    "19              ",
 134 
    "19 ACC Gas      ",
135 
    "Servo           ", //20
 135 
    "20 Vario Gas    ", //20 servo
136 
    "Hovergas        ",
 136 
    "Hovergas        ",
137 
    "Current [0.1A]  ",
 137 
    "22 Setp.trimm   ",    //"Current [0.1A]  ",
138 
    "Capacity [mAh]  ",
 138 
    "Capacity [mAh]  ",
139 
    "Height Setpoint ",
 139 
    "Height Setpoint ",
140 
    "25              ", //25
 140 
    "25 ACC-Integral ", //25
141 
    "26              ", //"26 CPU OverLoad ",
 141 
    "26 Gasreduction ", //"26 CPU OverLoad ",
142 
    "Compass Setpoint",
 142 
    "27 fileter      ",//"Compass Setpoint",
143 
    "I2C-Error       ",
 143 
    "I2C-Error       ",
144 
    "BL Limit        ",
 144 
    "29 I            ",//    "BL Limit        ",
145 
    "GPS_Nick        ", //30
 145 
    "GPS_Nick        ", //30
146 
    "GPS_Roll        "
 146 
    "GPS_Roll        "
147 
};
 147 
};
Line 744... Line 744...
744 
    if(((DebugDataIntervall>0 && CheckDelay(Debug_Timer)) || DebugDataAnforderung) && UebertragungAbgeschlossen)
 744 
    if(((DebugDataIntervall>0 && CheckDelay(Debug_Timer)) || DebugDataAnforderung) && UebertragungAbgeschlossen)
745 
         {
 745 
         {
746 
                  CopyDebugValues();
 746 
                  CopyDebugValues();
747 
          SendOutData('D', FC_ADDRESS, 1, (unsigned char *) &DebugOut,sizeof(DebugOut));
 747 
          SendOutData('D', FC_ADDRESS, 1, (unsigned char *) &DebugOut,sizeof(DebugOut));
748 
          DebugDataAnforderung = 0;
 748 
          DebugDataAnforderung = 0;
- 
 
 749 
DebugOut.Analog[16] = 0;
749 
          if(DebugDataIntervall>0) Debug_Timer = SetDelay(DebugDataIntervall);
 750 
          if(DebugDataIntervall>0) Debug_Timer = SetDelay(DebugDataIntervall);
- 
 
 751 
 
750 
         }
 752 
         }
751 
    if(Intervall3D > 0 && CheckDelay(Timer3D) && UebertragungAbgeschlossen)
 753 
    if(Intervall3D > 0 && CheckDelay(Timer3D) && UebertragungAbgeschlossen)
752 
         {
 754 
         {
753 
                  Data3D.Winkel[0] = (int) (IntegralNick / (EE_Parameter.GyroAccFaktor * 4));  // etwa in 0.1 Grad
 755 
                  Data3D.Winkel[0] = (int) (IntegralNick / (EE_Parameter.GyroAccFaktor * 4));  // etwa in 0.1 Grad
754 
                  Data3D.Winkel[1] = (int) (IntegralRoll / (EE_Parameter.GyroAccFaktor * 4));  // etwa in 0.1 Grad
 756 
                  Data3D.Winkel[1] = (int) (IntegralRoll / (EE_Parameter.GyroAccFaktor * 4));  // etwa in 0.1 Grad