toggle both polarities of trigger lines on optocoupler boot toggleINSTRUMENT_6_2_15

1 files changed, 15 insertions, 6 deletions

diff --git a/instr-daemon.c b/instr-daemon.c
index 38ea23e..c6eb8c0 100644
--- a/instr-daemon.c
+++ b/instr-daemon.c
@@ -268,15 +268,24 @@ int main(int argc, char **argv)
 
 	for (i=0; i<max_channels; i++) {
 		if (globals.Flash.toggle_trig_at_boot[i]) {
-			// trigger IL710 twice to initialize it
-			Set_Output_State(i,output_on);
-			Set_Trig_Source(i,source_immediate);
-			Set_Trig_Source(i,source_immediate);
-			Set_Trig_Source(i,source_internal);
-			Set_Output_State(i,output_off);
+			int j;
+			for (j=0;j<ampl_polarities;j++) {
+
+				// do each polarity
+				Set_Amplitude(0,j,1,0,0,0,i,0.0,0);
+				Set_Trig_Source(i,source_hold);
+
+				// trigger IL710 twice to initialize it
+				Set_Output_State(i,output_on);
+				Set_Trig_Source(i,source_immediate);
+				Set_Trig_Source(i,source_immediate);
+				Set_Output_State(i,output_off);
+			}
 		}
 	}
 
+	Main_Rst();
+
 	//register stdin channel
 	stdinChannel = g_io_channel_unix_new(0);
 	if(stdinChannel == NULL) {