Rev 908 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 908 | Rev 911 | ||
---|---|---|---|
Line 63... | Line 63... | ||
63 | 63 | ||
64 | 64 | ||
65 | const uint8_t ANALOG_LABEL[32][16] = |
65 | const uint8_t ANALOG_LABEL[32][16] = |
66 | { |
66 | { |
67 | //1234567890123456 |
67 | //1234567890123456 |
68 | "IntegralPitch ", //0 |
68 | "IntegralNick ", //0 |
69 | "IntegralRoll ", |
69 | "IntegralRoll ", |
70 | "AccPitch ", |
70 | "AccNick ", |
71 | "AccRoll ", |
71 | "AccRoll ", |
72 | "GyroYaw ", |
72 | "GyroYaw ", |
73 | "ReadingHeight ", //5 |
73 | "ReadingHeight ", //5 |
74 | "AccZ ", |
74 | "AccZ ", |
75 | "Thrust ", |
75 | "Gas ", |
76 | "CompassHeading ", |
76 | "CompassHeading ", |
77 | "Voltage ", |
77 | "Voltage ", |
78 | "Receiver Level ", //10 |
78 | "Receiver Level ", //10 |
Line 84... | Line 84... | ||
84 | "Acc_Z ", |
84 | "Acc_Z ", |
85 | "SPI Error ", |
85 | "SPI Error ", |
86 | "SPI Ok ", |
86 | "SPI Ok ", |
87 | " ", |
87 | " ", |
88 | "Servo ", //20 |
88 | "Servo ", //20 |
89 | "Pitch ", |
89 | "Nick ", |
90 | "Roll ", |
90 | "Roll ", |
91 | " ", |
91 | " ", |
92 | " ", |
92 | " ", |
93 | " ", //25 |
93 | " ", //25 |
94 | " ", |
94 | " ", |
95 | " ", |
95 | " ", |
96 | " ", |
96 | " ", |
97 | " ", |
97 | " ", |
98 | "GPS_Pitch ", //30 |
98 | "GPS_Nick ", //30 |
99 | "GPS_Roll " |
99 | "GPS_Roll " |
100 | }; |
100 | }; |
Line 421... | Line 421... | ||
421 | case 'n': |
421 | case 'n': |
422 | case 'o': |
422 | case 'o': |
423 | case 'p': // save parameterset |
423 | case 'p': // save parameterset |
424 | Decode64((uint8_t *) &ParamSet.ChannelAssignment[0],PARAMSET_STRUCT_LEN,3,ReceivedBytes); |
424 | Decode64((uint8_t *) &ParamSet.ChannelAssignment[0],PARAMSET_STRUCT_LEN,3,ReceivedBytes); |
425 | ParamSet_WriteToEEProm(rxd_buffer[2] - 'l' + 1); |
425 | ParamSet_WriteToEEProm(rxd_buffer[2] - 'l' + 1); |
426 | TurnOver180Pitch = (int32_t) ParamSet.AngleTurnOverPitch * 2500L; |
426 | TurnOver180Nick = (int32_t) ParamSet.AngleTurnOverNick * 2500L; |
427 | TurnOver180Roll = (int32_t) ParamSet.AngleTurnOverRoll * 2500L; |
427 | TurnOver180Roll = (int32_t) ParamSet.AngleTurnOverRoll * 2500L; |
428 | Beep(GetActiveParamSet()); |
428 | Beep(GetActiveParamSet()); |
429 | break; |
429 | break; |
Line 461... | Line 461... | ||
461 | } |
461 | } |
Line 462... | Line 462... | ||
462 | 462 | ||
463 | #ifdef USE_MK3MAG |
463 | #ifdef USE_MK3MAG |
464 | if((CheckDelay(Compass_Timer)) && txd_complete) |
464 | if((CheckDelay(Compass_Timer)) && txd_complete) |
465 | { |
465 | { |
466 | ToMk3Mag.Attitude[0] = (int16_t) (IntegralPitch / 108); // approx. 0,1 Deg |
466 | ToMk3Mag.Attitude[0] = (int16_t) (IntegralNick / 108); // approx. 0,1 Deg |
467 | ToMk3Mag.Attitude[1] = (int16_t) (IntegralRoll / 108); // approx. 0,1 Deg |
467 | ToMk3Mag.Attitude[1] = (int16_t) (IntegralRoll / 108); // approx. 0,1 Deg |
468 | ToMk3Mag.UserParam[0] = FCParam.UserParam1; |
468 | ToMk3Mag.UserParam[0] = FCParam.UserParam1; |
469 | ToMk3Mag.UserParam[1] = FCParam.UserParam2; |
469 | ToMk3Mag.UserParam[1] = FCParam.UserParam2; |
470 | ToMk3Mag.CalState = CompassCalState; |
470 | ToMk3Mag.CalState = CompassCalState; |