 /*---------------------------------------------------------------------------------------*/ 
 void waypoint::SetTime(char *pTime, char * pDate)
 {
-//     GPSfile = "GPS_yymmdd_hhmmss.CSV"; 
-     strncpy(GPSfile+4,  pDate+4, 2);     
-     strncpy(GPSfile+6,  pDate+2, 2);     
-     strncpy(GPSfile+8,  pDate, 2);     
-     strncpy(GPSfile+11, pTime,6);
+//     was: GPSfile = "GPS_yymmdd_hhmmss.CSV"; 
+//     now: GPSfile = "mmddhhmm.CSV";
+//   strncpy(GPSfile+4,  pDate+4, 2);  // year   
+     strncpy(GPSfile,  pDate+2, 2);  // month   
+     strncpy(GPSfile+2,  pDate, 2);    // day    
+     strncpy(GPSfile+4, pTime,2);     // GMT hour
+     strncpy(GPSfile+6, pTime+2,2);     // minute
+//   strncpy(GPSfile+11, pTime+4,2);     // second
      Serial.println(GPSfile);
 }
 

namespace C6_Navigator {
#endif
// limited to 8+3 characters
#define FILE_NAME "GPS_Log.csv"
File dataFile;
char GPSfile[BUFFSIZ] = "GPS_yymmdd_hhmmss.csv"; 
String formDataString();
 
int waypoints;


    // open the file. note that only one file can be open at a time,
    // so you have to close this one before opening another.
    dataFile = SD.open(GPSfile, FILE_WRITE);
  
    // if the file is available, write to it:
    if (GPS_available && dataFile) 
