| /trunk/main.h |
|---|
| 7,7 → 7,16 |
| #define VERSION_MAJOR 0 |
| #define VERSION_MINOR 23 |
| #define VERSION_PATCH 5 |
| #define VERSION_PATCH 6 |
| // 0 = A |
| // 1 = B |
| // 2 = C |
| // 3 = D |
| // 4 = E |
| // 5 = F |
| // 6 = G |
| // 7 = H |
| // 8 = I |
| #define VERSION_SERIAL_MAJOR 11 |
| #define VERSION_SERIAL_MINOR 0 |
| /trunk/uart1.c |
|---|
| 143,17 → 143,17 |
| "SPI Okay ", |
| "I2C Error ", |
| "I2C Okay ", //15 |
| "*POI_CAM_ANGLE ",// "Kalman_K ", |
| "*POI_INDEX ",// "Kalman_K ", |
| "ACC_Speed_N ", |
| "ACC_Speed_E ", |
| "Speed_z ",// "GPS ACC ", |
| "*POI_CALCULATE ",//20 |
| "*POI_Voraus ",//20 |
| "N_Speed ", |
| "E_Speed ", |
| "*POI_ALTITUDE ", |
| "*POI_DISTANCE ", |
| "*POI_ERR1 ",//25 |
| "*POI_ERR2 ", |
| "*MY_Altitude ", |
| "*AngleErr ",//25 |
| "*CAM-Azimut ", |
| "Distance N ", |
| "Distance E ", |
| "GPS_Nick ", |
| /trunk/waypoints.c |
|---|
| 68,6 → 68,7 |
| u8 POIIndex = 0; // list index of GPS Point representing the current POI, can be maximal WPCount |
| u8 WPCount = 0; // number of waypoints |
| u8 PointCount = 0; // number of wp in the list can be maximal equal to MAX_LIST_LEN |
| u8 POICount = 0; |
| u8 WPActive = TRUE; |
| 82,6 → 83,7 |
| WPIndex = 0; // real list position are 1 ,2, 3 ... |
| POIIndex = 0; // real list position are 1 ,2, 3 ... |
| WPCount = 0; // no waypoints |
| POICount = 0; |
| PointCount = 0; // no contents |
| WPActive = TRUE; |
| NaviData.WaypointNumber = WPCount; |
| 113,6 → 115,7 |
| { |
| memcpy(&PointList[PointCount], pPoint, sizeof(Point_t)); // copy data to list entry // increment list length |
| if(PointList[PointCount].Type == POINT_TYPE_WP) WPCount++; |
| if(PointList[PointCount].Type == POINT_TYPE_POI) POICount++; |
| NaviData.WaypointNumber = WPCount; |
| PointCount++; |
| if(PointCount == 1) // only for the first entry |
| 127,6 → 130,7 |
| case POINT_TYPE_POI: |
| POIIndex = 1; |
| POICount = 1; |
| break; |
| default: |
| 144,10 → 148,8 |
| { |
| u8 i; |
| WPIndex = 0; // set list position invalid |
| if(WPActive == FALSE) return(NULL); |
| POIIndex = 0; // set invalid POI |
| if(WPActive == FALSE) return(NULL); |
| if(PointCount > 0) |
| { |
| // search for first wp in list |
| 197,6 → 199,7 |
| u8 i; |
| WPIndex = 0; // set list position invalid |
| POIIndex = 0; // set invalid |
| if(WPActive == FALSE) return(NULL); |
| if(PointCount > 0) |
| /trunk/waypoints.h |
|---|
| 7,6 → 7,8 |
| #define POINT_TYPE_WP 0 |
| #define POINT_TYPE_POI 1 |
| extern u8 POIIndex; // list index of GPS Point representing the current POI, can be maximal WPCount |
| typedef struct |
| { |
| GPS_Pos_t Position; // the gps position of the waypoint, see ubx.h for details |
| 17,9 → 19,15 |
| u8 Index; // to indentify different waypoints, workaround for bad communications PC <-> NC |
| u8 Type; // typeof Waypoint |
| u8 WP_EventChannelValue; // |
| u8 reserve[9]; // reserve |
| s16 DesiredAltitude; |
| u8 ClimbingSpeed; |
| u8 reserve[6]; // reserve |
| } __attribute__((packed)) Point_t; |
| extern Point_t* GPS_pPoi; // pointer to the actual point of interrest |
| extern u8 POICount; |
| // Init List, return TRUE on success |
| u8 PointList_Init(void); |
| // Clear List, return TRUE on success |