Commit c28b4c4b authored by Marco Buttu's avatar Marco Buttu Committed by GitHub
Browse files

Merge pull request #173 from discos/fix-issue-172 

Fix #172, replaced hardcoded paths with path retrieved by ACS_CDB environment variable.
parents 97a76eea bded5588

SRT/Servers/SRTActiveSurfaceBoss/include/SRTActiveSurfaceBossCore.h

+18 −17
Original line number Diff line number Diff line
@@ -32,8 +32,9 @@ 
#define firstUSD 1

#define lastUSD 1116

#define LOOPTIME 100000 // 0,10 sec

#define USDTABLE "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD.txt\0"

#define USDTABLECORRECTIONS "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/act_rev02.txt\0"

#define CDBPATH (std::string(getenv("ACS_CDB")) + "/CDB/").c_str()

#define USDTABLE (std::string(CDBPATH) + "alma/AS/tab_convUSD.txt\0").c_str()

#define USDTABLECORRECTIONS (std::string(CDBPATH) + "alma/AS/act_rev02.txt\0").c_str()

#define MM2HSTEP	350 //(10500 HSTEP / 30 MM)

#define MM2STEP	1400 //(42000 STEP / 30 MM)

#define WARNINGUSDPERCENT 0.95

SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp

+38 −40
Original line number Diff line number Diff line
@@ -1379,10 +1379,10 @@ void CSRTActiveSurfaceBossCore::sector1ActiveSurface() throw (ComponentErrors::C 
	printf("sector1 start\n");

	char serial_usd[23];

	char graf[5], mecc[4];

	const char * value;

	char* value = (char*)CDBPATH;

	strcat(value, "alma/AS/tab_convUSD_S1.txt\0");

	int i;



	value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S1.txt\0";

	ifstream usdTableS1(value);

	if (!usdTableS1) {

		ACS_SHORT_LOG ((LM_INFO, "File %s not found", value));
@@ -1413,10 +1413,10 @@ void CSRTActiveSurfaceBossCore::sector2ActiveSurface() throw (ComponentErrors::C 
	printf("sector2 start\n");

	char serial_usd[23];

	char graf[5], mecc[4];

	const char * value;

	char* value = (char*)CDBPATH;

	strcat(value, "alma/AS/tab_convUSD_S2.txt\0");

	int i;



	value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S2.txt\0";

	ifstream usdTableS2(value);

	if (!usdTableS2) {

		ACS_SHORT_LOG ((LM_INFO, "File %s not found", value));
@@ -1448,10 +1448,10 @@ void CSRTActiveSurfaceBossCore::sector3ActiveSurface() throw (ComponentErrors::C 
	printf("sector3 start\n");

	char serial_usd[23];

	char graf[5], mecc[4];

	const char * value;

	char* value = (char*)CDBPATH;

 	strcat(value, "alma/AS/tab_convUSD_S3.txt\0");

	int i;



	value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S3.txt\0";

	ifstream usdTableS3(value);

	if (!usdTableS3) {

		ACS_SHORT_LOG ((LM_INFO, "File %s not found", value));
@@ -1483,10 +1483,10 @@ void CSRTActiveSurfaceBossCore::sector4ActiveSurface() throw (ComponentErrors::C 
	printf("sector4 start\n");

	char serial_usd[23];

	char graf[5], mecc[4];

	const char * value;

	char* value = (char*)CDBPATH;

 	strcat(value, "alma/AS/tab_convUSD_S4.txt\0");

	int i;



	value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S4.txt\0";

	ifstream usdTableS4(value);

	if (!usdTableS4) {

		ACS_SHORT_LOG ((LM_INFO, "File %s not found", value));
@@ -1518,10 +1518,10 @@ void CSRTActiveSurfaceBossCore::sector5ActiveSurface() throw (ComponentErrors::C 
	printf("sector5 start\n");

	char serial_usd[23];

	char graf[5], mecc[4];

	const char * value;

	char* value = (char*)CDBPATH;

 	strcat(value, "alma/AS/tab_convUSD_S5.txt\0");

	int i;



	value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S5.txt\0";

	ifstream usdTableS5(value);

	if (!usdTableS5) {

		ACS_SHORT_LOG ((LM_INFO, "File %s not found", value));
@@ -1553,10 +1553,10 @@ void CSRTActiveSurfaceBossCore::sector6ActiveSurface() throw (ComponentErrors::C 
	printf("sector6 start\n");

	char serial_usd[23];

	char graf[5], mecc[4];

	const char * value;

	char* value = (char*)CDBPATH;

 	strcat(value, "alma/AS/tab_convUSD_S6.txt\0");

	int i;



	value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S6.txt\0";

	ifstream usdTableS6(value);

	if (!usdTableS6) {

		ACS_SHORT_LOG ((LM_INFO, "File %s not found", value));
@@ -1588,10 +1588,10 @@ void CSRTActiveSurfaceBossCore::sector7ActiveSurface() throw (ComponentErrors::C 
	printf("sector7 start\n");

	char serial_usd[23];

	char graf[5], mecc[4];

	const char * value;

	char* value = (char*)CDBPATH;

 	strcat(value, "alma/AS/tab_convUSD_S7.txt\0");

	int i;



	value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S7.txt\0";

	ifstream usdTableS7(value);

	if (!usdTableS7) {

		ACS_SHORT_LOG ((LM_INFO, "File %s not found", value));
@@ -1623,10 +1623,10 @@ void CSRTActiveSurfaceBossCore::sector8ActiveSurface() throw (ComponentErrors::C 
	printf("sector8 start\n");

	char serial_usd[23];

	char graf[5], mecc[4];

	const char * value;

	char* value = (char*)CDBPATH;

 	strcat(value, "alma/AS/tab_convUSD_S8.txt\0");

	int i;



	value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S8.txt\0";

	ifstream usdTableS8(value);

	if (!usdTableS8) {

		ACS_SHORT_LOG ((LM_INFO, "File %s not found", value));
@@ -1689,14 +1689,12 @@ void CSRTActiveSurfaceBossCore::workingActiveSurface() throw (ComponentErrors::C 
void CSRTActiveSurfaceBossCore::setProfile(const ActiveSurface::TASProfile& newProfile) throw (ComponentErrors::ComponentErrorsExImpl)

{

	int s, i, l;

	const char * value;



	if ((m_sector1 == true)&&(m_sector2 == true)&&(m_sector3 == true)&&(m_sector4 == true)&&(m_sector5 == true)&&(m_sector6 == true)&&(m_sector7 == true)&&(m_sector8 == true)) {

		//printf("setProfile corrections\n");

		value = USDTABLECORRECTIONS;

    		ifstream usdCorrections (value);

    		ifstream usdCorrections (USDTABLECORRECTIONS);

    		if (!usdCorrections) {

        		ACS_SHORT_LOG ((LM_INFO, "File %s not found", value));

        		ACS_SHORT_LOG ((LM_INFO, "File %s not found", USDTABLECORRECTIONS));

			exit(-1);

		}

		actuatorsCorrections.length(NPOSITIONS);