WebSVN - FlightCtrl - Path Comparison - /branches/thjac/ Rev 1125 and /branches/thjac/ Rev 1126

Ignore whitespace Rev 1125 → Rev 1126

 /branches/thjac/V1_10/main.c
 ,254 → 51,231
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #include "main.h"
-unsigned char EEPromArray[E2END+1] EEMEM;
+unsigned char EEPromArray[E2END + 1] EEMEM;
 unsigned char PlatinenVersion = 10;
 unsigned char SendVersionToNavi = 1;
 // -- Parametersatz aus EEPROM lesen ---
 // number [1..5]
-void ReadParameterSet(unsigned char number, unsigned char *buffer, unsigned char length)
-{
-   if((number > 5)||(number < 1)) number = 3;
-   eeprom_read_block(buffer, &EEPromArray[EEPROM_ADR_PARAM_BEGIN + length * (number - 1)], length);
-   LED_Init();
+void ReadParameterSet(unsigned char number, unsigned char *buffer, unsigned char length) {
+    if ((number > 5) || (number < 1)) number = 3;
+    eeprom_read_block(buffer, &EEPromArray[EEPROM_ADR_PARAM_BEGIN + length * (number - 1)], length);
+    LED_Init();
 }
 // -- Parametersatz ins EEPROM schreiben ---
 // number [1..5]
-void WriteParameterSet(unsigned char number, unsigned char *buffer, unsigned char length)
-{
-   if(number > 5) number = 5;
-   if(number < 1) return;
-   eeprom_write_block(buffer, &EEPromArray[EEPROM_ADR_PARAM_BEGIN + length * (number - 1)], length);
-   SetActiveParamSetNumber(number);
-   LED_Init();
+void WriteParameterSet(unsigned char number, unsigned char *buffer, unsigned char length) {
+    if (number > 5) number = 5;
+    if (number < 1) return;
+    eeprom_write_block(buffer, &EEPromArray[EEPROM_ADR_PARAM_BEGIN + length * (number - 1)], length);
+    SetActiveParamSetNumber(number);
+    LED_Init();
 }
-unsigned char GetActiveParamSetNumber(void)
-{
-        unsigned char set;
-        set = eeprom_read_byte(&EEPromArray[EEPROM_ADR_ACTIVE_SET]);
-        if((set > 5) || (set < 1))
-        {
-                set = 3;
-                SetActiveParamSetNumber(set);                           // diesen Parametersatz als aktuell merken
-        }
-        return(set);
+unsigned char GetActiveParamSetNumber(void) {
+    unsigned char set;
+    set = eeprom_read_byte(&EEPromArray[EEPROM_ADR_ACTIVE_SET]);
+    if ((set > 5) || (set < 1)) {
+        set = 3;
+        SetActiveParamSetNumber(set); // diesen Parametersatz als aktuell merken
+    }
+    return (set);
 }
-void SetActiveParamSetNumber(unsigned char number)
-{
-        if(number > 5) number = 5;
-        if(number < 1) return;
-        eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACTIVE_SET], number);                                 // diesen Parametersatz als aktuell merken
+void SetActiveParamSetNumber(unsigned char number) {
+    if (number > 5) number = 5;
+    if (number < 1) return;
+    eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACTIVE_SET], number); // diesen Parametersatz als aktuell merken
 }
+void CalMk3Mag(void) {
+    static unsigned char stick = 1;
-void CalMk3Mag(void)
-{
- static unsigned char stick = 1;
- if(PPM_in[EE_Parameter.Kanalbelegung[K_NICK]] > -20) stick = 0;
- if((PPM_in[EE_Parameter.Kanalbelegung[K_NICK]] < -70) && !stick)
-  {
-   stick = 1;
-   WinkelOut.CalcState++;
-   if(WinkelOut.CalcState > 4)
-    {
-//     WinkelOut.CalcState = 0; // in Uart.c
-     beeptime = 1000;
+    if (PPM_in[EE_Parameter.Kanalbelegung[K_NICK]] > -20) stick = 0;
+    if ((PPM_in[EE_Parameter.Kanalbelegung[K_NICK]] < -70) && !stick) {
+        stick = 1;
+        WinkelOut.CalcState++;
+        if (WinkelOut.CalcState > 4) {
+            //     WinkelOut.CalcState = 0; // in Uart.c
+            beeptime = 1000;
+        } else Piep(WinkelOut.CalcState);
     }
-   else Piep(WinkelOut.CalcState);
-  }
-  DebugOut.Analog[19] = WinkelOut.CalcState;
+    DebugOut.Analog[19] = WinkelOut.CalcState;
 }
 //############################################################################
 //Hauptprogramm
-int main (void)
+int main(void)
 //############################################################################
 {
-        unsigned int timer;
+    unsigned int timer;
-        //unsigned int timer2 = 0;
-    DDRB  = 0x00;
+    //unsigned int timer2 = 0;
+    DDRB = 0x00;
     PORTB = 0x00;
-    for(timer = 0; timer < 1000; timer++); // verzögern
-    if(PINB & 0x01)
-     {
-      if(PINB & 0x02) PlatinenVersion = 13;
-       else           PlatinenVersion = 11;
-     }
-    else
-     {
-      if(PINB & 0x02) PlatinenVersion = 20;
-       else           PlatinenVersion = 10;
-     }
+    for (timer = 0; timer < 1000; timer++); // verzögern
+    if (PINB & 0x01) {
+        if (PINB & 0x02) PlatinenVersion = 13;
+        else PlatinenVersion = 11;
+    } else {
+        if (PINB & 0x02) PlatinenVersion = 20;
+        else PlatinenVersion = 10;
+    }
-    DDRC  = 0x81; // SCL
-    DDRC  |=0x40; // HEF4017 Reset
+    DDRC = 0x81; // SCL
+    DDRC |= 0x40; // HEF4017 Reset
     PORTC = 0xff; // Pullup SDA
-    DDRB  = 0x1B; // LEDs und Druckoffset
+    DDRB = 0x1B; // LEDs und Druckoffset
     PORTB = 0x01; // LED_Rot
-    DDRD  = 0x3E; // Speaker & TXD & J3 J4 J5
-    DDRD  |=0x80; // J7 -> Servo signal
-        PORTD = 0x77; // LED
+    DDRD = 0x3E; // Speaker & TXD & J3 J4 J5
+    DDRD |= 0x80; // J7 -> Servo signal
+    PORTD = 0x77; // LED
-    MCUSR &=~(1<<WDRF);
-    WDTCSR |= (1<<WDCE)|(1<<WDE);
+    MCUSR &= ~(1 << WDRF);
+    WDTCSR |= (1 << WDCE) | (1 << WDE);
     WDTCSR = 0;
     beeptime = 2000;
-        StickGier = 0; PPM_in[K_GAS] = 0;StickRoll = 0; StickNick = 0;
+    StickGier = 0;
+    PPM_in[K_GAS] = 0;
+    StickRoll = 0;
+    StickNick = 0;
     ROT_OFF;
     Timer_Init();
-        UART_Init();
+    UART_Init();
     rc_sum_init();
-        ADC_Init();
-        i2c_init();
-        SPI_MasterInit();
+    ADC_Init();
+    i2c_init();
+    SPI_MasterInit();
-        sei();
+    sei();
-        printf("\n\rFlightControl\n\rHardware:%d.%d\n\rSoftware:V%d.%d%c ",PlatinenVersion/10,PlatinenVersion%10, VERSION_MAJOR, VERSION_MINOR,VERSION_PATCH + 'a');
-        printf("\n\r==============================");
+    printf("\n\rFlightControl\n\rHardware:%d.%d\n\rSoftware:V%d.%d%c ", PlatinenVersion / 10, PlatinenVersion % 10, VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH + 'a');
+    printf("\n\r==============================");
-        GRN_ON;
+    GRN_ON;
-        ReadParameterSet(3, (unsigned char *) &EE_Parameter.Kanalbelegung[0], 9); // read only the first bytes
+    ReadParameterSet(3, (unsigned char *) & EE_Parameter.Kanalbelegung[0], 9); // read only the first bytes
     // valid Stick-Settings?
-    if(eeprom_read_byte(&EEPromArray[EEPROM_ADR_VALID]) == 255 || eeprom_read_byte(&EEPromArray[EEPROM_ADR_VALID]) < EE_DATENREVISION ||
-        EE_Parameter.Kanalbelegung[0] > 9 || EE_Parameter.Kanalbelegung[1] > 9 || EE_Parameter.Kanalbelegung[2] > 9 || EE_Parameter.Kanalbelegung[3] > 9)
-           {
-            printf("\n\rInit. EEPROM: Generating Default-Parameter and Stick-Settings...");
+    if (eeprom_read_byte(&EEPromArray[EEPROM_ADR_VALID]) == 255 || eeprom_read_byte(&EEPromArray[EEPROM_ADR_VALID]) < EE_DATENREVISION ||
+            EE_Parameter.Kanalbelegung[0] > 9 || EE_Parameter.Kanalbelegung[1] > 9 || EE_Parameter.Kanalbelegung[2] > 9 || EE_Parameter.Kanalbelegung[3] > 9) {
+        printf("\n\rInit. EEPROM: Generating Default-Parameter and Stick-Settings...");
         DefaultStickMapping();
-       }
-    else if(eeprom_read_byte(&EEPromArray[EEPROM_ADR_VALID]) != EE_DATENREVISION) printf("\n\rInit. EEPROM: Generating Default-Parameter using old Stick Settings");
+    } else if (eeprom_read_byte(&EEPromArray[EEPROM_ADR_VALID]) != EE_DATENREVISION) printf("\n\rInit. EEPROM: Generating Default-Parameter using old Stick Settings");
-    if(eeprom_read_byte(&EEPromArray[EEPROM_ADR_VALID]) != EE_DATENREVISION)
-        {
-          DefaultKonstanten1();
-          for (unsigned char i=1;i<6;i++)
-      {
-       if(i==2) DefaultKonstanten2(); // Kamera
-       if(i==3) DefaultKonstanten3(); // Beginner
-       if(i>3)  DefaultKonstanten2(); // Kamera
-       WriteParameterSet(i, (unsigned char *) &EE_Parameter.Kanalbelegung[0], STRUCT_PARAM_LAENGE);
-      }
-          SetActiveParamSetNumber(3); // default-Setting
-          eeprom_write_byte(&EEPromArray[EEPROM_ADR_VALID], EE_DATENREVISION);
-        }
+    if (eeprom_read_byte(&EEPromArray[EEPROM_ADR_VALID]) != EE_DATENREVISION) {
+        DefaultKonstanten1();
+        for (unsigned char i = 1; i < 6; i++) {
+            if (i == 2) DefaultKonstanten2(); // Kamera
+            if (i == 3) DefaultKonstanten3(); // Beginner
+            if (i > 3) DefaultKonstanten2(); // Kamera
+            WriteParameterSet(i, (unsigned char *) & EE_Parameter.Kanalbelegung[0], STRUCT_PARAM_LAENGE);
+        }
+        SetActiveParamSetNumber(3); // default-Setting
+        eeprom_write_byte(&EEPromArray[EEPROM_ADR_VALID], EE_DATENREVISION);
+    }
-    if(eeprom_read_byte(&EEPromArray[EEPROM_ADR_ACC_NICK]) > 4)
-     {
-       printf("\n\rACC nicht abgeglichen!");
-     }
+    if (eeprom_read_byte(&EEPromArray[EEPROM_ADR_ACC_NICK]) > 4) {
+        printf("\n\rACC nicht abgeglichen!");
+    }
-        ReadParameterSet(GetActiveParamSetNumber(), (unsigned char *) &EE_Parameter.Kanalbelegung[0], STRUCT_PARAM_LAENGE);
+    ReadParameterSet(GetActiveParamSetNumber(), (unsigned char *) & EE_Parameter.Kanalbelegung[0], STRUCT_PARAM_LAENGE);
     printf("\n\rBenutze Parametersatz %d", GetActiveParamSetNumber());
-        if(EE_Parameter.GlobalConfig & CFG_HOEHENREGELUNG)
-         {
-           printf("\n\rAbgleich Luftdrucksensor..");
-           timer = SetDelay(1000);
-       SucheLuftruckOffset();
-           while (!CheckDelay(timer));
-       printf("OK\n\r");
-        }
+    if (EE_Parameter.GlobalConfig & CFG_HOEHENREGELUNG) {
+        printf("\n\rAbgleich Luftdrucksensor..");
+        timer = SetDelay(1000);
+        SucheLuftruckOffset();
+        while (!CheckDelay(timer));
+        printf("OK\n\r");
+    }
-        SetNeutral();
+    SetNeutral();
-        ROT_OFF;
+    ROT_OFF;
     beeptime = 2000;
     ExternControl.Digital[0] = 0x55;
-        printf("\n\rSteuerung: ");
-        if (EE_Parameter.GlobalConfig & CFG_HEADING_HOLD) printf("HeadingHold");
-        else printf("Neutral");
+    printf("\n\rSteuerung: ");
+    if (EE_Parameter.GlobalConfig & CFG_HEADING_HOLD) printf("HeadingHold");
+    else printf("Neutral");
-        printf("\n\n\r");
+    printf("\n\n\r");
     LcdClear();
     I2CTimeout = 5000;
     WinkelOut.Orientation = 1;
-        while (1)
-        {
+    while (1) {
-                if(UpdateMotor)      // ReglerIntervall
-            {
-                    UpdateMotor=0;
-//PORTD |= 0x08;
-            if(WinkelOut.CalcState) CalMk3Mag();
+        if (UpdateMotor) // ReglerIntervall
+        {
+            UpdateMotor = 0;
+            //PORTD |= 0x08;
+            if (WinkelOut.CalcState) CalMk3Mag();
             else MotorRegler();
-//PORTD &= ~0x08;
+            //PORTD &= ~0x08;
             SendMotorData();
             ROT_OFF;
-            if(PcZugriff) PcZugriff--;
-             else
-              {
-                           ExternControl.Config = 0;
-               ExternStickNick = 0;
-               ExternStickRoll = 0;
-               ExternStickGier = 0;
-              }
-            if(SenderOkay)  SenderOkay--;
-            if(!I2CTimeout)
-                {
-                 I2CTimeout = 5;
-                 i2c_reset();
-                  if((BeepMuster == 0xffff) && MotorenEin)
-                   {
+            if (PcZugriff) PcZugriff--;
+            else {
+                ExternControl.Config = 0;
+                ExternStickNick = 0;
+                ExternStickRoll = 0;
+                ExternStickGier = 0;
+            }
+            if (SenderOkay) SenderOkay--;
+            if (!I2CTimeout) {
+                I2CTimeout = 5;
+                i2c_reset();
+                if ((BeepMuster == 0xffff) && MotorenEin) {
                     beeptime = 10000;
                     BeepMuster = 0x0080;
-                   }
                 }
-            else
-                {
-                 I2CTimeout--;
-                 ROT_OFF;
+            } else {
+                I2CTimeout--;
+                ROT_OFF;
+            }
+            if (SIO_DEBUG && (!UpdateMotor || !MotorenEin)) {
+                DatenUebertragung();
+                BearbeiteRxDaten();
+            } else BearbeiteRxDaten();
+            if (CheckDelay(timer)) {
+                if (UBat < EE_Parameter.UnterspannungsWarnung) {
+                    if (BeepMuster == 0xffff) {
+                        beeptime = 6000;
+                        BeepMuster = 0x0300;
+                    }
                 }
-            if(SIO_DEBUG && (!UpdateMotor || !MotorenEin))
-              {
-               DatenUebertragung();
-               BearbeiteRxDaten();
-              }
-              else BearbeiteRxDaten();
-         if(CheckDelay(timer))
-            {
-            if(UBat < EE_Parameter.UnterspannungsWarnung)
-                {
-                  if(BeepMuster == 0xffff)
-                   {
-                    beeptime = 6000;
-                    BeepMuster = 0x0300;
-                   }
-                }
-/*           if(SendVersionToNavi)
-              {
-               SPI_StartTransmitPacket(SPI_CMD_VERSION);//#
-               SendVersionToNavi = 0;
-              }
-              else  SPI_StartTransmitPacket(SPI_CMD_VALUE);//#
-*/
-             SPI_StartTransmitPacket();//#
+                /*           if(SendVersionToNavi)
+                              {
+                               SPI_StartTransmitPacket(SPI_CMD_VERSION);//#
+                               SendVersionToNavi = 0;
+                              }
+                              else  SPI_StartTransmitPacket(SPI_CMD_VALUE);//#
+                 */
+                SPI_StartTransmitPacket(); //#
-             SendSPI = 4;
-                         timer = SetDelay(20);
+                SendSPI = 4;
+                timer = SetDelay(20);
             }
-           //if(UpdateMotor) DebugOut.Analog[26]++;
-           LED_Update();
-          }
-     if(!SendSPI) { SPI_TransmitByte(); }
+            //if(UpdateMotor) DebugOut.Analog[26]++;
+            LED_Update();
+        }
+        if (!SendSPI) {
+            SPI_TransmitByte();
+        }
     }
- return (1);
+    return (1);
 }

Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1125 → Rev 1126