fix multi-channel resync issues

tknopp · Sep 26, 2024 · 45d19c1 · 45d19c1
1 parent 0457f85
commit 45d19c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/server/control.c b/src/server/control.c
@@ -129,9 +129,10 @@ bool getSequenceEnableValue(sequenceData_t *seqData, int seqStep, int channel) {
 
 bool getSequenceResyncValue(sequenceData_t *seqData, int seqStep, int channel) {
 	bool result = false;
+  int numChan = numSlowDACChan > 2 ? 2 : numSlowDACChan;
 	if (seqData->resyncLUT != NULL) {
 		int localStep = seqStep % seqData->numStepsPerRepetition;
-		result = seqData->resyncLUT[localStep + channel];
+		result = seqData->resyncLUT[localStep * numChan + channel];
 	}
 	return result;
 }

diff --git a/src/server/scpi_commands.c b/src/server/scpi_commands.c
@@ -1070,7 +1070,7 @@ static scpi_result_t RP_DAC_SetResyncLUT(scpi_t * context) {
 		printf("Allocating ressyncLUT\n");
 		configSeq->resyncLUT = (bool *)calloc(numChan, configSeq->numStepsPerRepetition * sizeof(bool));
 
-		int n = readAll(newdatasockfd, configSeq->resyncLUT, numSlowDACChan * configSeq->numStepsPerRepetition * sizeof(bool));
+		int n = readAll(newdatasockfd, configSeq->resyncLUT, numChan * configSeq->numStepsPerRepetition * sizeof(bool));
 		seqState = CONFIG;
 		if (n < 0) perror("ERROR reading from socket");
 		return returnSCPIBool(context, true);