Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 298 → Rev 299

/trunk/params.c
57,7 → 57,3
return(NCParamState[id]);
}
 
s16 NCParams_GetValue_NoCheck(u8 id)
{
return(NCParams[id]);
}
/trunk/params.h
15,6 → 15,5
extern u8 NCParams_SetValue(u8 id, s16 *pvalue);
extern u8 NCParams_GetValue(u8 id, s16 *pvalue);
extern void NCParams_ClearValue(u8 id);
extern s16 NCParams_GetValue_NoCheck(u8 id);
 
#endif // _PARAMS_H
/trunk/spi_slave.c
275,6 → 275,7
static u8 counter = 50;
static u8 CompassCalState = 0;
static u8 FCCalibActive = 0;
s16 tmp;
 
if (SPI_RxBuffer_Request)
{
314,8 → 315,12
ToFlightCtrl.Param.sInt[4] = -1;
}
 
if(NCRARAM_STATE_VALID != NCParams_GetValue(NCPARAMS_NEW_CAMERA_ELEVATION, &(ToFlightCtrl.Param.sInt[5]))) // Elevation set via 'j' command
if(NCRARAM_STATE_VALID == NCParams_GetValue(NCPARAMS_NEW_CAMERA_ELEVATION, &tmp)) // Elevation set via 'j' command
{
ToFlightCtrl.Param.sInt[5] = tmp;
}
else
{
if(FC.StatusFlags2 & FC_STATUS2_CAREFREE) ToFlightCtrl.Param.sInt[5] = CAM_Orientation.Elevation; // only, if carefree is active
else ToFlightCtrl.Param.sInt[5] = 0;
}
340,25 → 345,27
ToFlightCtrl.Param.Int[2] = NaviData.HomePositionDeviation.Distance; // dm //4&5
ToFlightCtrl.Param.sInt[3] = NaviData.HomePositionDeviation.Bearing; // deg //6&7
ToFlightCtrl.Param.Byte[8] = (s8)(FC_WP_EventChannel - 110);
{
s16 tmp;
// if(NCRARAM_STATE_VALID == NCParams_GetValue(NCPARAMS_ALTITUDE_RATE, &tmp))
if(NCRARAM_STATE_VALID == NCParams_GetValue(3, &tmp))
{
ToFlightCtrl.Param.Byte[9] = (u8)tmp;
}
else
{
ToFlightCtrl.Param.Byte[9] = (u8) ToFC_AltitudeRate;
}
if(NCRARAM_STATE_VALID != NCParams_GetValue(NCPARAMS_ALTITUDE_SETPOINT, &(ToFlightCtrl.Param.sInt[5])))
{
ToFlightCtrl.Param.sInt[5] = (s16) ToFC_AltitudeSetpoint;
}
DebugOut.Analog[25] = (s16)ToFlightCtrl.Param.Byte[9];
DebugOut.Analog[20] = ToFlightCtrl.Param.sInt[5];
 
if(NCRARAM_STATE_VALID == NCParams_GetValue(NCPARAMS_ALTITUDE_RATE, &tmp))
{
ToFlightCtrl.Param.Byte[9] = (u8)tmp;
}
else
{
ToFlightCtrl.Param.Byte[9] = (u8)ToFC_AltitudeRate;
}
if(NCRARAM_STATE_VALID == NCParams_GetValue(NCPARAMS_ALTITUDE_SETPOINT, &tmp))
{
ToFlightCtrl.Param.sInt[5] = tmp;
}
else
{
ToFlightCtrl.Param.sInt[5] = (s16)ToFC_AltitudeSetpoint;
}
DebugOut.Analog[25] = (s16)ToFlightCtrl.Param.Byte[9];
DebugOut.Analog[20] = ToFlightCtrl.Param.sInt[5];
break;
 
default:
break;
// 0 = 0,1
/trunk/uart1.c
633,10 → 633,7
if(UART1_Request_Parameter && (UART1_tx_buffer.Locked == FALSE))
{
s16 ParamValue;
ParamValue = NCParams_GetValue_NoCheck(UART1_Request_ParameterId);
//NCParams_GetValue(UART1_Request_ParameterId, &ParamValue);
//sprintf(text, "\r\nId=%d, value = %d\r\n", UART1_Request_ParameterId, ParamValue);
//UART1_PutString(text);
NCParams_GetValue(UART1_Request_ParameterId, &ParamValue);
MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'J', NC_ADDRESS, 2, &UART1_Request_ParameterId, sizeof(UART1_Request_ParameterId), &ParamValue, sizeof(ParamValue)); // answer the param request
UART1_Request_Parameter = FALSE;
}