diff options
Diffstat (limited to 'device-functions.c')
| -rw-r--r-- | device-functions.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/device-functions.c b/device-functions.c index 9f9c012..037d30e 100644 --- a/device-functions.c +++ b/device-functions.c @@ -1001,17 +1001,17 @@ void Set_Mux(int channel) { int mux_out; - if (globals.ChannelState[channel].func_mode==dc_mode_on && globals.ChannelState[channel].inverted==pol_norm) { + if (globals.ChannelState[channel].func_mode==dc_mode_on && globals.ChannelState[channel].inverted==NO) { mux_out=4; - } else if (globals.ChannelState[channel].func_mode==dc_mode_on && globals.ChannelState[channel].inverted!=pol_norm) { + } else if (globals.ChannelState[channel].func_mode==dc_mode_on && globals.ChannelState[channel].inverted!=NO) { mux_out=5; - } else if (globals.ChannelState[channel].pw_ctrl_mode!=pw_in_out && globals.ChannelState[channel].inverted==pol_norm) { + } else if (globals.ChannelState[channel].pw_ctrl_mode!=pw_in_out && globals.ChannelState[channel].inverted==NO) { mux_out=2; - } else if (globals.ChannelState[channel].pw_ctrl_mode!=pw_in_out && globals.ChannelState[channel].inverted!=pol_norm) { + } else if (globals.ChannelState[channel].pw_ctrl_mode!=pw_in_out && globals.ChannelState[channel].inverted!=NO) { mux_out=3; - } else if (globals.ChannelState[channel].inverted==pol_norm) { + } else if (globals.ChannelState[channel].inverted==NO) { mux_out=0; - } else if (globals.ChannelState[channel].inverted!=pol_norm) { + } else if (globals.ChannelState[channel].inverted!=NO) { mux_out=1; } @@ -2148,7 +2148,7 @@ int Set_Cal_Nom(int channel,int calibration_point_number,int parameter, float *n other_setting=0.4; } - Set_Inverted(channel,pol_norm); + Set_Inverted(channel,NO); Set_Delay(0,0,0,channel,0.0); status=Set_frequency(0,0,0,globals.Flash.ChanKey_frequency?channel:0,other_setting); @@ -4406,7 +4406,7 @@ void Set_Sav(int setting_num) globals.ChannelState[i].double_pulse double_on 1, double_off 0 globals.ChannelState[i].pw_ctrl_mode pw_normal 1, pw_in_out 0 globals.ChannelState[i].func_mode pulse_mode_on 0, dc_mode_on 1 - globals.ChannelState[i].inverted pol_norm 0, pol_complement 1 + globals.ChannelState[i].inverted NO 0, YES 1 globals.ChannelState[i].output_state output_off 0,output_on 1 globals.ChannelState[i].gate_type gate_sync 0, gate_async 1 globals.ChannelState[i].trigger_source source_internal 0, source_external 1, source_manual 2, source_hold 3, source_immediate 4 |