| /trunk/gpx.c |
|---|
| 286,6 → 286,7 |
| u8 retvalue = 0; |
| s8 string[100]; |
| s8 name[] = "----\0"; |
| if(doc == NULL) return(0); |
| 302,7 → 303,6 |
| switch(part) |
| { |
| case 0: |
| DebugOut.Analog[19]++; |
| Logged_GPX_Counter++; |
| if(GPSData.Position.Latitude < 0) u8_1 = '-'; |
| else u8_1 = '+'; |
| 419,7 → 419,17 |
| fputs_(string, doc->file); |
| sprintf(string, "<Servo>%d,%d,%d</Servo>\r\n", ServoParams.NickControl,ServoParams.RollControl,POI_KameraNick/10); // Raw Poti-Values of the Servo control and the POI_Nick in 1° |
| fputs_(string, doc->file); |
| sprintf(string, "<WP>%d,%d,%d</WP>\r\n",NaviData.WaypointIndex,NaviData.WaypointNumber,FC_WP_EventChannel); // x of y Waypoints and the actual value of the Event Channel |
| if(GPS_pWaypoint != NULL) // if WP exist |
| { // copy that name |
| u8 i; |
| for(i=0;i<4;i++) |
| { |
| name[i] = GPS_pWaypoint->Name[i]; |
| if(name[i] < ' ') name[i] = ' '; |
| } |
| } |
| sprintf(string, "<WP>%s,%d,%d,%d</WP>\r\n",name,NaviData.WaypointIndex,NaviData.WaypointNumber,FC_WP_EventChannel); // x of y Waypoints and the actual value of the Event Channel |
| fputs_(string, doc->file); |
| break; |
| case 7: |
| /trunk/main.h |
|---|
| 14,7 → 14,7 |
| #define VERSION_MAJOR 0 |
| #define VERSION_MINOR 28 |
| #define VERSION_PATCH 6 |
| #define VERSION_PATCH 7 |
| // 0 = A |
| // 1 = B |
| // 2 = C |
| /trunk/spi_slave.c |
|---|
| 715,16 → 715,6 |
| break; |
| } |
| /* |
| //+++++++++++++++++++++++++++++++++++++++++++++++++++ |
| */ |
| /* |
| if(Parameter.User8 < 100) FC.StatusFlags = 0; |
| else |
| if(Parameter.User8 < 150) FC.StatusFlags = FC_STATUS_START; |
| else FC.StatusFlags = FC_STATUS_FLY | FC_STATUS_MOTOR_RUN; |
| BL_MinOfMaxPWM = 255; |
| */ |
| DebugOut.Analog[0] = FromFlightCtrl.AngleNick; |
| DebugOut.Analog[1] = FromFlightCtrl.AngleRoll; |
| DebugOut.Analog[2] = FromFlightCtrl.AccNick; |
| 736,6 → 726,18 |
| // every time we got new data from the FC via SPI call the navigation routine |
| // and update GPSStick that are returned to FC |
| SPI_RxBuffer_Request = 0; |
| /* |
| //+++++++++++++++++++++++++++++++++++++++++++++++++++ |
| */ |
| /* |
| if(Parameter.User8 < 100) FC.StatusFlags = 0; |
| else |
| if(Parameter.User8 < 150) FC.StatusFlags = FC_STATUS_START; |
| else FC.StatusFlags = FC_STATUS_FLY | FC_STATUS_MOTOR_RUN; |
| BL_MinOfMaxPWM = 255; |
| */ |
| GPS_Navigation(&GPSData, &(ToFlightCtrl.GPSStick)); |
| ClearFCStatusFlags = 1; |
| if(counter) |
| /trunk/waypoints.h |
|---|
| 20,7 → 20,8 |
| u8 AltitudeRate; // rate to change the setpoint |
| u8 Speed; // rate to change the Position |
| u8 CamAngle; // Camera servo angle |
| u8 reserve[6]; // reserve |
| u8 Name[4]; // Name of that point (ASCII) |
| u8 reserve[2]; // reserve |
| } __attribute__((packed)) Point_t; |
| // Init List, return TRUE on success |