detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-04 00:08:41 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' into m3pattern

Browse Source
This commit is contained in:
maliakal_d
2020-07-08 14:10:04 +02:00
parent 1e0160d655 890a641304
commit eea013d492
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/src/Module.cpp
View File

@@ -330,7 +330,7 @@ void Module::setImageTestMode(const int value) {
} }
int Module::getADC(dacIndex index) { int Module::getADC(dacIndex index) {
return sendToDetector<int>(F_GET_ADC, static_cast<int>(index)); return sendToDetectorStop<int>(F_GET_ADC, static_cast<int>(index));
} }
int Module::getOnChipDAC(slsDetectorDefs::dacIndex index, int chipIndex) { int Module::getOnChipDAC(slsDetectorDefs::dacIndex index, int chipIndex) {
@@ -3034,4 +3034,4 @@ void Module::programFPGAviaNios(std::vector<char> buffer) {
rebootController(); rebootController();
} }
} // namespace sls } // namespace sls