summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael J. Chudobiak <mjc@avtechpulse.com>2013-04-02 11:01:19 -0400
committerMichael J. Chudobiak <mjc@avtechpulse.com>2013-04-02 11:01:19 -0400
commite05074567a9c883e9086e4cf39addd7de2414fb3 (patch)
tree9d4675b4231afc35929bf719b9260d6a81a289ff
parent61f2ae6c9912bf8ed4640b1b1e5915cd7d9f942d (diff)
formatting fixes
-rw-r--r--device-functions.c4
-rw-r--r--globals.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/device-functions.c b/device-functions.c
index f3c06d3..da920d7 100644
--- a/device-functions.c
+++ b/device-functions.c
@@ -419,7 +419,7 @@ int Set_Pw(int check_possible_only,int word_override,int range_override,int chan
cap_range_control=0;
// set XTRA RLY 5 high in this range for AVR-E3-B-R5-N-M5, and other
// units with PG A, B, and C. This corresponds to PG B.
- globals.Registers.shift_reg_out[2] |= (long)0x80000;
+ globals.Registers.shift_reg_out[2] |= (long)0x80000;
} else {
cap_range_control = 1 << (relay_range-2);
}
@@ -2464,7 +2464,7 @@ int Set_VI_Control(int parameter,int channel,float new_ampl,int *point_found,int
++curr_pw_range;
parse_sr = parse_sr >> 1;
}
-
+
if (globals.Flash.volt_ctrl_pw[channel]) {
// ranges are shifted in these units
++curr_pw_range;
diff --git a/globals.h b/globals.h
index 5dd0d31..52cf1fc 100644
--- a/globals.h
+++ b/globals.h
@@ -701,6 +701,7 @@ typedef struct {
// PG C = pw range 2+, ampl range 2
float attenuators[max_channels][max_attens]; // addr 10070
+ // smallest attenuators first
char spare_end;