diff options
author | daniel <danieruru@gmail.com> | 2012-09-28 14:45:34 +0900 |
---|---|---|
committer | daniel <danieruru@gmail.com> | 2012-09-28 14:45:34 +0900 |
commit | 131d5ec32ca62c06f1eed9ee282bb15f814f4ba8 (patch) | |
tree | c5aa8015fd026708bcaaa5a14a63fa1de1303af0 /menus.c | |
parent | 923c8ce77ea407f3b50999447bc1d774f6a7d5e0 (diff) | |
parent | bc066aa6f5b6c69a29109a2405e8a91c55d2fade (diff) |
Merge branch 'master' of grenfell.avtechpulse.com:Instrument
Diffstat (limited to 'menus.c')
-rw-r--r-- | menus.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -9,6 +9,7 @@ #include "flash.h" #include "nicutils.h" #include "menus.h" +#include "gpib.h" #include <glib.h> #include <math.h> @@ -1217,7 +1218,7 @@ static void Display_Number_on_LCD(int Is_Item_Visible,int LCD_row,int LCD_col,ch break; case Show_gpib_address: - Submenu_Value=(float) globals.GPIB.PRIMARY_ADDRESS; + Submenu_Value=(float) globals.Flash.gpib_address; significant_digits=0; units = g_strdup(""); show_plus_sign=NO; |