diff options
| -rw-r--r-- | error_utils.c | 5 | ||||
| -rw-r--r-- | globals.h | 10 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/error_utils.c b/error_utils.c index 395da81..6361065 100644 --- a/error_utils.c +++ b/error_utils.c @@ -689,6 +689,11 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) break; } + // check for channel-specific obsolete features + if ( globals.Flash.use_high_ampl_ranges_for_high_pw_ranges[i] ) { + report_error = obsolete_feature; + } + /* check for settings that would cause divide-by-zero errors in the error-checking routine */ if (ChannelStateToTest[i].frequency<smallest_allowed_number) { early_quit = TRUE; @@ -697,14 +697,20 @@ typedef struct { float max_avg_power[max_channels]; /* addr 10042 */ float max_pw_pol[max_channels][ampl_polarities]; /* addr 10050 - over-rides normal max_pw */ - char use_high_ampl_ranges_for_high_pw_ranges[max_channels]; /* addr 10066 - for AVMP-4 */ + char use_high_ampl_ranges_for_high_pw_ranges[max_channels]; /* addr 10066 - for AVMP-4, no longer used */ - char couple_first_N_pw_ranges_to_ampl_ranges[max_channels]; // addr 10068 + char couple_first_N_pw_ranges_to_ampl_ranges[max_channels]; // addr 10068 - use this instead (N=1) */ // for example, if N = 2 (as for AVR-E3-B-R5-N-M5) // PG A = pw range 0, ampl range 0 // PG B = pw range 1, ampl range 1 // PG C = pw range 2+, ampl range 2 + // for example, if N = 1 (as for AVMP-4-B) + // PG A = pw range 0, ampl range 0 + // PG B = pw range 1+, ampl range 1 + + // AVMP-4-B is different than AVPP units, because lowest PW range is NOT voltage controlled + float attenuators[max_channels][max_attens]; // addr 10070 // smallest attenuators first // value = magnitude of attenuation. @@ -1,2 +1,2 @@ -#define FW_VERSION "6.0.26" +#define FW_VERSION "6.0.27" #define SCPI_version "1996.0" |