From 45110a41ec5ecc04744b263badc089d555d20a2d Mon Sep 17 00:00:00 2001
From: Andreu Corominas Murtra <acoromin@iri.upc.edu>
Date: Wed, 8 Jan 2014 11:21:04 +0000
Subject: [PATCH] constant name modified
---
src/asterx1_gps.cpp | 4 ++--
src/asterx1_gps.h | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/asterx1_gps.cpp b/src/asterx1_gps.cpp
index c970361..5f623c3 100644
--- a/src/asterx1_gps.cpp
+++ b/src/asterx1_gps.cpp
@@ -149,7 +149,7 @@ int CasteRx1::startAcquisition()
else //otherwise
{
status &= ~ACQUISITION_RUNNING;
- retValue = ASTERX_CONFIG_ERROR;
+ retValue = ASTERX1_CONFIG_ERROR;
cout << "CasteRx1::startAcquisition(). ERROR on device configuration for data transmission" << endl;
}
@@ -576,7 +576,7 @@ int CasteRx1::sendCommand(const string & cmnd)
cout << " Sent command: " << cmnd << endl;
cout << " Device Reply: " << receivedReply << endl;
cout << " Expected Reply: " << expectedReply << endl;
- return ASTERX_CONFIG_ERROR;
+ return ASTERX1_CONFIG_ERROR;
}
}
diff --git a/src/asterx1_gps.h b/src/asterx1_gps.h
index 0f2d769..0d0e38d 100644
--- a/src/asterx1_gps.h
+++ b/src/asterx1_gps.h
@@ -100,7 +100,7 @@ const int BASIC_SUCCESS = 1;
const int PORT_OPEN_ERROR = -1;
const int PORT_CLOSE_ERROR = -2;
const int PORT_CONFIG_ERROR = -3;
-const int ASTERX_CONFIG_ERROR = -4;
+const int ASTERX1_CONFIG_ERROR = -4;
const int ASTERX1_INVALID_COMMAND = -5;
const int ASTERX1_STOPPINTG_ERROR = -6;
const int PORT_READ_TIMEOUT = -7;
@@ -165,7 +165,7 @@ class CasteRx1
Starts a mode of operation of continuos data flow from the device at a rate of 2Hz.
Return values are:
BASIC_SUCCESS
- ASTERX_CONFIG_ERROR
+ ASTERX1_CONFIG_ERROR
*/
int startAcquisition();
@@ -313,7 +313,7 @@ class CasteRx1
BASIC_SUCCESS if device has acknowledged the command.
PORT_READ_TIMEOUT if timeout is reached and the receiver has not replied with an acknowledment.
ASTERX1_INVALID_COMMAND when device doesn't know the command.
- ASTERX_CONFIG_ERROR otherwise.
+ ASTERX1_CONFIG_ERROR otherwise.
*/
int sendCommand(const string & cmnd);
--
GitLab