merged with developer a lot of bug fixes from 14 sep to 30 sep

This commit is contained in:
Dhanya Maliakal
2016-10-04 13:36:04 +02:00
25 changed files with 701 additions and 127 deletions

View File

@ -491,6 +491,12 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
*/
virtual int loadSettingsFile(string fname, int imod=-1)=0;
/** programs FPGA with pof file
\param fname file name
\returns OK or FAIL
*/
virtual int programFPGA(string fname)=0;
/** saves the modules settings/trimbits writing to a file