WebSVN - NaviCtrl - Diff - Rev 475 and 480



                                          HeadFreeStartAngle = GyroCompassCorrected; // in 0.1°   
                                        }
                                }
                                Parameter.ActiveSetting = FromFlightCtrl.Param.Byte[9];
                                FC.BAT_Voltage = FromFlightCtrl.Param.Byte[10];
                                DebugOut.Analog[7] = FC.BAT_Voltage;
                                DebugOut.Analog[5] = FC.StatusFlags;
                                NaviData.FCStatusFlags = FC.StatusFlags;
                                if(FC.StatusFlags2 & FC_STATUS2_WAIT_FOR_TAKEOFF) NaviData.FCStatusFlags &= ~FC_STATUS_FLY;
                                FC.StatusFlags2 = FromFlightCtrl.Param.Byte[11];
                                NaviData.FCStatusFlags2 = (NaviData.FCStatusFlags2 & (FC_STATUS2_OUT1_ACTIVE | FC_STATUS2_OUT2_ACTIVE)) | (FC.StatusFlags2 & (0xff - (FC_STATUS2_OUT1_ACTIVE | FC_STATUS2_OUT2_ACTIVE)));

                                Logging_FCStatusFlags2 |= FC.StatusFlags2;
                                break;

 
                        case SPI_FCCMD_BL_ACCU:
                                FC.BAT_Current = FromFlightCtrl.Param.Int[0];
                                DebugOut.Analog[8] = FC.BAT_Current;
                                FC.BAT_UsedCapacity = FromFlightCtrl.Param.Int[1];
                                Parameter.NaviGpsModeControl = FromFlightCtrl.Param.Byte[4];
                                FromFC_VarioCharacter = FromFlightCtrl.Param.Byte[5];
                                Motor_Version[FromFlightCtrl.Param.Byte[6]] = FromFlightCtrl.Param.Byte[7];

Subversion Repositories NaviCtrl

(root)/tags/V2.02a/spi_slave.c @ 617 - Rev 475 → 480

Rev 475		Rev 480
Line 614...		Line 614...
614	HeadFreeStartAngle = GyroCompassCorrected; // in 0.1°	614	HeadFreeStartAngle = GyroCompassCorrected; // in 0.1°
615	}	615	}
616	}	616	}
617	Parameter.ActiveSetting = FromFlightCtrl.Param.Byte[9];	617	Parameter.ActiveSetting = FromFlightCtrl.Param.Byte[9];
618	FC.BAT_Voltage = FromFlightCtrl.Param.Byte[10];	618	FC.BAT_Voltage = FromFlightCtrl.Param.Byte[10];
-		619	DebugOut.Analog[7] = FC.BAT_Voltage;
619	DebugOut.Analog[5] = FC.StatusFlags;	620	DebugOut.Analog[5] = FC.StatusFlags;
620	NaviData.FCStatusFlags = FC.StatusFlags;	621	NaviData.FCStatusFlags = FC.StatusFlags;
621	if(FC.StatusFlags2 & FC_STATUS2_WAIT_FOR_TAKEOFF) NaviData.FCStatusFlags &= ~FC_STATUS_FLY;	622	if(FC.StatusFlags2 & FC_STATUS2_WAIT_FOR_TAKEOFF) NaviData.FCStatusFlags &= ~FC_STATUS_FLY;
622	FC.StatusFlags2 = FromFlightCtrl.Param.Byte[11];	623	FC.StatusFlags2 = FromFlightCtrl.Param.Byte[11];
623	NaviData.FCStatusFlags2 = (NaviData.FCStatusFlags2 & (FC_STATUS2_OUT1_ACTIVE \| FC_STATUS2_OUT2_ACTIVE)) \| (FC.StatusFlags2 & (0xff - (FC_STATUS2_OUT1_ACTIVE \| FC_STATUS2_OUT2_ACTIVE)));	624	NaviData.FCStatusFlags2 = (NaviData.FCStatusFlags2 & (FC_STATUS2_OUT1_ACTIVE \| FC_STATUS2_OUT2_ACTIVE)) \| (FC.StatusFlags2 & (0xff - (FC_STATUS2_OUT1_ACTIVE \| FC_STATUS2_OUT2_ACTIVE)));
Line 634...		Line 635...
634	Logging_FCStatusFlags2 \|= FC.StatusFlags2;	635	Logging_FCStatusFlags2 \|= FC.StatusFlags2;
635	break;	636	break;
Line 636...		Line 637...
636		637
637	case SPI_FCCMD_BL_ACCU:	638	case SPI_FCCMD_BL_ACCU:
-		639	FC.BAT_Current = FromFlightCtrl.Param.Int[0];
638	FC.BAT_Current = FromFlightCtrl.Param.Int[0];	640	DebugOut.Analog[8] = FC.BAT_Current;
639	FC.BAT_UsedCapacity = FromFlightCtrl.Param.Int[1];	641	FC.BAT_UsedCapacity = FromFlightCtrl.Param.Int[1];
640	Parameter.NaviGpsModeControl = FromFlightCtrl.Param.Byte[4];	642	Parameter.NaviGpsModeControl = FromFlightCtrl.Param.Byte[4];
641	FromFC_VarioCharacter = FromFlightCtrl.Param.Byte[5];	643	FromFC_VarioCharacter = FromFlightCtrl.Param.Byte[5];
642	Motor_Version[FromFlightCtrl.Param.Byte[6]] = FromFlightCtrl.Param.Byte[7];	644	Motor_Version[FromFlightCtrl.Param.Byte[6]] = FromFlightCtrl.Param.Byte[7];