| /trunk/gpx.c |
|---|
| 226,6 → 226,7 |
| if(UART_VersionInfo.HWMajor >= 30) { sprintf(string, "<FcTemperat.>%i.%1i</FcTemperat.>\r\n",FC_Temperatur/10,abs(FC_Temperatur)%10);CheckSumAndWrite(&Check16File,string, doc->file); } |
| if(FromGimbalCtrl.GimbalStatus) {sprintf(string, "<GimbalCtrV>%i.%02i</GimbalCtrV>\r\n",1 + FromGimbalCtrl.Version / 100, FromGimbalCtrl.Version % 100);CheckSumAndWrite(&Check16File,string, doc->file);} |
| if(EE_Parameter.ExternalControl) {sprintf(string, "<ExternalControl>%i,%02x,%02x</ExternalControl>\r\n",EE_Parameter.ExternalControl,FromFC_ExternalCtrlCfg,FromFC_ExternalCtrlSwitch);CheckSumAndWrite(&Check16File,string, doc->file);} |
| if(WP_Repeat_x_Times) {sprintf(string, "<WP_Repeat_x_Times>%i</WP_Repeat_x_Times>\r\n",WP_Repeat_x_Times);CheckSumAndWrite(&Check16File,string, doc->file);} |
| sprintf(string, "<Channels>ALT:%i,GPS:%i,CF:%i,SL:%i,FS:%i,MSS:%i,SWP:%i,NWP:%i,CCM:%i,CCZ:%i</Channels>\r\n",EE_Parameter.HoeheChannel,EE_Parameter.NaviGpsModeChannel,EE_Parameter.CareFreeChannel, EE_Parameter.StartLandChannel, EE_Parameter.FailsafeChannel, EE_Parameter.MotorSafetySwitch,EE_Parameter.SingleWpControlChannel,EE_Parameter.MenuKeyChannel,EE_Parameter.CamCtrlModeChannel,EE_Parameter.CamCtrlZoomChannel);CheckSumAndWrite(&Check16File,string, doc->file); |
| // Alt = Altitude |
| // GPS = GPS |
| /trunk/main.c |
|---|
| 933,6 → 933,8 |
| UART1_PutString("\r\n"); |
| Settings_GetParamValue(PID_YAW_WITHOUT_CF,(u16 *) &WP_Yaw_WithoutCF); |
| Settings_GetParamValue(PID_REPEAT_WAYPOINT_LIST,(u16 *) &WP_Repeat_x_Times); |
| // UART1_PutString(" Yaw without Carfefree in waypoint flight:"); |
| // if(WP_Yaw_WithoutCF) UART1_PutString("on\r\n"); else UART1_PutString("off\r\n"); |
| /trunk/main.h |
|---|
| 20,7 → 20,7 |
| #define VERSION_MAJOR 2 |
| #define VERSION_MINOR 21 |
| #define VERSION_PATCH 4 |
| #define VERSION_PATCH 5 |
| // 0 = A |
| // 1 = B |
| // 2 = C |
| 407,6 → 407,7 |
| extern u8 TryAgain_UBX_Setup; |
| extern u8 MenuBlinkBit; |
| extern u8 ExternalGpsInUse; |
| extern u16 WP_Repeat_x_Times; |
| #define CHECK_ONLY 0 |
| #define GET_LICENSE 1 |
| /trunk/settings.c |
|---|
| 105,6 → 105,7 |
| {PID_IO1_FUNCTION , "IO1_FUNCTION \0" ,"Function for IO1 input 9 = Parachute (license required) ", 0, 1, 0, 0, 255}, |
| {PID_GPS_AUTOCONFIG , "GPSAUTOCONFIG \0" ,"GPS configmode (0 = off, 1 = on) ", 0, 1, 1, 0, 1}, |
| {PID_YAW_WITHOUT_CF , "YAW_WITHOUT_CF \0" ,"Allows yawing in waypoint flight without carefree ", 0, 1, 0, 0, 1}, |
| {PID_REPEAT_WAYPOINT_LIST , "WAYPOINT_REPEAT \0" ,"Repeat the Waypoint list x times ", 0, 1, 0, 0, 9999}, |
| {PID_BAUDRATE , "BAUDRATE \0" ,"Baudrate for the PC-UART *100 (576 = default 57600) 2560=max", 0, 576, 576, 12, 2560} |
| }; |
| /trunk/settings.h |
|---|
| 27,7 → 27,8 |
| PID_GPS_QZSS_CONFIG, |
| PID_IO1_FUNCTION, |
| PID_BAUDRATE, |
| PID_YAW_WITHOUT_CF |
| PID_YAW_WITHOUT_CF, |
| PID_REPEAT_WAYPOINT_LIST |
| } ParamId_t; |
| void Settings_Init(void); |
| /trunk/spi_slave.c |
|---|
| 790,7 → 790,7 |
| FromFlightCtrl_AccRoll = FromFlightCtrl.Param.sInt[7]; |
| DebugOut.Analog[2] = FromFlightCtrl_AccNick; |
| DebugOut.Analog[3] = FromFlightCtrl_AccRoll; |
| DebugOut.Analog[16] = AmountOfMotors; |
| //DebugOut.Analog[16] = AmountOfMotors; |
| // ++++++++++++++++++++++++++++++++++++++ |
| //+ Voltage |
| // ++++++++++++++++++++++++++++++++++++++ |
| /trunk/uart1.c |
|---|
| 203,8 → 203,8 |
| "Laser [cm] ",//"GPS CRC Error ", |
| "I2C Error ", |
| "I2C Okay ", //15 |
| "16 ", |
| "17 ", |
| "Runden_cnt ", |
| "Runden_max ", |
| "18 ", |
| "19 ", |
| "EarthMagnet [%] ", //20 |