detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-03 03:10:04 +02:00
Code Issues Actions Packages Releases Activity

fixed dr bug

Browse Source
This commit is contained in:
sala 2014-11-07 15:49:01 +01:00 committed by Manuel Guizar
parent 9ec5541b58
commit 3a07f0d785
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/include/UDPRESTImplementation.h
View File

@ -592,7 +592,7 @@ private:
int32_t numberOfFrames; int32_t numberOfFrames;
/** dynamic range */ /** dynamic range */
int dynamicRange; //int dynamicRange;
/** short frames */ /** short frames */
int shortFrame; int shortFrame;

26
slsReceiverSoftware/src/UDPRESTImplementation.cpp
View File

@ -344,7 +344,13 @@ int32_t UDPRESTImplementation::setDynamicRange(int32_t dr){
} }
/*
int32_t UDPRESTImplementation::getDynamicRange() const{
FILE_LOG(logDEBUG) << __FILE__ << "::" << __func__ << " starting";
return dynamicRange;
}
*/
int UDPRESTImplementation::setShortFrame(int i){ int UDPRESTImplementation::setShortFrame(int i){
FILE_LOG(logDEBUG) << __AT__ << " called"; FILE_LOG(logDEBUG) << __AT__ << " called";
@ -708,14 +714,15 @@ int UDPRESTImplementation::shutDownUDPSockets(){
string be_state = ""; string be_state = "";
// LEO: this is probably wrong // LEO: this is probably wrong
if (be_state == "OPEN"){ cout << "AAAAAAAAAAAAA " << be_state << " " << status << endl;
//if (be_state == "OPEN"){
while (be_state != "TRANSIENT"){ while (be_state != "TRANSIENT"){
code = rest->get_json("state", &answer); code = rest->get_json("state", &answer);
be_state = answer["state"].getString(); be_state = answer["state"].getString();
cout << be_state << endl; cout << "be_State: " << be_state << endl;
usleep(10000); usleep(10000);
} }
} //}
code = rest->post_json("state/close", &answer); code = rest->post_json("state/close", &answer);
std::cout <<code << " " << answer << std::endl; std::cout <<code << " " << answer << std::endl;
code = rest->post_json("state/reset", &answer); code = rest->post_json("state/reset", &answer);
@ -1143,11 +1150,12 @@ int UDPRESTImplementation::startReceiver(char message[]){
stringstream ss; stringstream ss;
ss << getDynamicRange(); ss << getDynamicRange();
string str_dr = ss.str(); string str_dr = ss.str();
ss << getNumberOfFrames(); stringstream ss2;
string str_n = ss.str(); ss2 << getNumberOfFrames();
string str_n = ss2.str();
std::string request_body = "{\"settings\": {\"bit_depth\": " + str_dr + ", \"nimages\": " + str_n + "}}"; std::string request_body = "{\"settings\": {\"bit_depth\": " + str_dr + ", \"nimages\": " + str_n + "}}";
//"{\"nimages\":\"1\", \"bit_depth\":\"16\"}"; //std::string request_body = "{\"settings\": {\"nimages\":1, \"scanid\":999, \"bit_depth\":16}}";
FILE_LOG(logDEBUG) << __FILE__ << "::" << " sending this configuration body: " << request_body; FILE_LOG(logDEBUG) << __FILE__ << "::" << " sending this configuration body: " << request_body;
code = rest->post_json("state/configure", &answer, request_body); code = rest->post_json("state/configure", &answer, request_body);
code = rest->get_json("state", &answer); code = rest->get_json("state", &answer);