chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

F&P Icon timestamp patch (thanks Roy Stone)

Browse Source
This commit is contained in:
Mark Watkins 2014-05-11 15:19:25 +10:00
parent bae7f333d6
commit 2089de7120
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
View File

@ -303,7 +303,7 @@ QDateTime FPIconLoader::readFPDateTime(quint8 *data)
quint8 hour = ts & 0x1f; // 10 16 quint8 hour = ts & 0x1f; // 10 16
QDate date = QDate(2000 + year, month, day); QDate date = QDate(2000 + year, month, day);
QTime time = QTime(hour, minute, second); QTime time = QTime(hour, minute, second);
QDateTime datetime = QDateTime(date, time); QDateTime datetime = QDateTime(date, time, Qt::UTC);
return datetime; return datetime;
} }
@ -641,7 +641,7 @@ bool FPIconLoader::OpenSummary(Machine *mach, QString filename, Profile *profile
minute = (ts >> 6) & 0x3f; minute = (ts >> 6) & 0x3f;
hour = (ts >> 12) & 0x1f; hour = (ts >> 12) & 0x1f;
datetime = QDateTime(QDate(year, month, day), QTime(hour, minute, second)); datetime = QDateTime(QDate(year, month, day), QTime(hour, minute, second), Qt::UTC);
date = datetime.date(); date = datetime.date();
ts = datetime.toTime_t(); ts = datetime.toTime_t();
@ -793,7 +793,7 @@ bool FPIconLoader::OpenDetail(Machine *mach, QString filename, Profile *profile)
minute = (ts >> 6) & 0x3f; minute = (ts >> 6) & 0x3f;
hour = (ts >> 12) & 0x1f; hour = (ts >> 12) & 0x1f;
datetime = QDateTime(QDate(year, month, day), QTime(hour, minute, second)); datetime = QDateTime(QDate(year, month, day), QTime(hour, minute, second), Qt::UTC);
//datetime=datetime.toTimeSpec(Qt::UTC); //datetime=datetime.toTimeSpec(Qt::UTC);
ts = datetime.toTime_t(); ts = datetime.toTime_t();
@ -821,6 +821,7 @@ bool FPIconLoader::OpenDetail(Machine *mach, QString filename, Profile *profile)
qint64 ti; qint64 ti;
quint8 pressure, leak, a1, a2, a3; quint8 pressure, leak, a1, a2, a3;
quint8 sa1, sa2; // The two sense awake bits per 2 minutes
SessionID sessid; SessionID sessid;
Session *sess; Session *sess;
int idx; int idx;
@ -849,17 +850,34 @@ bool FPIconLoader::OpenDetail(Machine *mach, QString filename, Profile *profile)
a1 = data[idx + 2]; a1 = data[idx + 2];
a2 = data[idx + 3]; a2 = data[idx + 3];
a3 = data[idx + 4]; a3 = data[idx + 4];
sa1 = (a3 >> 6) & 1; // Sense awake bit for first minutes
sa2 = (a3 >> 7) & 1; // Sense awake bit for second minutes
PR->AddEvent(ti, pressure); PR->AddEvent(ti, pressure);
LK->AddEvent(ti, leak); LK->AddEvent(ti, leak);
for (int k = 0; k < 6; k++) { // There are 6 flag sets per 2 minutes
if (a1 > 0) { OA->AddEvent(ti, a1); } //if (a1 > 0) { OA->AddEvent(ti, a1); }
if ((a1 & 1) == 1) { OA->AddEvent(ti, 1); }
if (a2 > 0) { H->AddEvent(ti, a2); } //if (a2 > 0) { H->AddEvent(ti, a2); }
if ((a2 & 1) == 1) { H->AddEvent(ti, 1); }
if (a3 > 0) { FL->AddEvent(ti, a3); } //if (a3 > 0) { FL->AddEvent(ti, a3); }
if ((a3 & 1) == 1) { FL->AddEvent(ti, 1); }
// These should be flags as above, but for now I re-used the redundant FLG graph
if (k == 0) { FLG->AddEvent(ti, sa1); }
else if (k == 3) { FLG->AddEvent(ti, sa2); }
else { FLG->AddEvent(ti, 0); }
a1 = a1 >> 1;
a2 = a2 >> 1;
a3 = a3 >> 1;
ti += 20000L; // Increment 20 seconds
}
//FLG->AddEvent(ti, a3);
//ti += 120000L;
FLG->AddEvent(ti, a3);
ti += 120000L;
idx += 5; idx += 5;
} }
} }