Commit 91e5f12c authored by ics's avatar ics

Merge branch 'V3.2_191' of https://code.ill.fr/instrument-control/nomad-modules into V3.2_191

parents 4aa23bbc 2c1fcc40
......@@ -295,14 +295,17 @@ void IN16bBATSSettings::start() {
choppers->setpointNumber.set(0, c1c2Gear() - 1); // SHIFT VALUE!
choppers->setpointDir.set(0, c1Dir());
choppers->setpointPhase.set(0, c1Phase());
choppers->enabled.set(0, true);
} else if (i == 1) {
choppers->setpointNumber.set(1, c1c2Gear() - 1);
choppers->setpointDir.set(1, c2Dir());
choppers->setpointPhase.set(1, c2Phase());
choppers->enabled.set(1, true);
} else if (i == 2) {
choppers->setpointNumber.set(2, c3c4Gear() - 1);
choppers->setpointDir.set(2, c3Dir());
choppers->setpointPhase.set(2, c3Phase());
choppers->enabled.set(2, true);
} else if (i == 3) {
// For Chopper 4 we need to check that park option is not selected
if (!parkChopper4()) {
......@@ -314,10 +317,12 @@ void IN16bBATSSettings::start() {
choppers->setpointDir.set(3, c4Dir());
choppers->setpointPhase.set(3, parkPhaseChopper4());
}
choppers->enabled.set(3, true);
} else if (i == 4) {
choppers->setpointNumber.set(4, bgGear() - 1); //Verify chopper 5 is BG and chopper 6 is PST
choppers->setpointDir.set(4, bgDir());
choppers->setpointPhase.set(4, bgPhase());
choppers->enabled.set(4, true);
} else if (i == 5) {
// NOT PST CHOPPER AVAILABLE WHEN USING BATS
choppers->enabled.set(5, false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment