Rev 420 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 420 | Rev 421 | ||
|---|---|---|---|
| Line 57... | Line 57... | ||
| 57 | #include <stdio.h> |
57 | #include <stdio.h> |
| 58 | #include "main.h" |
58 | #include "main.h" |
| 59 | #include "timer0.h" |
59 | #include "timer0.h" |
| 60 | #include "uart1.h" |
60 | #include "uart1.h" |
| 61 | #include "kml.h" |
61 | #include "kml.h" |
| 62 | #include "gpx.h" |
62 | //#include "gpx.h" |
| 63 | #include "ssc.h" |
63 | #include "ssc.h" |
| 64 | #include "settings.h" |
64 | #include "settings.h" |
| 65 | #include "printf_P.h" |
65 | #include "printf_P.h" |
| Line 76... | Line 76... | ||
| 76 | LOGFILE_ERROR |
76 | LOGFILE_ERROR |
| 77 | } logfilestate_t; |
77 | } logfilestate_t; |
| Line 78... | Line 78... | ||
| 78 | 78 | ||
| 79 | // logger handler prototypes |
79 | // logger handler prototypes |
| 80 | logfilestate_t Logging_KML(uint16_t LogDelay); |
80 | logfilestate_t Logging_KML(uint16_t LogDelay); |
| Line 81... | Line 81... | ||
| 81 | logfilestate_t Logging_GPX(uint16_t LogDelay); |
81 | //logfilestate_t Logging_GPX(uint16_t LogDelay); |
| 82 | 82 | ||
| 83 | typedef struct |
83 | typedef struct |
| 84 | { |
84 | { |
| Line 113... | Line 113... | ||
| 113 | } |
113 | } |
| 114 | else return NULL; |
114 | else return NULL; |
| 115 | } |
115 | } |
| Line 116... | Line 116... | ||
| 116 | 116 | ||
| 117 | //---------------------------------------------------------------------------------------------------- |
117 | //---------------------------------------------------------------------------------------------------- |
| 118 | int8_t* GenerateGPXLogFileName(void) |
118 | /*int8_t* GenerateGPXLogFileName(void) |
| 119 | { |
119 | { |
| 120 | static uint16_t filenum = 0; // file name counter |
120 | static uint16_t filenum = 0; // file name counter |
| 121 | static int8_t filename[35]; |
121 | static int8_t filename[35]; |
| Line 135... | Line 135... | ||
| 135 | sprintf(filename, "LOG/%04i%02i%02i/GPX/GPS%05i.GPX", SystemTime.Year, SystemTime.Month, SystemTime.Day, filenum); |
135 | sprintf(filename, "LOG/%04i%02i%02i/GPX/GPS%05i.GPX", SystemTime.Year, SystemTime.Month, SystemTime.Day, filenum); |
| 136 | filenum++; |
136 | filenum++; |
| 137 | return filename; |
137 | return filename; |
| 138 | } |
138 | } |
| 139 | else return NULL; |
139 | else return NULL; |
| 140 | } |
140 | }*/ |
| Line 141... | Line 141... | ||
| 141 | 141 | ||
| 142 | 142 | ||
| 143 | //---------------------------------------------------------------------------------------------------- |
143 | //---------------------------------------------------------------------------------------------------- |
| Line 263... | Line 263... | ||
| 263 | 263 | ||
| 264 | return logfilestate; |
264 | return logfilestate; |
| Line 265... | Line 265... | ||
| 265 | } |
265 | } |
| - | 266 | ||
| 266 | 267 | //---------------------------------------------------------------------------------------------------- |
|
| 267 | //---------------------------------------------------------------------------------------------------- |
268 | /* |
| 268 | // logs gps and state info to a gpx file |
269 | // logs gps and state info to a gpx file |
| 269 | logfilestate_t Logging_GPX(uint16_t LogDelay) |
270 | logfilestate_t Logging_GPX(uint16_t LogDelay) |
| 270 | { |
271 | { |
| Line 383... | Line 384... | ||
| 383 | } //EOF follow me off |
384 | } //EOF follow me off |
| 384 | } // EOF Check LogTimer |
385 | } // EOF Check LogTimer |
| Line 385... | Line 386... | ||
| 385 | 386 | ||
| 386 | return logfilestate; |
387 | return logfilestate; |
| 387 | } |
388 | } |
| Line 388... | Line 389... | ||
| 388 | 389 | */ |
|
| 389 | 390 | ||
| 390 | //---------------------------------------------------------------------------------------------------- |
391 | //---------------------------------------------------------------------------------------------------- |
| 391 | // initialize logging |
392 | // initialize logging |
| 392 | void Logging_Init(void) |
393 | void Logging_Init(void) |
| 393 | { |
394 | { |
| 394 | LogCfg.KML_Interval = 500; //default |
395 | LogCfg.KML_Interval = 500; //default |
| 395 | Settings_GetParamValue(PID_KML_LOGGING, (uint16_t*)&LogCfg.KML_Interval); // overwrite by settings value |
396 | Settings_GetParamValue(PID_KML_LOGGING, (uint16_t*)&LogCfg.KML_Interval); // overwrite by settings value |
| 396 | Logging_KML(0); // initialize |
397 | Logging_KML(0); // initialize |
| 397 | LogCfg.GPX_Interval = 1000; //default |
398 | //LogCfg.GPX_Interval = 1000; //default |
| 398 | Settings_GetParamValue(PID_GPX_LOGGING, (uint16_t*)&LogCfg.GPX_Interval); // overwrite by settings value |
399 | //Settings_GetParamValue(PID_GPX_LOGGING, (uint16_t*)&LogCfg.GPX_Interval); // overwrite by settings value |
| Line 399... | Line 400... | ||
| 399 | Logging_GPX(0); // initialize |
400 | //Logging_GPX(0); // initialize |
| 400 | } |
401 | } |
| 401 | 402 | ||
| Line 412... | Line 413... | ||
| 412 | if(CheckDelay(logtimer)) |
413 | if(CheckDelay(logtimer)) |
| 413 | { |
414 | { |
| 414 | logtimer = SetDelay(10); // faster makes no sense |
415 | logtimer = SetDelay(10); // faster makes no sense |
| 415 | // call the logger handlers if no error has occured |
416 | // call the logger handlers if no error has occured |
| 416 | if(logstate != LOGFILE_ERROR) logstate = Logging_KML(LogCfg.KML_Interval); |
417 | if(logstate != LOGFILE_ERROR) logstate = Logging_KML(LogCfg.KML_Interval); |
| 417 | if(logstate != LOGFILE_ERROR) logstate = Logging_GPX(LogCfg.GPX_Interval); |
418 | //if(logstate != LOGFILE_ERROR) logstate = Logging_GPX(LogCfg.GPX_Interval); |
| Line 418... | Line 419... | ||
| 418 | 419 | ||
| 419 | // a logging error has occured |
420 | // a logging error has occured |
| 420 | if(logstate == LOGFILE_ERROR) |
421 | if(logstate == LOGFILE_ERROR) |
| 421 | { |
422 | { |