throw error if burst mode and double pulse mode enabled at the same time

2 files changed, 9 insertions, 0 deletions

diff --git a/error_utils.c b/error_utils.c
index 4026b76..e0f6446 100644
--- a/error_utils.c
+++ b/error_utils.c
@@ -425,6 +425,10 @@ void get_error_text(gchar **response, int error_num)
 		format_error_text(response,-221,"Double pulse separation is too high. It must be < 95% of the period.");
 		break;
 
+	case Cant_Do_Burst_and_Double:
+		format_error_text(response,-221,"Can't use burst mode and double pulse mode at the same time.");
+                break;
+
 	case queue_overflow:
 		format_error_text(response,-350,"Clear with *cls or syst:err.");
 		break;
@@ -998,6 +1002,10 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels])
 						report_error=Double_Separation_Too_Large;
 					}
 				}
+
+				if (ChannelStateToTest[i].burst_count>1) {
+					report_error=Cant_Do_Burst_and_Double;
+				}
 			}
 
 			if ((globals.Flash.max_avg_ampl[i]) > 0.0 && (fabs(ChannelStateToTest[i].amplitude)) > 0.0) {
diff --git a/globals.h b/globals.h
index 8e278f0..432b283 100644
--- a/globals.h
+++ b/globals.h
@@ -106,6 +106,7 @@
 #define CalibrationMinMaxError_rise 92
 #define CalibrationMinMaxError_slew 93
 #define Dead_Time_Error 94
+#define Cant_Do_Burst_and_Double 95
 
 #define YES     1
 #define NO      0