added most commands to the parser, with supporting global vars

1 files changed, 43 insertions, 0 deletions

diff --git a/globals.h b/globals.h
index 87df3fb..eea3a19 100644
--- a/globals.h
+++ b/globals.h
@@ -130,6 +130,42 @@
 
 
 typedef struct {
+	int PRIMARY_ADDRESS;                    /* GPIB chip's GPIB primary address */
+	int INTERFACE_ERROR;                    /* Error Code */
+	int INTERFACE_STATUS;                   /* Interface Status */
+	unsigned int MR_4882_status[5];         /* 4882 status memory registers */
+	unsigned long int DATA_COUNT;           /* Transfer count */
+	unsigned long int Requested_Count;	/* Requested transfer count */
+	unsigned long int cnt;
+	int prev_brq;
+	int spoll_count;
+} GpibStruct;
+
+
+typedef struct {
+	int baud;
+	int parity;
+	int stopbits;
+	int databits;
+	int hardhand;
+	int echo;
+} Rs232Struct;
+
+
+typedef struct {
+	int channel;
+	int cal_type;
+	int count;
+	int error;
+	float max_change;
+	float avg_change;
+	int total_errors;
+	float total_max_change;
+	char response[max_output_length];
+} CalStruct;
+
+
+typedef struct {
 	float frequency;                /* the global frequency variable */
 	float delay;                    /* the global delay variable */
 	float pw;                               /* the global pulse width variable */
@@ -550,10 +586,17 @@ typedef struct {
 	ConstraintsStruct Constraints;
 	ChannelStruct ChannelState[max_channels];
 	FlashStruct Flash;
+        GpibStruct GPIB;
+        Rs232Struct RS232;
+
 	int error_queue[error_queue_length+1];
 	int number_of_errors;	/* how many errors are in the error queue */
 	int extended_ampl_min_max;
 	int do_check_settings;
+	int oper_enable_register;       /* for stat:enable command */
+	int ques_enable_register;       /* for stat:enable command */
+	int flash_writes_suspended;
+
 } GlobalStruct;
 
 extern GlobalStruct globals;