Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 446 → Rev 447

/trunk/Hex-Files/Navi-Ctrl_STR9_V0_30a.hex
File deleted
/trunk/main.h
14,7 → 14,7
 
#define VERSION_MAJOR 0
#define VERSION_MINOR 30
#define VERSION_PATCH 1
#define VERSION_PATCH 5
// 0 = A
// 1 = B
// 2 = C
39,7 → 39,7
#define VERSION_SERIAL_MINOR 0
 
#ifndef FOLLOW_ME
#define FC_SPI_COMPATIBLE 52
#define FC_SPI_COMPATIBLE 53
#else
#define FC_SPI_COMPATIBLE 0xFF
#endif
62,6 → 62,7
#define FC_STATUS2_RC_FAILSAVE_ACTIVE 0x04
#define FC_STATUS2_OUT1_ACTIVE 0x08
#define FC_STATUS2_OUT2_ACTIVE 0x10
#define FC_STATUS2_WAIT_FOR_TAKEOFF 0x20 // Motor Running, but still on the ground
 
// FC ERRORS FLAGS
#define FC_ERROR0_GYRO_NICK 0x01
/trunk/uart1.c
102,6 → 102,7
u8 UART1_Request_Echo = FALSE;
u8 UART1_Request_ParameterId = 0;
u8 UART1_Request_Parameter = FALSE;
u8 UART1_Request_SystemTime = FALSE;
u8 UART1_DisplayKeys = 0;
u8 UART1_DisplayLine = 0;
u8 UART1_ConfirmFrame = 0;
405,9 → 406,11
case NC_ADDRESS: // own Slave Address
switch(SerialMsg.CmdID)
{
case 't': // request for the GPS time
UART1_Request_SystemTime = TRUE;
break;
 
case 'f': // ftp command
UART1_Request_FTP = SerialMsg.pData[0];
//if (UART1_Request_FTP == FTP_CMD_SET_CWD || UART1_Request_FTP == FTP_CMD_GET_FILE)
memcpy(&FTP_data, &SerialMsg.pData[1], sizeof(FTP_data)); // copy ftp parameter
827,6 → 830,11
MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'V', NC_ADDRESS,1, (u8 *)&UART_VersionInfo, sizeof(UART_VersionInfo));
UART1_Request_VersionInfo = FALSE;
}
else if(UART1_Request_SystemTime && (UART1_tx_buffer.Locked == FALSE))
{
MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'T', NC_ADDRESS,1, (u8 *)&SystemTime, sizeof(SystemTime));
UART1_Request_SystemTime = FALSE;
}
else if(UART1_Request_ErrorMessage && (UART1_tx_buffer.Locked == FALSE))
{
MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'E', NC_ADDRESS, 1, (u8 *)&ErrorMSG, sizeof(ErrorMSG));