WebSVN - FlightCtrl - Diff - Rev 2518 and 2527



                        ToNaviCtrl.Param.Int[5] = UBat; // 10 & 11
                                if(!(PORTC & (1<<PORTC2))) FC_StatusFlags2 &= ~FC_STATUS2_OUT1_ACTIVE;       // Out1 (J16)
        break;
     case SPI_FCCMD_BL_ACCU:
                        ToNaviCtrl.Param.Int[0] = Capacity.ActualCurrent; // 0.1A
                                ToNaviCtrl.Param.Byte[2] = motorindex | Out1ChangedFlag; // 0x80 this Flag marks a changed Out1
                                ToNaviCtrl.Param.Byte[3] = Capacity.MinOfMaxPWM;
                                ToNaviCtrl.Param.Byte[4] = GetChannelValue(EE_Parameter.NaviGpsModeChannel);  // GPS-Mode control 
                                ToNaviCtrl.Param.Byte[5] = VarioCharacter;
                                ToNaviCtrl.Param.Byte[6] = Motor[motorindex].NotReadyCnt;
                                ToNaviCtrl.Param.Byte[7] = Motor[motorindex].Version;
                                ToNaviCtrl.Param.Byte[8] = Motor[motorindex].MaxPWM;
                                ToNaviCtrl.Param.Byte[9] = Motor[motorindex].State;
                                ToNaviCtrl.Param.Byte[10] = Motor[motorindex].Temperature;
                                ToNaviCtrl.Param.Byte[11] = Motor[motorindex].Current;
 
                                if(Mixer.Motor[++motorindex][0] <= 0) // next motor is not used ?
                                  while(Mixer.Motor[motorindex][0] <= 0 && motorindex) motorindex = (motorindex + 1) % 13;
                                Out1ChangedFlag = 0;
        break;
         case SPI_FCCMD_SLOW:
               switch(slow_command)
           {
                         case 0:

Subversion Repositories FlightCtrl

(root)/tags/V2.10c/spi.c @ 2581 - Rev 2518 → 2527

Rev 2518		Rev 2527
Line 179...		Line 179...
179	ToNaviCtrl.Param.Int[5] = UBat; // 10 & 11	179	ToNaviCtrl.Param.Int[5] = UBat; // 10 & 11
180	if(!(PORTC & (1<<PORTC2))) FC_StatusFlags2 &= ~FC_STATUS2_OUT1_ACTIVE; // Out1 (J16)	180	if(!(PORTC & (1<<PORTC2))) FC_StatusFlags2 &= ~FC_STATUS2_OUT1_ACTIVE; // Out1 (J16)
181	break;	181	break;
182	case SPI_FCCMD_BL_ACCU:	182	case SPI_FCCMD_BL_ACCU:
183	ToNaviCtrl.Param.Int[0] = Capacity.ActualCurrent; // 0.1A	183	ToNaviCtrl.Param.Int[0] = Capacity.ActualCurrent; // 0.1A
184	ToNaviCtrl.Param.Byte[2] = motorindex;	184	ToNaviCtrl.Param.Byte[2] = motorindex \| Out1ChangedFlag; // 0x80 this Flag marks a changed Out1
185	ToNaviCtrl.Param.Byte[3] = Capacity.MinOfMaxPWM;	185	ToNaviCtrl.Param.Byte[3] = Capacity.MinOfMaxPWM;
186	ToNaviCtrl.Param.Byte[4] = GetChannelValue(EE_Parameter.NaviGpsModeChannel); // GPS-Mode control	186	ToNaviCtrl.Param.Byte[4] = GetChannelValue(EE_Parameter.NaviGpsModeChannel); // GPS-Mode control
187	ToNaviCtrl.Param.Byte[5] = VarioCharacter;	187	ToNaviCtrl.Param.Byte[5] = VarioCharacter;
188	ToNaviCtrl.Param.Byte[6] = Motor[motorindex].NotReadyCnt;	188	ToNaviCtrl.Param.Byte[6] = Motor[motorindex].NotReadyCnt;
189	ToNaviCtrl.Param.Byte[7] = Motor[motorindex].Version;	189	ToNaviCtrl.Param.Byte[7] = Motor[motorindex].Version;
190	ToNaviCtrl.Param.Byte[8] = Motor[motorindex].MaxPWM;	190	ToNaviCtrl.Param.Byte[8] = Motor[motorindex].MaxPWM;
191	ToNaviCtrl.Param.Byte[9] = Motor[motorindex].State;	191	ToNaviCtrl.Param.Byte[9] = Motor[motorindex].State;
192	ToNaviCtrl.Param.Byte[10] = Motor[motorindex].Temperature;	192	ToNaviCtrl.Param.Byte[10] = Motor[motorindex].Temperature;
193	ToNaviCtrl.Param.Byte[11] = Motor[motorindex].Current;	193	ToNaviCtrl.Param.Byte[11] = Motor[motorindex].Current;
194		-
195	if(Mixer.Motor[++motorindex][0] <= 0) // next motor is not used ?	194	if(Mixer.Motor[++motorindex][0] <= 0) // next motor is not used ?
196	while(Mixer.Motor[motorindex][0] <= 0 && motorindex) motorindex = (motorindex + 1) % 13;	195	while(Mixer.Motor[motorindex][0] <= 0 && motorindex) motorindex = (motorindex + 1) % 13;
-		196	Out1ChangedFlag = 0;
197	break;	197	break;
198	case SPI_FCCMD_SLOW:	198	case SPI_FCCMD_SLOW:
199	switch(slow_command)	199	switch(slow_command)
200	{	200	{
201	case 0:	201	case 0: