diff options
| author | Mike <mjc@avtechpulse.com> | 2000-01-01 00:20:23 +0900 |
|---|---|---|
| committer | Mike <mjc@avtechpulse.com> | 2000-01-01 00:20:23 +0900 |
| commit | 8722d53003e7f18b916e5b8bbd3e527fd1097ca4 (patch) | |
| tree | 4796db74e4b89379e9cb94ff2336e7e5efb97f0e /menus.c | |
| parent | 2c73bb707c28fac0f6b1f2725b71e0e4ece92e49 (diff) | |
separate minimum equiv offset from ampl, for AVIR-4-B-OT
Diffstat (limited to 'menus.c')
| -rw-r--r-- | menus.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -2278,15 +2278,15 @@ static int Submenu_Mult_Value(float mult_by) break; case Show_offset: - if (fabs(new_value)<globals.Flash.ampl_zero_equiv[channel] && mult_by>1.0) { - if (new_value<0.0 || globals.Flash.max_offset[channel]<globals.Flash.ampl_zero_equiv[channel]) { - new_value=-globals.Flash.ampl_zero_equiv[channel]; + if (fabs(new_value)<globals.Flash.os_zero_equiv[channel] && mult_by>1.0) { + if (new_value<0.0 || globals.Flash.max_offset[channel]<globals.Flash.os_zero_equiv[channel]) { + new_value=-globals.Flash.os_zero_equiv[channel]; } else { - new_value=globals.Flash.ampl_zero_equiv[channel]; + new_value=globals.Flash.os_zero_equiv[channel]; } } - if (fabs(new_value) < globals.Flash.ampl_zero_equiv[channel]) { + if (fabs(new_value) < globals.Flash.os_zero_equiv[channel]) { if (new_value<0.0) { new_value=-smallest_allowed_number; } else { @@ -2496,9 +2496,9 @@ static void Submenu_Service_Encoder(int encoder_change) } } - else if ((channel<max_channels) && abs_Submenu_Value<globals.Flash.ampl_zero_equiv[channel] && (Submenu_Numeric_Parameter-channel)==Show_offset) { - abs_Submenu_Value=globals.Flash.ampl_zero_equiv[channel]; - if (globals.Flash.max_offset[channel]<globals.Flash.ampl_zero_equiv[channel]) { + else if ((channel<max_channels) && abs_Submenu_Value<globals.Flash.os_zero_equiv[channel] && (Submenu_Numeric_Parameter-channel)==Show_offset) { + abs_Submenu_Value=globals.Flash.os_zero_equiv[channel]; + if (globals.Flash.max_offset[channel]<globals.Flash.os_zero_equiv[channel]) { Submenu_Value=-abs_Submenu_Value; } } @@ -2730,7 +2730,7 @@ static void Submenu_Service_Encoder(int encoder_change) if (globals.Flash.min_offset[channel]==globals.Flash.max_offset[channel]) { return; } - if (fabs(new_value) < globals.Flash.ampl_zero_equiv[channel]) { + if (fabs(new_value) < globals.Flash.os_zero_equiv[channel]) { if (Submenu_Value<0.0) { new_value=-smallest_allowed_number; } else { |