diff options
| -rw-r--r-- | globals.c | 1 | ||||
| -rw-r--r-- | globals.h | 43 |
2 files changed, 41 insertions, 3 deletions
@@ -1,7 +1,6 @@ #include "globals.h" GlobalStruct globals = { - .ChannelState = {0.0}, .error_queue = {0}, .number_of_errors = 0, .Flash.fully_programmed = Not_Programmed @@ -130,10 +130,49 @@ typedef struct { - float frequency; - // this will be enlarged later + float frequency; /* the global frequency variable */ + float delay; /* the global delay variable */ + float pw; /* the global pulse width variable */ + float amplitude; /* peak-to-peak amplitude */ + float offset; /* offset */ + + float offset_null; /* add to offset to null, if required */ + /* not part of sav/rcl, generated by amplitude routines */ + + float Curr_Mon_value; /* current monitor reading */ + float displayed_mon_val; /* used to determine when LCD update is required */ + int Curr_Mon_offset; /* current monitor ADC offset */ + + int zout; /* Zout in ohms, integer */ + int hold_setting; /* pw or duty cycle hold when prf changed */ + int double_pulse; /* 1=on, 0=off */ + int ab_mode; /* a/b mode */ + int func_mode; /* dc or pulse */ + int polarity; /* noninverted or inverted */ + int output_state; /* on or off */ + int gate_type; /* lo=sync, hi=async */ + int trigger_source; /* int, ext, or manual */ + int amp_mode; /* normal amplitude control or EA */ + int gate_level; /* lo or hi */ + float load_type; /* normally 50 or 10000 ohms, for duty cycle limit control */ + int test_delay_mode; /* special test mode */ + int logic_level; /* ecl or ttl */ + int route_primary; /* channel number that is active */ + int route_secondary; /* channel number that is active */ + int os_mode; /* normal offset control or EO */ + int burst_count; /* number of pulses per burst */ + float burst_time; /* time between falling edge and next rising edge */ + float rise_time; /* time between falling edge and next rising edge */ + float soft_current_limit; /* adjustable protection trip-point */ + float slew; /* slew rate */ + + float vcc1; /* AVRQ control voltages */ + float vcc2; + float vlogic; + } ChannelStruct; + #pragma pack(push) /* push current alignment to stack */ #pragma pack(1) typedef struct { |