WebSVN - FlightCtrl - Diff - Rev 2081 and 2093 - /branches/V0.88e_ACC-HH_HR

 // + Note: For information on license extensions (e.g. commercial use), please contact us at info(@)hisystems.de.
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #include "main.h"
 unsigned char DisableRcOffBeeping = 0;
 unsigned char PlatinenVersion = 10;
+unsigned char SendVersionToNavi = 1;
 unsigned char BattLowVoltageWarning = 94;
 unsigned int FlugMinuten = 0,FlugMinutenGesamt = 0;
 unsigned int FlugSekunden = 0;
 pVoidFnct_pVoidFnctChar_const_fmt _printf_P;
 unsigned char FoundMotors = 0;
 unsigned char JetiBeep = 0; // to allow any Morse-Beeping of the Jeti-Box
 unsigned char metrotest;
 void PrintLine(void)
+{
  printf("\n\r===================================");
+}
 static char panodelay = 0; ///martinw
 //static char panoleddelay = 0; ///martinw
 void CalMk3Mag(void)
                         Piep(cells, 200);
                         printf(" %d Cells ", cells);
+                }
+        }
         else BattLowVoltageWarning = EE_Parameter.UnterspannungsWarnung;
-        if(print) printf(" Low warning: %d.%d",BattLowVoltageWarning/10,BattLowVoltageWarning%10);
+        //if(print) printf(" Low warning: %d.%d",BattLowVoltageWarning/10,BattLowVoltageWarning%10);
+        if(print) printf("Low Batt level: %d.%d",BattLowVoltageWarning/10,BattLowVoltageWarning%10); /// Martinw; removed memorysaving
+}
 //############################################################################
 //Hauptprogramm
         UART_Init();
     rc_sum_init();
         ADC_Init();
         I2C_Init(1);
         SPI_MasterInit();
-        Capacity_Init();
+        //Capacity_Init(); //Moved by metro
         LIBFC_Init();
         GRN_ON;
     sei();
         ParamSet_Init();
+    Capacity_Init(); //Moved by metro
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // + Check connected BL-Ctrls
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
     if(RequiredMotors < FoundMotors) VersionInfo.HardwareError[1] |= FC_ERROR1_MIXER;
         //if(EE_Parameter.GlobalConfig & CFG_HOEHENREGELUNG)
+        {
                 //printf("\n\rCalibrating pressure sensor..");
-                printf("\n\rCalibrating pressure sensor..");
+                printf("\n\rCal. pressure sensor");/// Martinw; removed memorysaving
                 timer = SetDelay(1000);
                 SucheLuftruckOffset();
                 while (!CheckDelay(timer));
                 FlugMinuten = 0;
                 FlugMinutenGesamt = 0;
+        }
     printf("\n\rFlight-time %u min Total:%u min", FlugMinuten, FlugMinutenGesamt);
+#ifdef WITH_MKTOOL_Display                      // MartinW; for no MKT Display main.h
 #warning : "### with MKTool Display ###"
+    LcdClear();
+        #endif
     LcdClear();
     I2CTimeout = 5000;
     WinkelOut.Orientation = 1;
     LipoDetection(1);
         LIBFC_ReceiverInit(EE_Parameter.Receiver);
         Debug(ANSI_CLEAR "FC-Start!\n\rFlugzeit: %d min", FlugMinutenGesamt);   // Note: this won't waste flash memory, if #DEBUG is not active
     DebugOut.Status[0] = 0x01 | 0x02;
         JetiBeep = 0;
+    if(EE_Parameter.ExtraConfig & CFG_NO_RCOFF_BEEPING)   DisableRcOffBeeping = 1;
+//#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))      ///MartinW; only for 1284er
+//#warning : "### with Sponsored Message ###"
+    // printf("\n\rJETI+ / HoTT+ Version sponsored by Flyinghigh.ch, progammed by metro, MartinW\n\r");
+        printf("\n\rACC-HH Version progammed by MartinR\n\r");
+//#endif
     if(EE_Parameter.ExtraConfig & CFG_NO_RCOFF_BEEPING)   DisableRcOffBeeping = 1;
         while (1)
+        {
         if(ReceiverUpdateModeActive) while (1) PORTC &= ~(1<<7); // Beeper off
                         BearbeiteRxDaten();
                         if(CheckDelay(timer))
+                        {
                                 static unsigned char second;
                                 timer += 20; // 20 ms interval
-#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
+#if ((defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) && defined(WITH_HOTTMENU))
+        #warning : "### with Hottmenu ###"
                                 if(EE_Parameter.Receiver == RECEIVER_HOTT) HoTT_Menu();
 #endif
                                 if(MissingMotor)
+                                 {
                                   VersionInfo.HardwareError[1] |= FC_ERROR1_BL_MISSING;
                    SetParamByte(PID_FLIGHT_MINUTES_TOTAL,FlugMinutenGesamt / 256);
                    SetParamByte(PID_FLIGHT_MINUTES_TOTAL+1,FlugMinutenGesamt % 256);
                                    timer = SetDelay(20); // falls "timer += 20;" mal nicht geht
+                             }
+                        }
+#ifdef WITH_PANOTRIGGER         ///  MartinW main.h means no memsave
+#warning : "### with  Panorama Trigger Function ###"
+//// Pano Trigger
+if(Parameter_UserParam8 >= 200) //enable/disable Pano Trigger Function
+{
+        if(Parameter_UserParam4 <=9) { Parameter_UserParam4 = 10; }
+        degreedivold = degreediv;
+        degreediv = (ErsatzKompass / GIER_GRAD_FAKTOR) / Parameter_UserParam4;//Division
+        if((degreediv-degreedivold)==2||(degreediv-degreedivold)==1||(degreediv-degreedivold)== -2||(degreediv-degreedivold)== -1)
+                {
+                if(panodelay == 0)
+                        {
+                        panotrigger= 1; // muss wieder geleert werden
+                        ROT_ON;
+                        J16_ON;
+                        panodelay = Parameter_UserParam5;
+                        }
+                }
+                else
+                        {
+                        if(panodelay <= Parameter_UserParam6) //ms Intervall
+                                                {
+                                                //panoleddelay = Parameter_UserParam6;
+                                                J16_OFF;
+                                                ROT_OFF;
+                                                }
+                        if(panodelay > 0)
+                                {
+                                panodelay--;
+                                }
+                        }
+}// END if(Parameter_UserParam4 >= 1)
+//// Pano Trigger
+#else
+#warning : "### without  Panorama Trigger Function ###"
+#endif
            LED_Update();
            Capacity_Update();
            } //else DebugOut.Analog[26]++;
+          }
+         }

Subversion Repositories FlightCtrl

(root)/branches/V0.88e_ACC-HH_HR_MartinR/main.c - Rev 2081 → 2093