Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2159 → Rev 2160

/branches/dongfang_FC_rewrite/uart0.c
94,20 → 94,20
"GyroPitch ",
"GyroRoll ",
"GyroYaw ", //5
"PitchTerm ",
"RollTerm ",
"correctionSum pi",
"correctionSum ro",
"ThrottleTerm ",
"YawTerm ",
"heightP ", //10
"heightI ",
"heightD ",
"gyroActivity ",
"ca ",
"gyroDPitch ", //10
"gyroDRoll ",
"zerothOrderCorr ",
"DriftCompPitch ",
"DriftCompRoll ",
"GActivityDivider", //15
"NaviMode ",
"NaviStatus ",
"NaviStickP ",
"NaviStickR ",
"AccPitch ",
"AccRoll ",
" ",
" ",
"control act wghd", //20
"acc vector wghd ",
"Height[dm] ",
116,7 → 116,7
"EFT ", //25
"naviPitch ",
"naviRoll ",
"tolerance ",
"Rate Tolerance ",
"Gyro Act Cont. ",
"GPS altitude ", //30
"GPS vert accura "
735,7 → 735,8
}
 
if (request_PPMChannels && txd_complete) {
sendOutData('P', FC_ADDRESS, 1, (uint8_t *) &PPM_in, sizeof(PPM_in));
uint8_t length = MAX_CHANNELS;
sendOutData('P', FC_ADDRESS, 2, &length, 1, (uint8_t*)&PPM_in, sizeof(PPM_in));
request_PPMChannels = FALSE;
}
 
744,6 → 745,7
request_variables = FALSE;
}
 
#ifdef USE_DIRECT_GPS
if (((OSD_interval && checkDelay(OSD_timer)) || request_OSD) && txd_complete) {
int32_t height = analog_getHeight();
data3D.anglePitch = (int16_t) (attitude[PITCH] / (GYRO_DEG_FACTOR_PITCHROLL/10)); // convert to multiple of 0.1 deg
753,4 → 755,5
OSD_timer = setDelay(OSD_interval);
request_OSD = FALSE;
}
#endif
}