nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-14 00:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

log sent messages

Browse Source
This commit is contained in:
vlcvboyer
2016-01-03 10:21:53 +01:00
parent 255aadab46
commit ca5d636e45
6 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ANT.cpp
View File

@@ -868,6 +868,11 @@ ANT::sendMessage(ANTMessage m) {
//for(int i=0; i<m.length+3; i++) fprintf(stderr, "%02x ", m.data[i]);
//fprintf(stderr, "\n");
struct timeval timestamp;
gettimeofday(&timestamp, NULL);
unsigned char RS='S';
emit sentAntMessage(RS, m, timestamp);
rawWrite((uint8_t*)m.data, m.length);
// this padding is important - do not remove it
@@ -948,7 +953,8 @@ ANT::processMessage(void) {
struct timeval timestamp;
get_timeofday (&timestamp);
emit receivedAntMessage(m, timestamp);
unsigned char RS = 'R';
emit receivedAntMessage(RS, m, timestamp);
switch (rxMessage[ANT_OFFSET_ID]) {
case ANT_NOTIF_STARTUP:

3
src/ANT.h
View File

@@ -399,7 +399,8 @@ signals:
// signal for passing remote control commands
void antRemoteControl(uint16_t command);
void receivedAntMessage(const ANTMessage message, const struct timeval timestamp);
void receivedAntMessage(const unsigned char RS, const ANTMessage message, const struct timeval timestamp);
void sentAntMessage(const unsigned char RS, const ANTMessage message, const struct timeval timestamp);
public slots:

4
src/ANTLogger.cpp
View File

@@ -42,11 +42,13 @@ ANTLogger::close()
isLogging=false;
}
void ANTLogger::logRawAntMessage(const ANTMessage message, const struct timeval timestamp)
void ANTLogger::logRawAntMessage(const unsigned char RS, const ANTMessage message, const struct timeval timestamp)
{
if (isLogging) {
QDataStream out(&antlog);
out << RS;
uint64_t millis = (timestamp.tv_sec * (uint64_t)1000) + (timestamp.tv_usec / 1000);
for (int i=0; i<8; i++) {

2
src/ANTLogger.h
View File

@@ -33,7 +33,7 @@ public:
signals:
public slots:
void logRawAntMessage(const ANTMessage message, const struct timeval timestamp);
void logRawAntMessage(const unsigned char RS, const ANTMessage message, const struct timeval timestamp);
void open();
void close();

3
src/ANTlocalController.cpp
View File

@@ -44,7 +44,8 @@ ANTlocalController::ANTlocalController(TrainSidebar *parent, DeviceConfiguration
connect(myANTlocal, SIGNAL(antRemoteControl(uint16_t)), this, SLOT(antRemoteControl(uint16_t)));
// Connect a logger
connect(myANTlocal, SIGNAL(receivedAntMessage(const ANTMessage ,const timeval )), &logger, SLOT(logRawAntMessage(const ANTMessage ,const timeval)));
connect(myANTlocal, SIGNAL(receivedAntMessage(const unsigned char, const ANTMessage ,const timeval )), &logger, SLOT(logRawAntMessage(const unsigned char, const ANTMessage ,const timeval)));
connect(myANTlocal, SIGNAL(sentAntMessage(const unsigned char, const ANTMessage ,const timeval )), &logger, SLOT(logRawAntMessage(const unsigned char, const ANTMessage ,const timeval)));
}
void

8
src/antlog.py
View File

@@ -15,13 +15,17 @@ import os
import struct
file = open(sys.argv[1], 'rb')
for line in range(0, os.path.getsize(sys.argv[1]), 20):
for line in range(0, os.path.getsize(sys.argv[1]), 21):
data = file.read(1)
RS = data[0];
data = file.read(8)
timestamp = struct.unpack('L', data)[0]
data = file.read(12)
print str(timestamp) + ': ' \
print str(timestamp) + ' - ' \
+ RS + ': ' \
+ '0x' + (data[0]).encode('hex').upper() + ', ' \
+ '0x' + (data[1]).encode('hex').upper() + ', ' \
+ '0x' + (data[2]).encode('hex').upper() + ', ' \