Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 904 → Rev 905

/trunk/ftphelper.c
137,6 → 137,7
"FC_I2C_ErrorCou\0",
"FC_SPI_ErrorCou\0",
"TargetDistance>\0",
"LaserAltCorr>\0 ",
"_ErrorCounter>\0 "
};
//ACHTUNG: ggf. DATA_TRANSFER_SIZE vergrössern
/trunk/gpx.c
788,8 → 788,12
 
if(FromLaserCtrl.LaserStatus)
{
sprintf(string, "<Laser>%d.%02d</Laser>\r\n",FromLaserCtrl.Distance/100,abs(FromLaserCtrl.Distance)%100); // FreqGpsNavProcessed
s32 corrAlt;
sprintf(string, "<Laser>%d.%02d</Laser>\r\n",FromLaserCtrl.Distance/100,abs(FromLaserCtrl.Distance)%100);
CheckSumAndWrite(&Check16Block,string, doc->file);
corrAlt = NaviData.Altimeter_5cm / 2 - FromFC_LaserAltCorrect_dm; // that would be the original baro altitude
sprintf(string, "<LaserAltCorr>%d.%d,%d.%d</LaserAltCorr>\r\n",FromFC_LaserAltCorrect_dm/10,abs(FromFC_LaserAltCorrect_dm)%10,corrAlt/10,abs(corrAlt)%10);
CheckSumAndWrite(&Check16Block,string, doc->file);
}
 
if(FromGimbalCtrl.GimbalStatus)
/trunk/main.h
20,7 → 20,7
 
#define VERSION_MAJOR 2
#define VERSION_MINOR 21
#define VERSION_PATCH 5
#define VERSION_PATCH 6
// 0 = A
// 1 = B
// 2 = C
/trunk/spi_slave.c
158,6 → 158,7
s16 NickServoValue = 128 * 64;;
s16 FromFC_ServoRollControl = 128;
s16 FromFC_ServoNickControl = 128;
s16 FromFC_LaserAltCorrect_dm = 0;
 
//--------------------------------------------------------------
void SSP0_IRQHandler(void)
552,7 → 553,7
ToFlightCtrl.Param.Byte[12] = CamCtrlCharacter;
ToFlightCtrl.Param.Byte[13] = BaroCalState;
ToFlightCtrl.Param.sInt[7] = LuftdruckTemperaturOffset; // Bytes 14 & 15
ToFlightCtrl.Param.Int[8] = FromLaserCtrl.Distance; // Bytes 16 & 17
//ToFlightCtrl.Param.Int[8] = FromLaserCtrl.Distance; // Bytes 16 & 17
ToFlightCtrl.Param.Byte[18] = FlyzonePointCnt;
break;
 
790,7 → 791,6
FromFlightCtrl_AccRoll = FromFlightCtrl.Param.sInt[7];
DebugOut.Analog[2] = FromFlightCtrl_AccNick;
DebugOut.Analog[3] = FromFlightCtrl_AccRoll;
//DebugOut.Analog[16] = AmountOfMotors;
// ++++++++++++++++++++++++++++++++++++++
//+ Voltage
// ++++++++++++++++++++++++++++++++++++++
885,6 → 885,18
CHK_POTI_MM(Parameter.NaviWindCorrection,FromFlightCtrl.Param.Byte[9],0,255);
CHK_POTI_MM(Parameter.NaviAccCompensation,FromFlightCtrl.Param.Byte[10],0,255);
CHK_POTI_MM(Parameter.NaviAngleLimitation,FromFlightCtrl.Param.Byte[11],0,255);
FromFC_LaserAltCorrect_dm = FromFlightCtrl.Param.sInt[6]; // 12 & 13
// 0 = 0,1
// 1 = 2,3
// 2 = 4,5
// 3 = 6,7
// 4 = 8,9
// 5 = 10,11
// 6 = 12,13
// 7 = 14,15
// 8 = 16,17
// 9 = 18,19
 
break;
case SPI_FCCMD_PARAMETER2:
CHK_POTI_MM(FC.AutoPhotoDistance,FromFlightCtrl.Param.Byte[0],0,255);
/trunk/spi_slave.h
117,6 → 117,7
extern s16 NickServoValue;
extern s16 FromFC_ServoRollControl;
extern s16 FromFC_ServoNickControl;
extern s16 FromFC_LaserAltCorrect_dm;
 
typedef struct
{
/trunk/uart1.c
204,8 → 204,8
"Laser [cm] ",//"GPS CRC Error ",
"I2C Error ",
"I2C Okay ", //15
"Runden_cnt ",
"Runden_max ",
"16 ",
"17 ",
"18 ",
"19 ",
"EarthMagnet [%] ", //20