Rev 909 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 909 | Rev 916 | ||
---|---|---|---|
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 | "Receiver Level ", |
76 | "Receiver Level ", |
77 | "Voltage ", |
77 | "Voltage ", |
78 | #ifdef HEXAKOPTER |
78 | #ifdef HEXAKOPTER |
Line 93... | Line 93... | ||
93 | "Acc_Z ", |
93 | "Acc_Z ", |
94 | "SPI Error ", |
94 | "SPI Error ", |
95 | "SPI Ok ", |
95 | "SPI Ok ", |
96 | " ", |
96 | " ", |
97 | "Servo ", //20 |
97 | "Servo ", //20 |
98 | "Pitch ", |
98 | "Nick ", |
99 | "Roll ", |
99 | "Roll ", |
100 | " ", |
100 | " ", |
101 | " ", |
101 | " ", |
102 | " ", //25 |
102 | " ", //25 |
103 | " ", |
103 | " ", |
104 | " ", |
104 | " ", |
105 | " ", |
105 | " ", |
106 | " ", |
106 | " ", |
107 | "GPS_Pitch ", //30 |
107 | "GPS_Nick ", //30 |
108 | "GPS_Roll " |
108 | "GPS_Roll " |
109 | }; |
109 | }; |
Line 430... | Line 430... | ||
430 | case 'n': |
430 | case 'n': |
431 | case 'o': |
431 | case 'o': |
432 | case 'p': // save parameterset |
432 | case 'p': // save parameterset |
433 | Decode64((uint8_t *) &ParamSet.ChannelAssignment[0],PARAMSET_STRUCT_LEN,3,ReceivedBytes); |
433 | Decode64((uint8_t *) &ParamSet.ChannelAssignment[0],PARAMSET_STRUCT_LEN,3,ReceivedBytes); |
434 | ParamSet_WriteToEEProm(rxd_buffer[2] - 'l' + 1); |
434 | ParamSet_WriteToEEProm(rxd_buffer[2] - 'l' + 1); |
435 | TurnOver180Pitch = (int32_t) ParamSet.AngleTurnOverPitch * 2500L; |
435 | TurnOver180Nick = (int32_t) ParamSet.AngleTurnOverNick * 2500L; |
436 | TurnOver180Roll = (int32_t) ParamSet.AngleTurnOverRoll * 2500L; |
436 | TurnOver180Roll = (int32_t) ParamSet.AngleTurnOverRoll * 2500L; |
437 | Beep(GetActiveParamSet()); |
437 | Beep(GetActiveParamSet()); |
438 | break; |
438 | break; |
Line 470... | Line 470... | ||
470 | } |
470 | } |
Line 471... | Line 471... | ||
471 | 471 | ||
472 | #ifdef USE_MK3MAG |
472 | #ifdef USE_MK3MAG |
473 | if((CheckDelay(Compass_Timer)) && txd_complete) |
473 | if((CheckDelay(Compass_Timer)) && txd_complete) |
474 | { |
474 | { |
475 | ToMk3Mag.Attitude[0] = (int16_t) (IntegralPitch / 108); // approx. 0,1 Deg |
475 | ToMk3Mag.Attitude[0] = (int16_t) (IntegralNick / 108); // approx. 0,1 Deg |
476 | ToMk3Mag.Attitude[1] = (int16_t) (IntegralRoll / 108); // approx. 0,1 Deg |
476 | ToMk3Mag.Attitude[1] = (int16_t) (IntegralRoll / 108); // approx. 0,1 Deg |
477 | ToMk3Mag.UserParam[0] = FCParam.UserParam1; |
477 | ToMk3Mag.UserParam[0] = FCParam.UserParam1; |
478 | ToMk3Mag.UserParam[1] = FCParam.UserParam2; |
478 | ToMk3Mag.UserParam[1] = FCParam.UserParam2; |
479 | ToMk3Mag.CalState = CompassCalState; |
479 | ToMk3Mag.CalState = CompassCalState; |