eddy/apogee_control
1
0
Fork 0
mirror of https://github.com/eddyem/apogee_control.git synced 2026-03-21 17:20:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

histry

Browse Source
This commit is contained in:
eddyem
2015-06-28 16:46:45 +03:00
parent 7b98fe9a85
commit 2e6b90f2a9
6 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apogee_C_wrapper/CMakeLists.txt
View File

@@ -12,13 +12,6 @@ endif()
if(DEFINED VERBOSE OR DEFINED VERB OR DEFINED V)
set(CMAKE_VERBOSE_MAKEFILE ON)
endif()
if(NOT DEFINED CAMERA_TYPE)
message(FATAL_ERROR "You shoul define camera type CAMERA_TYPE: APOGEE_ASCENT, "
"APOGEE_ALTA, APOGEE_ALTAF, APOGEE_ASPEN or APOGEE_QUAD\n"
"For example, run\n\tcmake .. -DCAMERA_TYPE=APOGEE_ALTAF")
else()
add_definitions("-D${CAMERA_TYPE}")
endif()
set(APOGEE_VERSION "3.0")
set(APOGEE_SOVERSION "3")

6
apogee_C_wrapper/src/libapogee.cpp
View File

@@ -168,8 +168,8 @@ static bool IsProperDevice(const std::string & msg){
static bool assignAlta(const std::string & msg){
std::string model = GetItemFromFindStr(msg, "model=");
if(model.compare(0,6,"Ascent")==0) alta = (Ascent*) new Ascent();
else if(model.compare(0,4,"Alta")==0) alta = (Alta*) new Alta();
else if(model.compare(0,5,"AltaF")==0) alta = (AltaF*) new AltaF();
else if(model.compare(0,4,"Alta")==0) alta = (Alta*) new Alta();
else if(model.compare(0,5,"Aspen")==0) alta = (Aspen*) new Aspen();
else if(model.compare(0,4,"Quad")==0) alta = (Quad*) new Quad();
else return false;
@@ -229,7 +229,9 @@ static CamParams *findNET(){
if(subnet.size() == 0) return NULL; // subnet wasn't defined
FindDeviceEthernet look4cam;
DBG(subnet);
clearenv(); // clear all proxy & other data
//clearenv(); // clear all proxy & other data
setenv("http_proxy", "", 1);
setenv("HTTP_PROXY", "", 1);
std::string msg = look4cam.Find(subnet);
// if(!IsProperDevice(msg)) // device not found
// return NULL;