Rev 693 | Rev 712 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 693 | Rev 703 | ||
---|---|---|---|
Line 67... | Line 67... | ||
67 | #include "timer2.h" |
67 | #include "timer2.h" |
68 | #include "config.h" |
68 | #include "config.h" |
69 | #include "main.h" |
69 | #include "main.h" |
70 | #include "params.h" |
70 | #include "params.h" |
71 | #include "settings.h" |
71 | #include "settings.h" |
- | 72 | #include "triggerlog.h" |
|
Line 72... | Line 73... | ||
72 | 73 | ||
73 | #define SPI_FCSYNCBYTE1 0xAA |
74 | #define SPI_FCSYNCBYTE1 0xAA |
74 | #define SPI_FCSYNCBYTE2 0x85 |
75 | #define SPI_FCSYNCBYTE2 0x85 |
75 | #define SPI_FCSYNCBYTE_HB1 0xA2 // for the huge Block |
76 | #define SPI_FCSYNCBYTE_HB1 0xA2 // for the huge Block |
Line 905... | Line 906... | ||
905 | Parameter.ComingHomeAltitude = FromFlightCtrl.Param.Byte[6]; |
906 | Parameter.ComingHomeAltitude = FromFlightCtrl.Param.Byte[6]; |
906 | CHK_POTI_MM(Parameter.AutoPhotoAltitudes,FromFlightCtrl.Param.Byte[7],0,255); |
907 | CHK_POTI_MM(Parameter.AutoPhotoAltitudes,FromFlightCtrl.Param.Byte[7],0,255); |
907 | UART_VersionInfo.BL_Firmware = FromFlightCtrl.Param.Byte[8]; |
908 | UART_VersionInfo.BL_Firmware = FromFlightCtrl.Param.Byte[8]; |
908 | Parameter.ActiveSetting = FromFlightCtrl.Param.Byte[9]; |
909 | Parameter.ActiveSetting = FromFlightCtrl.Param.Byte[9]; |
909 | FlugMinutenGesamt = FromFlightCtrl.Param.Int[5]; // 10 & 11 |
910 | FlugMinutenGesamt = FromFlightCtrl.Param.Int[5]; // 10 & 11 |
- | 911 | if(FromFlightCtrl.Param.Byte[12] == 1) IamMaster = MASTER; |
|
- | 912 | else |
|
- | 913 | if(FromFlightCtrl.Param.Byte[12] == 2) IamMaster = SLAVE; |
|
910 | break; |
914 | break; |
911 | case SPI_FCCMD_NEUTRAL: // slow! |
915 | case SPI_FCCMD_NEUTRAL: // slow! |
912 | FC.AdNeutralNick = FromFlightCtrl.Param.Int[0]; |
916 | FC.AdNeutralNick = FromFlightCtrl.Param.Int[0]; |
913 | FC.AdNeutralRoll = FromFlightCtrl.Param.Int[1]; |
917 | FC.AdNeutralRoll = FromFlightCtrl.Param.Int[1]; |
914 | FC.AdNeutralYaw = FromFlightCtrl.Param.Int[2]; |
918 | FC.AdNeutralYaw = FromFlightCtrl.Param.Int[2]; |
Line 946... | Line 950... | ||
946 | Parameter.DescendRange = FromFlightCtrl.Param.Byte[2]; |
950 | Parameter.DescendRange = FromFlightCtrl.Param.Byte[2]; |
947 | Parameter.MaximumAltitude = FromFlightCtrl.Param.Byte[3]; |
951 | Parameter.MaximumAltitude = FromFlightCtrl.Param.Byte[3]; |
948 | ServoParams.CompInvert = FromFlightCtrl.Param.Byte[4]; |
952 | ServoParams.CompInvert = FromFlightCtrl.Param.Byte[4]; |
949 | Parameter.HomeYawMode = ((ServoParams.CompInvert & 0x18) >> 3); |
953 | Parameter.HomeYawMode = ((ServoParams.CompInvert & 0x18) >> 3); |
950 | NaviData_Home.LipoCellCount = FromFlightCtrl.Param.Byte[5]; |
954 | NaviData_Home.LipoCellCount = FromFlightCtrl.Param.Byte[5]; |
- | 955 | if(UART_VersionInfo.HWMajor >= 30) NaviData_Volatile.ShutterCounter = TrigLogging.Count; |
|
951 | NaviData_Volatile.ShutterCounter = FromFlightCtrl.Param.Int[3]; // 6 & 7 |
956 | else NaviData_Volatile.ShutterCounter = FromFlightCtrl.Param.Int[3]; // 6 & 7 |
952 | LowVoltageLandingActive = FromFlightCtrl.Param.Byte[8]; |
957 | LowVoltageLandingActive = FromFlightCtrl.Param.Byte[8]; |
953 | Parameter.FailSafeTime = FromFlightCtrl.Param.Byte[9]; |
958 | Parameter.FailSafeTime = FromFlightCtrl.Param.Byte[9]; |
954 | // DebugOut.Analog[] = NaviData_Volatile.ShutterCounter; |
959 | // DebugOut.Analog[] = NaviData_Volatile.ShutterCounter; |
955 | // 8 |
960 | // 8 |
956 | // 9 |
961 | // 9 |