• MikroKopter.de
• Wiki
• SHOP
• Datenschutz
• Impressum

ProjectsBL-CtrlFlightCtrlMK3MagNaviCtrl

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /FollowMe @ 420

  → /FollowMe @ 421

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 420 → Rev 421

/FollowMe/temp/FollowMe/gpx.c
272,7 → 272,7
{
uint8_t retvalue = 0;
int8_t string[50];
int8_t string[100];
if(doc == NULL) return(0);

/FollowMe/temp/FollowMe/logging.c
59,7 → 59,7
#include "timer0.h"
#include "uart1.h"
#include "kml.h"
#include "gpx.h"
//#include "gpx.h"
#include "ssc.h"
#include "settings.h"
#include "printf_P.h"
78,7 → 78,7
// logger handler prototypes
logfilestate_t Logging_KML(uint16_t LogDelay);
logfilestate_t Logging_GPX(uint16_t LogDelay);
//logfilestate_t Logging_GPX(uint16_t LogDelay);
typedef struct
{
115,7 → 115,7
}
//----------------------------------------------------------------------------------------------------
int8_t* GenerateGPXLogFileName(void)
/*int8_t* GenerateGPXLogFileName(void)
{
static uint16_t filenum = 0; // file name counter
static int8_t filename[35];
137,7 → 137,7
return filename;
}
else return NULL;
}
}*/
//----------------------------------------------------------------------------------------------------
265,6 → 265,7
}
//----------------------------------------------------------------------------------------------------
/*
// logs gps and state info to a gpx file
logfilestate_t Logging_GPX(uint16_t LogDelay)
{
385,8 → 386,8
return logfilestate;
}
*/
//----------------------------------------------------------------------------------------------------
// initialize logging
void Logging_Init(void)
394,9 → 395,9
LogCfg.KML_Interval = 500; //default
Settings_GetParamValue(PID_KML_LOGGING, (uint16_t*)&LogCfg.KML_Interval); // overwrite by settings value
Logging_KML(0); // initialize
LogCfg.GPX_Interval = 1000; //default
Settings_GetParamValue(PID_GPX_LOGGING, (uint16_t*)&LogCfg.GPX_Interval); // overwrite by settings value
Logging_GPX(0); // initialize
//LogCfg.GPX_Interval = 1000; //default
//Settings_GetParamValue(PID_GPX_LOGGING, (uint16_t*)&LogCfg.GPX_Interval); // overwrite by settings value
//Logging_GPX(0); // initialize
}
//----------------------------------------------------------------------------------------------------
414,7 → 415,7
logtimer = SetDelay(10); // faster makes no sense
// call the logger handlers if no error has occured
if(logstate != LOGFILE_ERROR) logstate = Logging_KML(LogCfg.KML_Interval);
if(logstate != LOGFILE_ERROR) logstate = Logging_GPX(LogCfg.GPX_Interval);
//if(logstate != LOGFILE_ERROR) logstate = Logging_GPX(LogCfg.GPX_Interval);
// a logging error has occured
if(logstate == LOGFILE_ERROR)

/FollowMe/temp/FollowMe/makefile
76,8 → 76,7
##########################################################################################################
# List C source files here. (C dependencies are automatically generated.)
SRC = main.c uart0.c uart1.c printf_P.c timer0.c menu.c led.c ubx.c analog.c button.c crc16.c ssc.c sdc.c fat16.c gps.c settings.c logging.c kml.c gpx.c
SRC = main.c uart0.c uart1.c printf_P.c timer0.c menu.c led.c ubx.c analog.c button.c crc16.c ssc.c sdc.c fat16.c gps.c settings.c logging.c kml.c
##########################################################################################################