WebSVN - NaviCtrl - Diff - Rev 27 and 41

 // +  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 // +  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 // +  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // +  POSSIBILITY OF SUCH DAMAGE.
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#include <stdlib.h>
 #include <stdio.h>
-#include "main.h"
+#include "91x_lib.h"
 #include "kml.h"
 #include "kml_header.h"
-#include "fat16.h"
 //________________________________________________________________________________________________________________________________________
 // Module name:                 kml.c
 // Compiler used:               avr-gcc 3.4.5
-// Last Modifikation:   17.03.2008
+// Last Modifikation:   20.07.2008
 // Version:                             1.02
 // Authors:                             Stephan Busker
 // Description:                 Source files to write gps-coordinates to a file in the kml (keyhole markup language) fileformat
 //________________________________________________________________________________________________________________________________________
 //________________________________________________________________________________________________________________________________________
-// Funtion:     KML_DocumentInit(KML_Document_t *)
+// Function:    KML_DocumentInit(KML_Document_t *)
 //
 // Description: This function initializes the kml-document for further use.
         doc->place.description[0]=0;
         return(1);
+}
 //________________________________________________________________________________________________________________________________________
-// Funtion:     KML_Document_Open(void);
+// Function:    KML_Document_Open(void);
 //
 // Description: This function opens a new KML- document with the specified name and creates the document header within the file.
 //
 //
 u8 KML_DocumentOpen(s8 *name, KML_Document_t *doc)
+{
+        u8 retvalue = 0;
-        u8 retvalue = 0;
+        if(doc == NULL) return(0);
-        KML_DocumentInit(doc);                                                                                                                  // intialize the document with resetvalues
+        KML_DocumentInit(doc);                                                                                                          // intialize the document with resetvalues
-        doc->file = fopen_(name,'a');                                                                                                   // open a new file with the specified filename on the memorycard.
+        doc->file = fopen_(name,'a');                                                                                           // open a new file with the specified filename on the memorycard.
         if(doc->file != NULL)                                                                                                           // could the file be opened?
         {
                 retvalue = 1;                                                                                                                   // the document could be created on the drive.
                 doc->state = DOC_OPENED;                                                                                                // change document state to opened. At next a placemark has to be opened.
-                fwrite_(KML_DOCUMENT_HEADER, sizeof(KML_DOCUMENT_HEADER)-1,1,doc->file);        // write the KML- footer to the document.
+                fwrite_((void*)KML_DOCUMENT_HEADER, sizeof(KML_DOCUMENT_HEADER)-1,1,doc->file);// write the KML- footer to the document.
+        }
         return(retvalue);
+}
 //________________________________________________________________________________________________________________________________________
-// Funtion:     DocumentClose(KML_Document_t *doc);
+// Function:    DocumentClose(KML_Document_t *doc);
 //
 // Description: This function closes the document specified by doc.
 //
 //
+// Returnvalue: '1' if the KML- file could be closed.
+//________________________________________________________________________________________________________________________________________
 // Returnvalue: none
-//________________________________________________________________________________________________________________________________________
+u8 KML_DocumentClose(KML_Document_t *doc)
+{
 u8 KML_DocumentClose(KML_Document_t *doc)
-                        break;
+                                break;
                         case DOC_OPENED:                                                                        // close the file on the memorycard
                                 if(doc->file != NULL)
                                 {
-                                        fwrite_(KML_DOCUMENT_FOOTER, sizeof(KML_DOCUMENT_FOOTER)-1,1,doc->file);        // write the KML- footer to the document.
+                                        fwrite_((void*)KML_DOCUMENT_FOOTER, sizeof(KML_DOCUMENT_FOOTER)-1,1,doc->file); // write the KML- footer to the document.
                                         fclose_(doc->file);
                                         retvalue = 1;
+                                }
                                 doc->state = DOC_CLOSED;
-                        break;
+                                break;
+                        default:
+                                doc->state = DOC_CLOSED;
+                                break;
         };
+        }
         return(retvalue);
+}
 //________________________________________________________________________________________________________________________________________
-// Funtion:     u8 PlaceMarkOpen(s8 *name, File *file);
+// Function:    u8 PlaceMarkOpen(s8 *name, File *file);
 //
 // Description: This function adds a placemark to the document.
 //
 //
         if(doc->file != NULL)
+        {
                 doc->state = DOC_PLACEMARK_OPENED;
                 retvalue = 1;
-                fwrite_(KML_PLACEMARK_HEADER, sizeof(KML_PLACEMARK_HEADER)-1,1,doc->file);
+                fwrite_((void*)KML_PLACEMARK_HEADER, sizeof(KML_PLACEMARK_HEADER)-1,1,doc->file);
+        }
         return(retvalue);
 }
 //________________________________________________________________________________________________________________________________________
-// Funtion:     u8 PlaceMarkClose(KML_PlaceMark_t *place, File *file);
+// Function:    u8 PlaceMarkClose(KML_PlaceMark_t *place, File *file);
 //
 // Description: This function ends the placemark opened before.
 //
 //
-// Returnvalue: none
+// Returnvalue: 1' if the PlaceMark could be closed
         if(doc->state == DOC_PLACEMARK_OPENED)
+        {
                 if(doc->file != NULL)
+                {
-                        doc->state =DOC_OPENED;
+                        doc->state = DOC_OPENED;
-                        fwrite_(KML_PLACEMARK_FOOTER, sizeof(KML_PLACEMARK_FOOTER)-1,1,doc->file);
+                        fwrite_((void*)KML_PLACEMARK_FOOTER, sizeof(KML_PLACEMARK_FOOTER)-1,1,doc->file);
                         retvalue = 1;
+                }
+        }
         return(retvalue);
+}
 //________________________________________________________________________________________________________________________________________
-// Funtion:     u8 LineStringBegin(KML_Document_t *doc);
+// Function:    u8 LineStringBegin(KML_Document_t *doc);
 //
 // Description: This function ends the placemark opened before.
 //
 //
-// Returnvalue: none
+// Returnvalue: '1' if the LineString could be started
 //________________________________________________________________________________________________________________________________________
 u8 KML_LineStringBegin(KML_Document_t *doc)
+{
         u8 retvalue = 0;
         if(doc->file != NULL)
+        {
                 doc->state = DOC_LINESTRING_OPENED;
-                fwrite_(KML_LINESTRING_HEADER, sizeof(KML_LINESTRING_HEADER)-1,1,doc->file);
+                fwrite_((void*)KML_LINESTRING_HEADER, sizeof(KML_LINESTRING_HEADER)-1,1,doc->file);
                 retvalue = 1;
+        }
         return(retvalue);
+}
 //________________________________________________________________________________________________________________________________________
-// Funtion:     u8 LineStringEnd(KML_Document_t *doc)
+// Function:    u8 LineStringEnd(KML_Document_t *doc)
 //
         if(doc->state == DOC_LINESTRING_OPENED);
         if(doc->file != NULL)
+        {
                 doc->state = DOC_PLACEMARK_OPENED;
-                fwrite_(KML_LINESTRING_FOOTER, sizeof(KML_LINESTRING_FOOTER)-1,1,doc->file);
+                fwrite_((void*)KML_LINESTRING_FOOTER, sizeof(KML_LINESTRING_FOOTER)-1,1,doc->file);
                 retvalue = 1;
+        }
         return(retvalue);
 }
 //________________________________________________________________________________________________________________________________________
-// Funtion:     u8 LineStringAddPoint(struct str_GPSPosition, KML_Document_t *doc)
+// Function:    u8 LineStringAddPoint(gps_data_t, KML_Document_t *doc)
 //
 // Description: This function adds a point to the specified document.
 //
 //
-// Returnvalue: none
+// Returnvalue: '1' if a ppoint was added could be started
 //________________________________________________________________________________________________________________________________________
+u8 KML_LineStringAddPoint(GPS_Pos_t * pGPS_Position ,KML_Document_t *doc)
+{
+        u8 retvalue = 0;
+        s8 string[50];
-u8 KML_LineStringAddPoint(struct str_gps_nav_data gps_data ,KML_Document_t *doc)
+        s32 rel_altitude = 0;
         if(doc == NULL || pGPS_Position == NULL) return(0);
         u8 retvalue = 0;
+        if((pGPS_Position->Status != INVALID) && (GPS_HomePosition.Status != INVALID))
+        {
+                if(doc->state == DOC_LINESTRING_OPENED)
+                {
+                        if(doc->file != NULL)
+                        {
+                                s32 i1, i2;
+                                i1 = pGPS_Position->Longitude/10000000L;
+                                i2 = abs(pGPS_Position->Longitude%10000000L);
+                                sprintf(string,"\r\n%ld.%07ld,",i1, i2);
+                                fputs_(string, doc->file);
-        s8 string[50];
+                                i1 = pGPS_Position->Latitude/10000000L;
+                                i2 = abs(pGPS_Position->Latitude%10000000L);
+                                sprintf(string," %ld.%07ld,",i1, i2);
+                                fputs_(string, doc->file);
+                                // calculate relative altitude with respect to the altitude of the home position
-        if(doc->state == DOC_LINESTRING_OPENED)
+                                rel_altitude = pGPS_Position->Altitude - GPS_HomePosition.Altitude;
                                 if(rel_altitude < 0) rel_altitude = 0; // avoid negative altitudes in log
-                if(doc->file != NULL)
+                                i1 = rel_altitude/1000L;
+                                i2 = abs(rel_altitude%1000L);
                                 sprintf(string," %ld.%03ld",i1, i2);
-                        sprintf(string,"\r\n%d.%d,%d.%d,%d.0",(gps_data.Longitude/10000000),(gps_data.Longitude%10000000),(gps_data.Latitude/10000000),(gps_data.Latitude%10000000),0);
+                                fputs_(string, doc->file);
-                        fputs_(doc->file,string);
+                                retvalue = 1;
-                        retvalue = 1;
+                        }
+                }
+        }
         return(retvalue);
 }
 //________________________________________________________________________________________________________________________________________
-// Funtion:     u8 KML_LoggGPSCoordinates(struct str_gps_nav_data, KML_Document_t *)
+// Function:    u8 KML_LoggGPSCoordinates(gps_data_t *, KML_Document_t *)
+//
-//
+// Description: This function opens adds gpscoordinates to an KML-Document. The document will be opened, if not already done
-// Description: This function opens adds gpscoordinates to an KML-Document. The document will be opened, if not already done
+//
 //
-//
+// Returnvalue: '1' if an gps coordinate was logged
-// Returnvalue: none
+//________________________________________________________________________________________________________________________________________
 //________________________________________________________________________________________________________________________________________
+u8 KML_LoggGPSCoordinates(GPS_Pos_t* pGPS_Position, KML_Document_t *doc)
+{
-u8      KML_LoggGPSCoordinates(struct str_gps_nav_data gps_data, KML_Document_t *doc)
+        u8 retval = 0;
         while(doc->state != DOC_LINESTRING_OPENED)                                      // automatic create document with default filename on the card.
         while(doc->state != DOC_LINESTRING_OPENED)                                      // automatic create document with default filename on the card.
                 switch(doc->state)
                 switch(doc->state)
-                {
+                        case DOC_CLOSED:                                                                        // document hasn't been opened yet therefore it will be initialized automatically
+                                KML_DocumentInit(doc);                                                  // initialize the document to default values
-                        case DOC_CLOSED:                                                                        // document hasn't been opened yet therefore it will be initialized automatically
+                                retval = KML_DocumentOpen("default.kml",doc);   // open the kml-document with a standardname.
-                                KML_DocumentInit(doc);                                                  // initialize the document to default values
+                                if(retval)
                                 if(KML_DocumentOpen("default.kml",doc))         // open the kml-document with a standardname.
                                         doc->state = DOC_OPENED;
                                         doc->state = DOC_OPENED;
-                                }
+                        break;
-                        break;
+                        case DOC_OPENED:                                                                        // if a document has been opened before but no placemark exists:
                                 retval = KML_PlaceMarkOpen("MIKROKOPTER",doc);
-                        case DOC_OPENED:                                                                        // if a document has been opened before but no placemark exists:
+                                if(retval)
                                 if(KML_PlaceMarkOpen("MIKROKOPTER",doc))
+                                        doc->state = DOC_PLACEMARK_OPENED;                      // add a placemark to the document.
+                                }
+                        break;
+                        case DOC_PLACEMARK_OPENED:                                                      // add linestring to the placemark
+                                retval = KML_LineStringBegin(doc);
                                 if(retval)
-                                        doc->state = DOC_PLACEMARK_OPENED;      // add a placemark to the document.
+                                {
-                        break;
+                                        doc->state = DOC_LINESTRING_OPENED;
+                                }
-                        case DOC_PLACEMARK_OPENED:                                                      // add linestring to the placemark
+                        break;
-                                if(KML_LineStringBegin(doc))
+                        default:

Subversion Repositories NaviCtrl

(root)/tags/V0.28n/kml.c @ 459 - Rev 27 → 41