Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2058 → Rev 2059

/branches/dongfang_FC_rewrite/uart0.c
102,24 → 102,24
"M2 ",
"M3 ",
"M4 ",
"pdpart ",
"control ", //15
"controlActivity ",
"accVector ", //15
"RC Stick P ",
"RC Stick R ",
"Stick P w GPS ",
"Stick R w GPS ",
"RC Stick T ",
"RC Stick Y ",
"Stick P w Emerg.", //20
"Stick R w Emerg.",
"Height[dm] ",
"dHeight ",
"Altitude ",
" ", //25
"Altitude ",
"EFT ", //25
"naviPitch ",
"naviRoll ",
"i part contrib ",
"HeadingError ",
"Magnetic Heading", //30
"GPS Datasets "
" ",
" ", //30
" "
};
 
/****************************************************************/
200,10 → 200,6
versionInfo.protoMajor = VERSION_SERIAL_MAJOR;
versionInfo.protoMinor = VERSION_SERIAL_MINOR;
 
for (uint8_t i=0; i<32; i++) {
debugOut.analog[i] = i;
}
 
// restore global interrupt flags
SREG = sreg;
}
290,8 → 286,8
tmpchecksum += txd_buffer[i];
}
tmpchecksum %= 4096;
txd_buffer[i++] = '=' + tmpchecksum >> 6;
txd_buffer[i++] = '=' + tmpchecksum & 0x3F;
txd_buffer[i++] = '=' + (tmpchecksum >> 6);
txd_buffer[i++] = '=' + (tmpchecksum & 0x3F);
txd_buffer[i++] = '\r';
txd_complete = FALSE;
UDR0 = txd_buffer[0]; // initiates the transmittion (continued in the TXD ISR)
514,7 → 510,11
else if (pRxData[0] > 5)
pRxData[0] = 5; // limit to 5
// load requested parameter set
 
debugOut.analog[30] = staticParams.GPSMininumSatellites;
 
paramSet_readFromEEProm(pRxData[0]);
 
tempchar[0] = pRxData[0];
tempchar[1] = EEPARAM_REVISION;
tempchar[2] = sizeof(staticParams);
530,6 → 530,8
{
memcpy(&staticParams, (uint8_t*) &pRxData[3], sizeof(staticParams));
paramSet_writeToEEProm(pRxData[0]);
setActiveParamSet(pRxData[0]);
configuration_paramSetDidChange();
tempchar[0] = getActiveParamSet();
beepNumber(tempchar[0]);
} else {