summaryrefslogtreecommitdiff
path: root/menus.c
diff options
context:
space:
mode:
authorMike <mjc@avtechpulse.com>2000-01-01 00:39:55 +0900
committerMike <mjc@avtechpulse.com>2000-01-01 00:39:55 +0900
commitf4aec9a5ea2e8cf5181b7631adc7c1d05088aa30 (patch)
tree899d9d1d2739ac7cfbb1f4348867d0df2d023817 /menus.c
parent82da255c8a0c4ab78cc131f829e68e27ea5bb6f6 (diff)
reduce ampl_zero_equiv by a factor of 10 in -LV attenuator modeINSTRUMENT_6_4_27c
Diffstat (limited to 'menus.c')
-rw-r--r--menus.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/menus.c b/menus.c
index e591f39..331a9be 100644
--- a/menus.c
+++ b/menus.c
@@ -2171,7 +2171,6 @@ static int Submenu_Mult_Value(float mult_by)
channel=Submenu_Numeric_Parameter%100;
if (fabs(Submenu_Value) < smallest_allowed_number) {
- printf ("small\n");
if (Submenu_Value < 0.0) {
new_value = -smallest_allowed_number * mult_by;
} else {
@@ -2231,15 +2230,15 @@ static int Submenu_Mult_Value(float mult_by)
break;
case Show_amplitude:
- if (fabs(new_value)<globals.Flash.ampl_zero_equiv[channel] && mult_by>1.0) {
- if (new_value<0.0 || globals.Flash.max_ampl[channel]<globals.Flash.ampl_zero_equiv[channel]) {
- new_value=-globals.Flash.ampl_zero_equiv[channel];
+ if (fabs(new_value)<get_ampl_zero_equiv(channel) && mult_by>1.0) {
+ if (new_value<0.0 || globals.Flash.max_ampl[channel]<get_ampl_zero_equiv(channel)) {
+ new_value=-get_ampl_zero_equiv(channel);
} else {
- new_value=globals.Flash.ampl_zero_equiv[channel];
+ new_value=get_ampl_zero_equiv(channel);
}
}
- if (fabs(new_value) < globals.Flash.ampl_zero_equiv[channel]) {
+ if (fabs(new_value) < get_ampl_zero_equiv(channel)) {
if (new_value<0.0) {
new_value=-smallest_allowed_number;
} else {
@@ -2501,9 +2500,9 @@ static void Submenu_Service_Encoder(int encoder_change)
encoder_change = -encoder_change;
}
- else if ((channel<max_channels) && abs_Submenu_Value<globals.Flash.ampl_zero_equiv[channel] && (Submenu_Numeric_Parameter-channel)==Show_amplitude) {
- abs_Submenu_Value=globals.Flash.ampl_zero_equiv[channel];
- if (globals.Flash.max_ampl[channel]<globals.Flash.ampl_zero_equiv[channel]) {
+ else if ((channel<max_channels) && abs_Submenu_Value<get_ampl_zero_equiv(channel) && (Submenu_Numeric_Parameter-channel)==Show_amplitude) {
+ abs_Submenu_Value=get_ampl_zero_equiv(channel);
+ if (globals.Flash.max_ampl[channel]<get_ampl_zero_equiv(channel)) {
Submenu_Value=-abs_Submenu_Value;
}
}
@@ -2695,7 +2694,7 @@ static void Submenu_Service_Encoder(int encoder_change)
return;
}
- if (fabs(new_value) < globals.Flash.ampl_zero_equiv[channel]) {
+ if (fabs(new_value) < get_ampl_zero_equiv(channel)) {
if (Submenu_Value<0.0) {
new_value=-smallest_allowed_number;
} else {