add some menu variables as globals, to remove FIXMEs

1 files changed, 49 insertions, 1 deletions

diff --git a/globals.h b/globals.h
index 5f88108..4e5c3f0 100644
--- a/globals.h
+++ b/globals.h
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <glib.h>
 
 #define DEBUG_ON - uncomment this to have debug messages
 
@@ -87,7 +88,6 @@
 #define NetworkNotFound 74
 #define ThisShouldntHappen 75
 
-#define LCD_cols 32
 #define YES     1
 #define NO      0
 
@@ -231,6 +231,45 @@
 #define COUNTER_BYTE_3 0x60
 
 
+// menu stuff
+#define Main_Menu_On 0
+#define Submenu_On 1
+
+#define Submenu1_freq 0
+#define Submenu1_delay 100
+#define Submenu1_pw 200
+#define Submenu1_amp 300
+#define Submenu1_offset 400
+#define Submenu1_mon 500
+#define Submenu1_zout 600
+#define Submenu1_loadtype 700
+#define Submenu1_output_state 800
+#define Submenu1_setup 900
+#define Submenu1_rem_loc 1000
+#define Submenu1_invert 1100
+#define Submenu1_gate 1200
+#define Submenu1_memory 1300
+#define Submenu2_save 1400
+#define Submenu2_load 1500
+#define Submenu2_rs232 1600
+#define Submenu2_rs232_baud 1700
+#define Submenu2_rs232_databits 1800
+#define Submenu2_rs232_parity 1900
+#define Submenu2_rs232_stopbits 2000
+#define Submenu2_rs232_hardhand 2100
+#define Submenu2_rs232_echo 2200
+#define Submenu1_logic_level 2300
+#define Submenu1_route_primary 2400
+#define Submenu1_burst_count 2500
+#define Submenu1_burst_time 2600
+#define Submenu1_func 2700
+#define Submenu1_rise_time 2800
+#define Submenu2_gpib_address 2900
+#define Submenu1_soft_current_limit 3000
+#define Submenu1_route_secondary 3200
+#define Submenu1_slew 3300
+#define Submenu1_avrq 3400
+
 
 long sec_timer (void);
 
@@ -259,6 +298,14 @@ typedef struct {
 
 
 typedef struct {
+	int Type_Of_Menu;
+	gboolean Error_Screen;
+	gboolean Nonstd_Display;
+	int Selected_Submenu;
+} MenuStatusStruct;
+
+
+typedef struct {
 	int update_freq;
 	int update_func;
 	int update_delay;
@@ -759,6 +806,7 @@ typedef struct {
 	FlagStruct Flags;
 	FlagStruct DefaultFlags;
 	TimeStruct Timers;
+	MenuStatusStruct MenuStatus;
 } GlobalStruct;