Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2099 → Rev 2102

/branches/dongfang_FC_fixedwing/uart0.c
81,26 → 81,26
// keep lables in flash to save 512 bytes of sram space
const prog_uint8_t ANALOG_LABEL[32][16] = {
//1234567890123456
"AnglePitch ", //0
"AngleRoll ",
"AngleYaw ",
"GyroPitch ",
"GyroRoll ",
"GyroYaw ", //5
"PitchTerm ",
"RollTerm ",
"ThrottleTerm ",
"YawTerm ",
"heightP ", //10
"heightI ",
"heightD ",
"gyroActivity ",
"ca ",
"GActivityDivider", //15
"NaviMode ",
"NaviStatus ",
"NaviStickP ",
"NaviStickR ",
"Gyro P ", //0
"Gyro R ",
"Gyro Y ",
"Attitude P ",
"Attitude R ",
"Attitude Y ", //5
"Target P ",
"Target R ",
"Target Y ",
"Error P ",
"Error R ", //10
"Error Y ",
"Term P ",
"Term R ",
"Term Y ",
"FlightMode ", //15
"RC P ",
"RC Thr ",
"ServoFinal P ",
"ServoFinal T ",
"control act wghd", //20
"acc vector wghd ",
"Height[dm] ",
483,7 → 483,7
break;
 
case 'j':// Save IMU configuration
if (!(MKFlags & MKFLAG_MOTOR_RUN)) // save settings only if motors are off
if (!isMotorRunning) // save settings only if motors are off
{
if ((pRxData[0] == IMUCONFIG_REVISION) && (pRxData[1] == sizeof(IMUConfig))) {
memcpy(&IMUConfig, (uint8_t*) &pRxData[2], sizeof(IMUConfig));
520,7 → 520,7
break;
 
case 's': // save settings
if (!(MKFlags & MKFLAG_MOTOR_RUN)) // save settings only if motors are off
if (!isMotorRunning) // save settings only if motors are off
{
if ((pRxData[1] == EEPARAM_REVISION) && (pRxData[2] == sizeof(staticParams))) // check for setting to be in range and version of settings
{