summaryrefslogtreecommitdiff
path: root/globals.h
diff options
context:
space:
mode:
authorMike <mjc@avtechpulse.com>2000-01-01 01:01:52 +0900
committerMike <mjc@avtechpulse.com>2000-01-01 01:01:52 +0900
commite609cd52d421c1a1b8e4a98cd7820209e5bbd481 (patch)
treee530df6d693bfcba95fb80897a76d6af6b5a9894 /globals.h
parent53d1703cafbddaebaf9a87ce008f1d7cfbce2841 (diff)
Sleep time is now fraction of max based on DAC changeINSTRUMENT_6_4_33
Diffstat (limited to 'globals.h')
-rw-r--r--globals.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/globals.h b/globals.h
index 104d8bc..f673591 100644
--- a/globals.h
+++ b/globals.h
@@ -712,7 +712,7 @@ typedef struct {
char zout_relay_high_for_max[max_channels]; /* addr 8700 */
char load_type_dac[max_channels]; /* addr 8702 */
- float amplitude_settling_time; /* addr 8704 */
+ float hv_full_chargeup_time; /* addr 8704 */
float sparex1; /* addr 8708 */
float sparex2[max_channels]; /* addr 8712 */
float rcl_sparex3[max_channels][max_stored_settings]; /* addr 8720 */
@@ -906,7 +906,6 @@ typedef struct {
int do_check_settings;
int flash_writes_suspended;
int force_output_fully_off;
- int need_ampl_settling_time;
int attenuators_enabled;
} FlagStruct;
@@ -925,6 +924,7 @@ typedef struct {
long last_activity_at[max_channels];
long normal_relay_bounce_time_in_milliseconds;
long Relay_Switching_Delay_in_Milliseconds;
+ float trigger_sleep_time;
} TimeStruct;