summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Residori <marco.residori@xse.de>2015-06-02 14:11:07 +0200
committerMarco Residori <marco.residori@xse.de>2015-06-02 14:11:07 +0200
commit9654d0a24ace5b1a2d697aaeb4d35ba5efbd855a (patch)
treeae05ec6b37ba132ab16becef602d88bcbf8a48b3
parentcf3677fc785ad2a0d9822c4355869a541a26129d (diff)
downloadpositioning-9654d0a24ace5b1a2d697aaeb4d35ba5efbd855a.tar.gz
Fix bug in log-replayer, improve README and test script
-rw-r--r--README2
-rw-r--r--log-replayer/src/log-replayer.c4
-rwxr-xr-xrun-test.sh2
3 files changed, 4 insertions, 4 deletions
diff --git a/README b/README
index 4971308..9ff56bf 100644
--- a/README
+++ b/README
@@ -40,7 +40,7 @@ cmake -DWITH_TESTS=ON -DWITH_DEBUG=ON ../
make
To build with tests and with dbus interface based on Franca and CommonAPI (see below how to configure CommonAPI):
-cmake -DWITH_DBUS_INTERFACE=OFF -DWITH_FRANCA_INTERFACE=ON -DWITH_TESTS=ON -DWITH_DEBUG=ON ../
+cmake -DWITH_DBUS_INTERFACE=ON -DWITH_FRANCA_INTERFACE=OFF -DWITH_TESTS=ON -DWITH_DEBUG=ON -DWITH_DLT=OFF ../
make
===============================
diff --git a/log-replayer/src/log-replayer.c b/log-replayer/src/log-replayer.c
index 5063827..591a7d1 100644
--- a/log-replayer/src/log-replayer.c
+++ b/log-replayer/src/log-replayer.c
@@ -191,7 +191,7 @@ int main(int argc, char* argv[])
char* gnssstr = "GVGNSP,GVGNSC,GVGNSAC,GVGNSSAT";
if(strstr(gnssstr, msgId) != NULL)
{
- LOG_DEBUG(gContext,"Sending Packet to %s:%d",IPADDR,PORT1);
+ LOG_DEBUG(gContext,"Sending Packet to %s:%d",ipaddr,PORT1);
LOG_DEBUG(gContext,"MsgID:%s", msgId);
LOG_DEBUG(gContext,"Len:%d", (int)strlen(buf));
LOG_DEBUG(gContext,"Data:%s", buf);
@@ -209,7 +209,7 @@ int main(int argc, char* argv[])
char* snsstr = "GVSNSVEHSP,GVSNSGYRO,GVSNSWHTK"; //subset currently supported for new log format
if(strstr(snsstr, msgId) != NULL)
{
- LOG_DEBUG(gContext,"Sending Packet to %s:%d",IPADDR,PORT2);
+ LOG_DEBUG(gContext,"Sending Packet to %s:%d",ipaddr,PORT2);
LOG_DEBUG(gContext,"MsgID:%s", msgId);
LOG_DEBUG(gContext,"Len:%d", (int)strlen(buf));
LOG_DEBUG(gContext,"Data:%s", buf);
diff --git a/run-test.sh b/run-test.sh
index 63f80a8..b7bc726 100755
--- a/run-test.sh
+++ b/run-test.sh
@@ -82,7 +82,7 @@ testEnhancedPositionService()
testEnhancedPositionService2()
{
echo 'Starting enhanced position service...'
- $LOG_REPLAYER_BIN_DIR/log-replayer $LOG_REPLAYER_LOGS_DIR/geneve-cologny.log > /dev/null 2>&1 &
+ $LOG_REPLAYER_BIN_DIR/src/log-replayer $LOG_REPLAYER_LOGS_DIR/geneve-cologny.log > /dev/null 2>&1 &
echo 'Starting log replayer...'
$ENHANCED_POSITION_SERVICE_DBUS_BIN_DIR/src/enhanced-position-service > /dev/null 2>&1 &
sleep 10