From aded8e478f672cfd972f01d48f5ea17a75c4701d Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Tue, 12 Dec 2017 13:58:01 +0100 Subject: [PATCH] Fixed code for external trigger --- software/drscl/drs_exam.cpp | 12 ++++++------ software/drscl/drs_exam.xcodeproj/project.pbxproj | 14 +++++++++++++- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/software/drscl/drs_exam.cpp b/software/drscl/drs_exam.cpp index ba5b496..61460a1 100644 --- a/software/drscl/drs_exam.cpp +++ b/software/drscl/drs_exam.cpp @@ -83,7 +83,7 @@ int main() //b->SetInputRange(0.5); /* use following line to turn on the internal 100 MHz clock connected to all channels */ - b->EnableTcal(1); + //b->EnableTcal(1); /* use following lines to enable hardware trigger on CH1 at 50 mV positive edge */ if (b->GetBoardType() >= 8) { // Evaluaiton Board V4&5 @@ -95,7 +95,7 @@ int main() } b->SetTriggerLevel(0.05); // 0.05 V b->SetTriggerPolarity(false); // positive edge - + /* use following lines to set individual trigger elvels */ //b->SetIndividualTriggerLevel(1, 0.1); //b->SetIndividualTriggerLevel(2, 0.2); @@ -106,12 +106,12 @@ int main() b->SetTriggerDelayNs(0); // zero ns trigger delay /* use following lines to enable the external trigger */ - //if (b->GetBoardType() == 8) { // Evaluaiton Board V4 + //if (b->GetBoardType() >= 8) { // Evaluaiton Board V4 // b->EnableTrigger(1, 0); // enable hardware trigger - // b->SetTriggerSource(1<<4); // set external trigger as source - //} else { // Evaluation Board V3 + // b->SetTriggerConfig(1<<4); // set external trigger as source + //} else { // Evaluation Board V3 // b->EnableTrigger(1, 0); // lemo on, analog trigger off - // } + //} /* open file to save waveforms */ f = fopen("data.txt", "w"); diff --git a/software/drscl/drs_exam.xcodeproj/project.pbxproj b/software/drscl/drs_exam.xcodeproj/project.pbxproj index 86e992c..4e1a65a 100644 --- a/software/drscl/drs_exam.xcodeproj/project.pbxproj +++ b/software/drscl/drs_exam.xcodeproj/project.pbxproj @@ -121,7 +121,7 @@ D5446422141E1BB40027AF52 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0820; + LastUpgradeCheck = 0920; ORGANIZATIONNAME = PSI; }; buildConfigurationList = D5446425141E1BB40027AF52 /* Build configuration list for PBXProject "drs_exam" */; @@ -162,12 +162,18 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -202,12 +208,18 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;