Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge Datalog till 99 #32

Merged
merged 1 commit into from Feb 18, 2013
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 11 additions & 2 deletions Quad/Regelung.cpp
Expand Up @@ -82,7 +82,7 @@ volatile unsigned short tmp111;
bool_t datalog_regelung_opened = 0;
bool_t datalog_regelung_syncing = 0;
static TimeMeasurement regelungdatalogsync_tmup;
char fileName[20] = "QuadReg0.TXT";
char fileName[20] = "Reg00.TXT";
/*
* Working area for RegelungSyncThread
*/
Expand All @@ -102,7 +102,16 @@ static msg_t RegelungSyncthread(void *arg)
rc_datalog = f_open(&Fil_regelung, fileName, FA_WRITE | FA_CREATE_NEW/* | FA_CREATE_ALWAYS*/);
if(rc_datalog == FR_EXIST)
{
fileName[7]++;
if(fileName[4] < 57)
{
fileName[4]++;
}
else
{
fileName[3]++;
fileName[4] = 48;

}
}
else if(rc_datalog != FR_OK)
{
Expand Down