WebSVN - NaviCtrl - Diff - Rev 386 and 388

         if(SPI_RxBuffer_Request)
+        {
                 // avoid sending data via SPI during the update of the  ToFlightCtrl structure
                 VIC_ITCmd(SSP0_ITLine, DISABLE); // disable SPI interrupt
                 ToFlightCtrl.CompassHeading = Compass_Heading;
-//ToFlightCtrl.CompassHeading += 360 + ((s32) Poti8 - 128);
-//ToFlightCtrl.CompassHeading %= 360;
                 DebugOut.Analog[10] = ToFlightCtrl.CompassHeading;
                 if(ToFlightCtrl.CompassHeading >= 0) ToFlightCtrl.CompassHeading = (360 + ToFlightCtrl.CompassHeading + FromFlightCtrl.GyroYaw / 12) % 360;
 //              ToFlightCtrl.MagVecX = MagVector.X;
 //              ToFlightCtrl.MagVecY = MagVector.Y;
                 ToFlightCtrl.MagVecZ = MagVector.Z;
                                 else
+                                {
                                         ToFlightCtrl.Param.sInt[5] = (s16)ToFC_AltitudeSetpoint;
+                                }
                                 break;
-/*
-typedef struct
-{
-  unsigned char StartByte;  //0         // 0x7C
-  unsigned char Packet_ID;  //1         // 0x89  - Vario ID
-  unsigned char WarnBeep;   //2         // Anzahl der Töne 0..36
-  unsigned char Heading;        //3     // 1 = 2°
-  unsigned int Speed;           //4+5   // in km/h
-  unsigned char Lat_North;      //6
-  unsigned char Lat_G;      //7
-  unsigned char Lat_M;      //8
-  unsigned char Lat_Sek1;       //9
-  unsigned char Lat_Sek2;       //10
-  unsigned char Lon_East;       //11
-  unsigned char Lon_G;      //12
-  unsigned char Lon_M;      //13
-  unsigned char Lon_Sek1;       //14
-  unsigned char Lon_Sek2;       //15
-  unsigned int Distance;        //16+17    // 9000 = 0m
-  unsigned int Altitude;        //18+19    // 500 = 0m
-  unsigned int m_sec;           //20+21    // 3000 = 0
-  unsigned int m_3sec;          //22+23    // 3000 = 0
-  unsigned int m_10sec;         //24+25    // 3000 = 0
-  unsigned char NullByte;       // 0x00
-  unsigned char NullByte1;      // 0x00
-  unsigned char EndByte;                // 0x7D
-} GPSPacket_t;
-*/
-/*
-typedef struct
-{
-  unsigned char StartByte;      //0 0x7C
-  unsigned char Packet_ID;      //1 HOTT_GENERAL_PACKET_ID
-  unsigned char WarnBeep;       //2 Anzahl der Töne 0..36
-  unsigned char VoltageCell1;   //3 208 = 4,16V  (Voltage * 50 = Wert)
-  unsigned char VoltageCell2;   //4
-  unsigned char VoltageCell3;   //5
-  unsigned char VoltageCell4;   //6
-  unsigned char VoltageCell5;   //7
-  unsigned char VoltageCell6;   //8
-  unsigned int  Battery1;               //9   51  = 5,1V
-  unsigned int  Battery2;               //11  51  = 5,1V
-  unsigned char Temperature1;   //13  44 = 24°C, 0 = -20°C
-  unsigned char Temperature2;   //14  44 = 24°C, 0 = -20°C
-  unsigned char FuelPercent;    //15
-    signed int  FuelCapacity;   //16
-  unsigned int  Rpm;
-  unsigned int  Altitude;
-  unsigned int  m_sec;              // 3000 = 0
-  unsigned char m_3sec;             // 120 = 0
-  unsigned int  Current;                // 1 = 0.1A
-  unsigned int  InputVoltage;   // 66  = 6,6V
-  unsigned int  Capacity;               // 1  = 10mAh
-  unsigned char NullByte1;      // 0x00
-  unsigned char NullByte2;      // 0x00
-  unsigned char EndByte;                // 0x7D
-} HoTTGeneral_t;
-*/
                         case SPI_NCCMD_HOTT_INFO:
                                 switch(hott_index++)
+                                {
                                 case 0:
                                         //Dezimalgrad            --> Grad mit Dezimalminuten     --> Grad, Minuten, Sekunden
                                          else                                                                                            // Ansonsten die aktuelle Richtung übernehmen
                                           HeadFreeStartAngle = (3600 + FromFlightCtrl.GyroHeading /*+ Parameter.OrientationAngle * 150*/) % 3600; // in 0.1°
+                                        }
+                                }
-//DebugOut.Analog[16] = HeadFreeStartAngle;
                                 Parameter.ActiveSetting = FromFlightCtrl.Param.Byte[9];
                                 DebugOut.Analog[5] = FC.StatusFlags;
                                 NaviData.FCStatusFlags = FC.StatusFlags;
                                 FC.StatusFlags2 = FromFlightCtrl.Param.Byte[11];
 /*
-//+++++++++++++++++++++++++++++++++++++++++++++++++++
-*/
-/*
-if(Parameter.User8 < 100) FC.StatusFlags = 0;
-else
-if(Parameter.User8 < 150) FC.StatusFlags = FC_STATUS_START;
-else FC.StatusFlags = FC_STATUS_FLY | FC_STATUS_MOTOR_RUN;
-BL_MinOfMaxPWM = 255;
+//+++++++++++++++++++++++++++++++++++++++++++++++++++
 */
                 GPS_Navigation(&GPSData, &(ToFlightCtrl.GPSStick));
                 ClearFCStatusFlags = 1;
                 if(counter)

Subversion Repositories NaviCtrl

(root)/tags/V2.00a/spi_slave.c @ 658 - Rev 386 → 388