WebSVN - FlightCtrl - Path Comparison - / Rev 2189 and / Rev 2190

Ignore whitespace Rev 2189 → Rev 2190

 /trunk/hottmenu.c
 ,6 → 88,7
 ElectricAirPacket_t ElectricAirPacket;
 HoTTGeneral_t HoTTGeneral;
 unsigned char SpeakHoTT = SPEAK_MIKROKOPTER;
+unsigned char ToNC_SpeakHoTT = 0;
 int HoTTVarioMeter = 0;
 const char PROGMEM MIKROKOPTER[] =      {"     MikroKopter     "};
 const char PROGMEM UNDERVOLTAGE[] =     {" !! LiPo voltage !!  "};
 ,6 → 204,7
   static int repeat;
 //if(Parameter_UserParam1) return(Parameter_UserParam1);
 //DebugOut.Analog[16] = 0;
+  ToNC_SpeakHoTT = SpeakHoTT;
   if(FC_StatusFlags & FC_STATUS_LOWBAT) status = VOICE_MINIMALE_EINGANSSPANNUNG;
   else
   if(NC_ErrorCode)
 ,12 → 211,12
    {
     if(MotorenEin || !pgm_read_byte(&HOTT_ERROR[NC_ErrorCode][1])) status = pgm_read_byte(&HOTT_ERROR[NC_ErrorCode][0]);
    }
   if(!status)
    {
         if(!(GetParamByte(PID_SPEAK_HOTT_CFG) & 0x01)) SpeakHoTT = 0;  // is the voice wanted?
     else status = SpeakHoTT;
-   };
+   }
+   else ToNC_SpeakHoTT = status;
   if(old_status == status)
    {

/trunk/hottmenu.h
49,6 → 49,7
extern unsigned char HottKeyboard,HoTT_RequestedSensor;
extern unsigned char HottUpdate(unsigned char key);
extern unsigned char SpeakHoTT;
extern unsigned char ToNC_SpeakHoTT;
extern volatile unsigned char *HoTT_DataPointer;
extern unsigned char MaxBlTempertaure;

 /trunk/spi.c
 ,6 → 225,12
             break;
          case SPI_FCCMD_PARAMETER2:
                                 ToNaviCtrl.Param.Byte[0] = EE_Parameter.NaviOut1Parameter;     // Distance between Photo releases
+#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
+                                if(EE_Parameter.Receiver != RECEIVER_HOTT) HoTT_Waring(); // create the ToNC_SpeakHoTT
+                                ToNaviCtrl.Param.Byte[1] = ToNC_SpeakHoTT;
+#else
+                                ToNaviCtrl.Param.Byte[1] = 0;
+#endif
             break;
          case SPI_FCCMD_STICK:
               cli();