matlab/plot_ge.m usrp/fusb.h usrp/fusb_linux.h usrp/gn3s.cpp usrp/gn3s.h usrp/gn3s_firmware.ihx usrp/gn3s_firmware.iic usrp/install_gn3s.sh @@ -19,13 +19,14 @@ VPATH = accessories: \ usrp: LDFLAGS = -lpthread -lusrp -m32 -CFLAGS = -O2 -D_FORTIFY_SOURCE=0 -g3 $(CINCPATHFLAGS) +CFLAGS = -O2 -D_FORTIFY_SOURCE=0 -g3 -m32 $(CINCPATHFLAGS) ASMFLAGS = -masm=intel SKIP = %main.cpp %simd-test.cpp %fft-test.cpp %acq-test.cpp %sse_new.cpp %gps-usrp.cpp SRCC = $(wildcard main/*.cpp simd/*.cpp accessories/*.cpp acquisition/*.cpp objects/*.cpp usrp/*.cpp) SRC = $(filter-out $(SKIP), $(SRCC)) OBJS = $(SRC:.cpp=.o) +OBJS += usrp/gn3s_firmware.o HEADERS = $(wildcard accessories/*.h acquisition/*.h main/*.h objects/*.h simd/*.h includes/*.h) #Uncomment these to look at the disassembly @@ -60,6 +61,9 @@ simd-test: simd-test.o $(OBJS) %.o:%.s $(ASM) $(CFLAGS) -c $< -o $@ +%.o:%.ihx + ld -r -b binary $< -o $@ + gps-gse: make --directory=./gse Makefile @@ -269,15 +269,16 @@ int32 run_agc(CPX *_buff, int32 _samps, int32 bits, int32 scale) /* Get rid of the divide, replace with a multiply to scale to 2^15, then right shift to get * back into AGC_BITS of magnitude */ - lscale = (1 << 14) / scale; - shift = 14 - bits; +// lscale = (1 << 14) / scale; +// shift = 14 - bits; max = 1 << bits; num = 0; - x86_muls((int16 *)_buff, &lscale, 2*_samps, shift); +// x86_muls((int16 *)_buff, &lscale, 2*_samps, shift); for(lcv = 0; lcv < 2*_samps; lcv++) { + p[lcv] >>= 7; if(abs(p[lcv]) > max) num++; } accessories/misc.cpp @@ -1040,7 +1040,7 @@ <property name="minimum_size"></property> <property name="name">iGUI_PVT</property> <property name="pos"></property> - <property name="size">1000,600</property> + <property name="size">1600,600</property> <property name="style">wxDEFAULT_FRAME_STYLE</property> <property name="subclass"></property> <property name="title">PVT</property> @@ -1149,7 +1149,7 @@ <property name="border">5</property> <property name="flag">wxEXPAND</property> <property name="proportion">5</property> - <object class="wxBoxSizer" expanded="1"> + <object class="wxBoxSizer" expanded="0"> <property name="minimum_size">-1,-1</property> <property name="name">bSizer18</property> <property name="orient">wxVERTICAL</property> @@ -1158,7 +1158,7 @@ <property name="border">5</property> <property name="flag">wxALL|wxEXPAND</property> <property name="proportion">0</property> - <object class="wxStaticBoxSizer" expanded="0"> + <object class="wxStaticBoxSizer" expanded="1"> <property name="id">wxID_ANY</property> <property name="label">PVT Status</property> <property name="minimum_size"></property> @@ -1170,7 +1170,7 @@ <property name="border">5</property> <property name="flag">wxEXPAND</property> <property name="proportion">1</property> - <object class="wxBoxSizer" expanded="1"> + <object class="wxBoxSizer" expanded="0"> <property name="minimum_size"></property> <property name="name">bSizer199</property> <property name="orient">wxVERTICAL</property> @@ -1237,8 +1237,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -1289,8 +1289,8 @@ <object class="sizeritem" expanded="1"> <property name="border">5</property> <property name="flag">wxALL|wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="proportion">2</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -1298,20 +1298,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">rticks</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">rticks</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <property name="wrap">-1</property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -1334,6 +1334,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -1350,8 +1354,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -1402,8 +1406,8 @@ <object class="sizeritem" expanded="1"> <property name="border">5</property> <property name="flag">wxALL|wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="proportion">2</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -1411,20 +1415,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">sticks</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">sticks</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <property name="wrap">-1</property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -1447,6 +1451,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -1463,8 +1471,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -1514,9 +1522,9 @@ </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALIGN_RIGHT|wxALL</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="flag">wxALL|wxEXPAND</property> + <property name="proportion">2</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -1524,20 +1532,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">cticks</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">cticks</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <property name="wrap">-1</property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -1560,6 +1568,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -1648,8 +1660,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -1700,8 +1712,8 @@ <object class="sizeritem" expanded="1"> <property name="border">5</property> <property name="flag">wxALL|wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="proportion">2</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -1709,20 +1721,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">iter</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">iter</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <property name="wrap">-1</property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -1745,6 +1757,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -1761,8 +1777,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -1771,14 +1787,14 @@ <property name="font">,90,92,-1,70,0</property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">Nav Satellites</property> + <property name="label">Nav SV</property> <property name="maximum_size"></property> <property name="minimum_size"></property> <property name="name">m_staticText53431</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style"></property> + <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> <property name="subclass"></property> <property name="tooltip"></property> <property name="window_extra_style"></property> @@ -1813,8 +1829,8 @@ <object class="sizeritem" expanded="1"> <property name="border">5</property> <property name="flag">wxALL|wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="proportion">2</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -1822,20 +1838,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">nsv</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">nsv</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <property name="wrap">-1</property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -1858,6 +1874,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -1950,8 +1970,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -2001,9 +2021,9 @@ </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="flag">wxALL</property> + <property name="proportion">3</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -2011,20 +2031,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">lat</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">lat</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <property name="wrap">-1</property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -2047,6 +2067,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -2063,8 +2087,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -2114,9 +2138,9 @@ </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALIGN_RIGHT|wxALL</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="flag">wxALL</property> + <property name="proportion">3</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -2124,20 +2148,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">lon</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">lon</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <property name="wrap">-1</property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -2160,6 +2184,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -2176,8 +2204,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -2227,9 +2255,9 @@ </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="flag">wxALL</property> + <property name="proportion">3</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -2237,20 +2265,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">alt</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">alt</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <property name="wrap">-1</property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -2273,6 +2301,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -2289,8 +2321,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -2340,9 +2372,9 @@ </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="flag">wxALL</property> + <property name="proportion">3</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -2350,20 +2382,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">gdop</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">gdop</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <property name="wrap">-1</property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -2386,6 +2418,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -2397,7 +2433,7 @@ <property name="border">5</property> <property name="flag">wxEXPAND</property> <property name="proportion">1</property> - <object class="wxBoxSizer" expanded="0"> + <object class="wxBoxSizer" expanded="1"> <property name="minimum_size"></property> <property name="name">bSizer197</property> <property name="orient">wxVERTICAL</property> @@ -2464,8 +2500,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -2515,9 +2551,9 @@ </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="flag">wxALL</property> + <property name="proportion">4</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -2525,20 +2561,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">px</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">px</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <property name="wrap">-1</property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -2561,6 +2597,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -2577,8 +2617,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -2628,9 +2668,9 @@ </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="flag">wxALL</property> + <property name="proportion">4</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -2638,20 +2678,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">py</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">py</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <property name="wrap">-1</property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -2674,6 +2714,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -2690,8 +2734,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -2741,9 +2785,9 @@ </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="flag">wxALL</property> + <property name="proportion">4</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -2751,20 +2795,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">pz</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">pz</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <property name="wrap">-1</property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -2787,6 +2831,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -2808,7 +2856,7 @@ <property name="border">5</property> <property name="flag">wxEXPAND</property> <property name="proportion">1</property> - <object class="wxBoxSizer" expanded="0"> + <object class="wxBoxSizer" expanded="1"> <property name="minimum_size"></property> <property name="name">bSizer198</property> <property name="orient">wxVERTICAL</property> @@ -2875,8 +2923,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -2926,9 +2974,9 @@ </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxEXPAND|wxALL</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="flag">wxALL</property> + <property name="proportion">4</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -2936,20 +2984,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">vx</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">vx</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <property name="wrap">-1</property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -2972,6 +3020,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -2988,8 +3040,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -3039,9 +3091,9 @@ </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="flag">wxALL</property> + <property name="proportion">4</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -3049,20 +3101,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">vy</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">vy</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> - <property name="window_style">wxSIMPLE_BORDER</property> - <property name="wrap">-1</property> + <property name="window_style"></property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -3085,6 +3137,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -3101,8 +3157,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -3152,9 +3208,9 @@ </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="flag">wxALL</property> + <property name="proportion">4</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -3162,20 +3218,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">vz</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">vz</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <property name="wrap">-1</property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -3198,6 +3254,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -3214,8 +3274,8 @@ <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> <object class="wxStaticText" expanded="1"> <property name="bg"></property> <property name="context_help"></property> @@ -3224,7 +3284,7 @@ <property name="font">,90,92,-1,70,0</property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">Speed</property> + <property name="label">Vel</property> <property name="maximum_size"></property> <property name="minimum_size"></property> <property name="name">m_staticText5342</property> @@ -3265,9 +3325,9 @@ </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> + <property name="flag">wxALL</property> + <property name="proportion">4</property> + <object class="wxTextCtrl" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="enabled">1</property> @@ -3275,20 +3335,20 @@ <property name="font"></property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">speed</property> <property name="maximum_size"></property> + <property name="maxlength">0</property> <property name="minimum_size"></property> <property name="name">speed</property> <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxTE_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> + <property name="value"></property> <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <property name="wrap">-1</property> <event name="OnChar"></event> <event name="OnEnterWindow"></event> <event name="OnEraseBackground"></event> @@ -3311,6 +3371,10 @@ <event name="OnRightUp"></event> <event name="OnSetFocus"></event> <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> <event name="OnUpdateUI"></event> </object> </object> @@ -3322,1043 +3386,1100 @@ </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND|wxFIXED_MINSIZE</property> - <property name="proportion">0</property> - <object class="wxStaticBoxSizer" expanded="0"> - <property name="id">wxID_ANY</property> - <property name="label">Date/Time</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxBoxSizer" expanded="1"> <property name="minimum_size"></property> - <property name="name">sbSizer37</property> - <property name="orient">wxVERTICAL</property> + <property name="name">bSizer110</property> + <property name="orient">wxHORIZONTAL</property> <property name="permission">none</property> - <event name="OnUpdateUI"></event> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxBoxSizer" expanded="1"> + <property name="flag">wxALL|wxEXPAND|wxFIXED_MINSIZE</property> + <property name="proportion">3</property> + <object class="wxStaticBoxSizer" expanded="0"> + <property name="id">wxID_ANY</property> + <property name="label">Date/Time</property> <property name="minimum_size"></property> - <property name="name">bSizer9221</property> - <property name="orient">wxHORIZONTAL</property> + <property name="name">sbSizer37</property> + <property name="orient">wxVERTICAL</property> <property name="permission">none</property> + <event name="OnUpdateUI"></event> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font">,90,92,-1,70,0</property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">UTC Time</property> - <property name="maximum_size"></property> - <property name="minimum_size"></property> - <property name="name">m_staticText57721</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style"></property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> - </object> - </object> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> + <property name="flag">wxEXPAND</property> <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font"></property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">utct</property> - <property name="maximum_size"></property> - <property name="minimum_size"></property> - <property name="name">utct</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> - </object> - </object> - </object> - </object> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxBoxSizer" expanded="1"> - <property name="minimum_size"></property> - <property name="name">bSizer92</property> - <property name="orient">wxHORIZONTAL</property> - <property name="permission">none</property> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font">,90,92,-1,70,0</property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">GPS Week</property> - <property name="maximum_size"></property> + <object class="wxBoxSizer" expanded="1"> <property name="minimum_size"></property> - <property name="name">m_staticText577</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style"></property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> + <property name="name">bSizer9221</property> + <property name="orient">wxHORIZONTAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> + <object class="wxStaticText" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font">,90,92,-1,70,0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="label">UTC Time</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">m_staticText57721</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <property name="wrap">-1</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">2</property> + <object class="wxTextCtrl" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="maxlength">0</property> + <property name="minimum_size"></property> + <property name="name">utct</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style">wxTE_RIGHT</property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="value"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> + <event name="OnUpdateUI"></event> + </object> + </object> </object> </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> + <property name="flag">wxEXPAND</property> <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font"></property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">gpsw</property> - <property name="maximum_size"></property> - <property name="minimum_size"></property> - <property name="name">gpsw</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> - </object> - </object> - </object> - </object> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxBoxSizer" expanded="1"> - <property name="minimum_size"></property> - <property name="name">bSizer922</property> - <property name="orient">wxHORIZONTAL</property> - <property name="permission">none</property> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font">,90,92,-1,70,0</property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">GPS Second</property> - <property name="maximum_size"></property> + <object class="wxBoxSizer" expanded="1"> <property name="minimum_size"></property> - <property name="name">m_staticText5772</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style"></property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> + <property name="name">bSizer92</property> + <property name="orient">wxHORIZONTAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> + <object class="wxStaticText" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font">,90,92,-1,70,0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="label">GPS Week</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">m_staticText577</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <property name="wrap">-1</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">2</property> + <object class="wxTextCtrl" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="maxlength">0</property> + <property name="minimum_size"></property> + <property name="name">gpsw</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style">wxTE_RIGHT</property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="value"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> + <event name="OnUpdateUI"></event> + </object> + </object> </object> </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> + <property name="flag">wxEXPAND</property> <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font"></property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">gpss</property> - <property name="maximum_size"></property> - <property name="minimum_size"></property> - <property name="name">gpss</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> - </object> - </object> - </object> - </object> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxBoxSizer" expanded="1"> - <property name="minimum_size"></property> - <property name="name">bSizer921</property> - <property name="orient">wxHORIZONTAL</property> - <property name="permission">none</property> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font">,90,92,-1,70,0</property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">Clock Bias</property> - <property name="maximum_size"></property> + <object class="wxBoxSizer" expanded="1"> <property name="minimum_size"></property> - <property name="name">m_staticText5771</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style"></property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> + <property name="name">bSizer922</property> + <property name="orient">wxHORIZONTAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> + <object class="wxStaticText" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font">,90,92,-1,70,0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="label">GPS Second</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">m_staticText5772</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <property name="wrap">-1</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">2</property> + <object class="wxTextCtrl" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="maxlength">0</property> + <property name="minimum_size"></property> + <property name="name">gpss</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style">wxTE_RIGHT</property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="value"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> + <event name="OnUpdateUI"></event> + </object> + </object> </object> </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> + <property name="flag">wxEXPAND</property> <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font"></property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">cb</property> - <property name="maximum_size"></property> - <property name="minimum_size"></property> - <property name="name">cb</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> - </object> - </object> - </object> - </object> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxBoxSizer" expanded="1"> - <property name="minimum_size"></property> - <property name="name">bSizer9211</property> - <property name="orient">wxHORIZONTAL</property> - <property name="permission">none</property> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font">,90,92,-1,70,0</property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">Clock Rate</property> - <property name="maximum_size"></property> + <object class="wxBoxSizer" expanded="1"> <property name="minimum_size"></property> - <property name="name">m_staticText57711</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style"></property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> + <property name="name">bSizer921</property> + <property name="orient">wxHORIZONTAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> + <object class="wxStaticText" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font">,90,92,-1,70,0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="label">Clock Bias</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">m_staticText5771</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <property name="wrap">-1</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">2</property> + <object class="wxTextCtrl" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="maxlength">0</property> + <property name="minimum_size"></property> + <property name="name">cb</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style">wxTE_RIGHT</property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="value"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> + <event name="OnUpdateUI"></event> + </object> + </object> </object> </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> + <property name="flag">wxEXPAND</property> <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font"></property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">cr</property> - <property name="maximum_size"></property> + <object class="wxBoxSizer" expanded="1"> <property name="minimum_size"></property> - <property name="name">cr</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> + <property name="name">bSizer9211</property> + <property name="orient">wxHORIZONTAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">1</property> + <object class="wxStaticText" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font">,90,92,-1,70,0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="label">Clock Rate</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">m_staticText57711</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <property name="wrap">-1</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">2</property> + <object class="wxTextCtrl" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="maxlength">0</property> + <property name="minimum_size"></property> + <property name="name">cr</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style">wxTE_RIGHT</property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="value"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> + <event name="OnUpdateUI"></event> + </object> + </object> </object> </object> </object> </object> - </object> - </object> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> - <property name="proportion">0</property> - <object class="wxStaticBoxSizer" expanded="0"> - <property name="id">wxID_ANY</property> - <property name="label">PPS </property> - <property name="minimum_size"></property> - <property name="name">sbSizer371</property> - <property name="orient">wxVERTICAL</property> - <property name="permission">none</property> - <event name="OnUpdateUI"></event> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxBoxSizer" expanded="1"> + <property name="flag">wxALL|wxEXPAND</property> + <property name="proportion">2</property> + <object class="wxStaticBoxSizer" expanded="0"> + <property name="id">wxID_ANY</property> + <property name="label">PPS </property> <property name="minimum_size"></property> - <property name="name">bSizer923</property> - <property name="orient">wxHORIZONTAL</property> + <property name="name">sbSizer371</property> + <property name="orient">wxVERTICAL</property> <property name="permission">none</property> + <event name="OnUpdateUI"></event> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font">,90,92,-1,70,0</property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">State</property> - <property name="maximum_size"></property> - <property name="minimum_size"></property> - <property name="name">m_staticText5773</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style"></property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> - </object> - </object> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> + <property name="flag">wxEXPAND</property> <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font"></property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">ppsstate</property> - <property name="maximum_size"></property> - <property name="minimum_size"></property> - <property name="name">ppsstate</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> - </object> - </object> - </object> - </object> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxBoxSizer" expanded="1"> - <property name="minimum_size"></property> - <property name="name">bSizer92211</property> - <property name="orient">wxHORIZONTAL</property> - <property name="permission">none</property> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font">,90,92,-1,70,0</property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">Feedback</property> - <property name="maximum_size"></property> + <object class="wxBoxSizer" expanded="1"> <property name="minimum_size"></property> - <property name="name">m_staticText577211</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style"></property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> + <property name="name">bSizer923</property> + <property name="orient">wxHORIZONTAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">2</property> + <object class="wxStaticText" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font">,90,92,-1,70,0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="label">State</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">m_staticText5773</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <property name="wrap">-1</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">3</property> + <object class="wxTextCtrl" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="maxlength">0</property> + <property name="minimum_size"></property> + <property name="name">ppsstate</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style">wxTE_RIGHT</property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="value"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> + <event name="OnUpdateUI"></event> + </object> + </object> </object> </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> + <property name="flag">wxEXPAND</property> <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font"></property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">ppscmd</property> - <property name="maximum_size"></property> - <property name="minimum_size"></property> - <property name="name">ppscmd</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> - </object> - </object> - </object> - </object> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxBoxSizer" expanded="1"> - <property name="minimum_size"></property> - <property name="name">bSizer9212</property> - <property name="orient">wxHORIZONTAL</property> - <property name="permission">none</property> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font">,90,92,-1,70,0</property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">Clock Rate</property> - <property name="maximum_size"></property> + <object class="wxBoxSizer" expanded="1"> <property name="minimum_size"></property> - <property name="name">m_staticText57712</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style"></property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> + <property name="name">bSizer92211</property> + <property name="orient">wxHORIZONTAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">2</property> + <object class="wxStaticText" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font">,90,92,-1,70,0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="label">Feedback</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">m_staticText577211</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <property name="wrap">-1</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">3</property> + <object class="wxTextCtrl" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="maxlength">0</property> + <property name="minimum_size"></property> + <property name="name">ppscmd</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style">wxTE_RIGHT</property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="value"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> + <event name="OnUpdateUI"></event> + </object> + </object> </object> </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> + <property name="flag">wxEXPAND</property> <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font"></property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">ppscr</property> - <property name="maximum_size"></property> + <object class="wxBoxSizer" expanded="1"> <property name="minimum_size"></property> - <property name="name">ppscr</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> + <property name="name">bSizer9212</property> + <property name="orient">wxHORIZONTAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">2</property> + <object class="wxStaticText" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font">,90,92,-1,70,0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="label">Clock Rate</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">m_staticText57712</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <property name="wrap">-1</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">3</property> + <object class="wxTextCtrl" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="maxlength">0</property> + <property name="minimum_size"></property> + <property name="name">ppscr</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style">wxTE_RIGHT</property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="value"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> + <event name="OnUpdateUI"></event> + </object> + </object> </object> </object> - </object> - </object> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> - <property name="flag">wxEXPAND</property> - <property name="proportion">1</property> - <object class="wxBoxSizer" expanded="1"> - <property name="minimum_size"></property> - <property name="name">bSizer92111</property> - <property name="orient">wxHORIZONTAL</property> - <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL</property> - <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font">,90,92,-1,70,0</property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">Filtered Error</property> - <property name="maximum_size"></property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxBoxSizer" expanded="1"> <property name="minimum_size"></property> - <property name="name">m_staticText577111</property> - <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style"></property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> + <property name="name">bSizer92111</property> + <property name="orient">wxHORIZONTAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> + <property name="proportion">2</property> + <object class="wxStaticText" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font">,90,92,-1,70,0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="label">Filtered Error</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">m_staticText577111</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <property name="wrap">-1</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">3</property> + <object class="wxTextCtrl" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="maxlength">0</property> + <property name="minimum_size"></property> + <property name="name">ppserr</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style">wxTE_RIGHT</property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="value"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnText"></event> + <event name="OnTextEnter"></event> + <event name="OnTextMaxLen"></event> + <event name="OnTextURL"></event> + <event name="OnUpdateUI"></event> + </object> + </object> </object> </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> + <property name="flag">wxEXPAND</property> <property name="proportion">1</property> - <object class="wxStaticText" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font"></property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="label">errflt</property> - <property name="maximum_size"></property> - <property name="minimum_size"></property> - <property name="name">ppserr</property> + <object class="spacer" expanded="1"> + <property name="height">0</property> <property name="permission">protected</property> - <property name="pos"></property> - <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <property name="wrap">-1</property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> + <property name="width">0</property> </object> </object> </object> @@ -4655,7 +4776,7 @@ <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxALIGN_RIGHT</property> <property name="subclass"></property> <property name="tooltip"></property> <property name="window_extra_style"></property> @@ -5985,7 +6106,7 @@ <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxALIGN_LEFT</property> <property name="subclass"></property> <property name="tooltip"></property> <property name="window_extra_style"></property> @@ -6098,7 +6219,7 @@ <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxALIGN_LEFT</property> <property name="subclass"></property> <property name="tooltip"></property> <property name="window_extra_style"></property> @@ -6211,7 +6332,7 @@ <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxALIGN_LEFT</property> <property name="subclass"></property> <property name="tooltip"></property> <property name="window_extra_style"></property> @@ -6396,7 +6517,7 @@ <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxALIGN_LEFT</property> <property name="subclass"></property> <property name="tooltip"></property> <property name="window_extra_style"></property> @@ -6509,7 +6630,7 @@ <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxALIGN_LEFT</property> <property name="subclass"></property> <property name="tooltip"></property> <property name="window_extra_style"></property> @@ -6622,7 +6743,7 @@ <property name="permission">protected</property> <property name="pos"></property> <property name="size"></property> - <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property> + <property name="style">wxALIGN_LEFT</property> <property name="subclass"></property> <property name="tooltip"></property> <property name="window_extra_style"></property> @@ -9523,7 +9644,7 @@ <property name="border">5</property> <property name="flag">wxEXPAND</property> <property name="proportion">1</property> - <object class="wxGridSizer" expanded="0"> + <object class="wxGridSizer" expanded="1"> <property name="cols">5</property> <property name="hgap">0</property> <property name="minimum_size"></property> @@ -13792,7 +13913,7 @@ <property name="minimum_size"></property> <property name="name">iGUI_Log</property> <property name="pos"></property> - <property name="size"></property> + <property name="size">600,400</property> <property name="style">wxDEFAULT_DIALOG_STYLE</property> <property name="subclass"></property> <property name="title">Logging Config</property> @@ -13838,6 +13959,72 @@ <object class="sizeritem" expanded="1"> <property name="border">5</property> <property name="flag">wxALL|wxEXPAND</property> + <property name="proportion">0</property> + <object class="wxStaticBoxSizer" expanded="0"> + <property name="id">wxID_ANY</property> + <property name="label">Log Path</property> + <property name="minimum_size"></property> + <property name="name">sbSizer27</property> + <property name="orient">wxVERTICAL</property> + <property name="permission">none</property> + <event name="OnUpdateUI"></event> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxDirPickerCtrl" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="message">Select a folder</property> + <property name="minimum_size"></property> + <property name="name">mFile</property> + <property name="permission">public</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style">wxDIRP_DEFAULT_STYLE|wxDIRP_DIR_MUST_EXIST|wxDIRP_USE_TEXTCTRL</property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="value">/home/gpssim/workspace/gps-sdr/gse</property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnDirChanged"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxEXPAND</property> <property name="proportion">1</property> <object class="wxStaticBoxSizer" expanded="1"> <property name="id">wxID_ANY</property> @@ -14431,65 +14618,168 @@ <event name="OnUpdateUI"></event> </object> </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">0</property> + <object class="wxCheckBox" expanded="1"> + <property name="bg"></property> + <property name="checked">0</property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="label">Google Earth</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">cGearth</property> + <property name="permission">public</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnCheckBox"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">0</property> + <object class="wxCheckBox" expanded="1"> + <property name="bg"></property> + <property name="checked">0</property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="label">Rinex Observation</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">cRobs</property> + <property name="permission">public</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnCheckBox"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">0</property> + <object class="wxCheckBox" expanded="1"> + <property name="bg"></property> + <property name="checked">0</property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="label">Rinex Ephemeris</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">cRephem</property> + <property name="permission">public</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnCheckBox"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> </object> </object> </object> </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxEXPAND</property> - <property name="proportion">0</property> - <object class="wxFilePickerCtrl" expanded="1"> - <property name="bg"></property> - <property name="context_help"></property> - <property name="enabled">1</property> - <property name="fg"></property> - <property name="font"></property> - <property name="hidden">0</property> - <property name="id">wxID_ANY</property> - <property name="maximum_size"></property> - <property name="message">Create/Open File for Logging</property> - <property name="minimum_size"></property> - <property name="name">mFile</property> - <property name="permission">public</property> - <property name="pos"></property> - <property name="size">600,-1</property> - <property name="style">wxFLP_OVERWRITE_PROMPT|wxFLP_SAVE|wxFLP_USE_TEXTCTRL</property> - <property name="subclass"></property> - <property name="tooltip"></property> - <property name="value"></property> - <property name="wildcard">*.log</property> - <property name="window_extra_style"></property> - <property name="window_name"></property> - <property name="window_style"></property> - <event name="OnChar"></event> - <event name="OnEnterWindow"></event> - <event name="OnEraseBackground"></event> - <event name="OnFileChanged"></event> - <event name="OnKeyDown"></event> - <event name="OnKeyUp"></event> - <event name="OnKillFocus"></event> - <event name="OnLeaveWindow"></event> - <event name="OnLeftDClick"></event> - <event name="OnLeftDown"></event> - <event name="OnLeftUp"></event> - <event name="OnMiddleDClick"></event> - <event name="OnMiddleDown"></event> - <event name="OnMiddleUp"></event> - <event name="OnMotion"></event> - <event name="OnMouseEvents"></event> - <event name="OnMouseWheel"></event> - <event name="OnPaint"></event> - <event name="OnRightDClick"></event> - <event name="OnRightDown"></event> - <event name="OnRightUp"></event> - <event name="OnSetFocus"></event> - <event name="OnSize"></event> - <event name="OnUpdateUI"></event> - </object> - </object> - <object class="sizeritem" expanded="1"> - <property name="border">5</property> <property name="flag">wxALIGN_RIGHT|wxALL</property> <property name="proportion">0</property> <object class="wxBoxSizer" expanded="1"> @@ -15055,7 +15345,7 @@ </object> </object> </object> - <object class="Frame" expanded="1"> + <object class="Frame" expanded="0"> <property name="bg"></property> <property name="center"></property> <property name="context_help"></property> gse/gui.fbp @@ -176,11 +176,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText5343->Wrap( -1 ); m_staticText5343->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer633->Add( m_staticText5343, 0, wxALL, 5 ); + bSizer633->Add( m_staticText5343, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - rticks = new wxStaticText( this, wxID_ANY, wxT("rticks"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - rticks->Wrap( -1 ); - bSizer633->Add( rticks, 1, wxALL|wxEXPAND, 5 ); + rticks = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer633->Add( rticks, 2, wxALL|wxEXPAND, 5 ); bSizer199->Add( bSizer633, 1, wxEXPAND, 5 ); @@ -191,11 +190,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText536111->Wrap( -1 ); m_staticText536111->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer65111->Add( m_staticText536111, 0, wxALL, 5 ); + bSizer65111->Add( m_staticText536111, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - sticks = new wxStaticText( this, wxID_ANY, wxT("sticks"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - sticks->Wrap( -1 ); - bSizer65111->Add( sticks, 1, wxALL|wxEXPAND, 5 ); + sticks = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer65111->Add( sticks, 2, wxALL|wxEXPAND, 5 ); bSizer199->Add( bSizer65111, 1, wxEXPAND, 5 ); @@ -206,11 +204,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText53411->Wrap( -1 ); m_staticText53411->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer6311->Add( m_staticText53411, 0, wxALL, 5 ); + bSizer6311->Add( m_staticText53411, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - cticks = new wxStaticText( this, wxID_ANY, wxT("cticks"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - cticks->Wrap( -1 ); - bSizer6311->Add( cticks, 1, wxALIGN_RIGHT|wxALL, 5 ); + cticks = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer6311->Add( cticks, 2, wxALL|wxEXPAND, 5 ); bSizer199->Add( bSizer6311, 1, wxEXPAND, 5 ); @@ -235,26 +232,24 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText53511->Wrap( -1 ); m_staticText53511->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer6411->Add( m_staticText53511, 0, wxALL, 5 ); + bSizer6411->Add( m_staticText53511, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - iter = new wxStaticText( this, wxID_ANY, wxT("iter"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - iter->Wrap( -1 ); - bSizer6411->Add( iter, 1, wxALL|wxEXPAND, 5 ); + iter = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer6411->Add( iter, 2, wxALL|wxEXPAND, 5 ); bSizer200->Add( bSizer6411, 1, wxEXPAND, 5 ); wxBoxSizer* bSizer642; bSizer642 = new wxBoxSizer( wxHORIZONTAL ); - m_staticText53431 = new wxStaticText( this, wxID_ANY, wxT("Nav Satellites"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText53431 = new wxStaticText( this, wxID_ANY, wxT("Nav SV"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); m_staticText53431->Wrap( -1 ); m_staticText53431->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer642->Add( m_staticText53431, 0, wxALL, 5 ); + bSizer642->Add( m_staticText53431, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - nsv = new wxStaticText( this, wxID_ANY, wxT("nsv"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - nsv->Wrap( -1 ); - bSizer642->Add( nsv, 1, wxALL|wxEXPAND, 5 ); + nsv = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer642->Add( nsv, 2, wxALL|wxEXPAND, 5 ); bSizer200->Add( bSizer642, 1, wxEXPAND, 5 ); @@ -281,11 +276,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText534->Wrap( -1 ); m_staticText534->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer63->Add( m_staticText534, 0, wxALL, 5 ); + bSizer63->Add( m_staticText534, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - lat = new wxStaticText( this, wxID_ANY, wxT("lat"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - lat->Wrap( -1 ); - bSizer63->Add( lat, 1, wxALL|wxEXPAND, 5 ); + lat = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer63->Add( lat, 3, wxALL, 5 ); bSizer196->Add( bSizer63, 1, wxEXPAND, 5 ); @@ -296,11 +290,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText5341->Wrap( -1 ); m_staticText5341->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer631->Add( m_staticText5341, 0, wxALL, 5 ); + bSizer631->Add( m_staticText5341, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - lon = new wxStaticText( this, wxID_ANY, wxT("lon"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - lon->Wrap( -1 ); - bSizer631->Add( lon, 1, wxALIGN_RIGHT|wxALL, 5 ); + lon = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer631->Add( lon, 3, wxALL, 5 ); bSizer196->Add( bSizer631, 1, wxEXPAND, 5 ); @@ -311,11 +304,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText53611->Wrap( -1 ); m_staticText53611->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer6511->Add( m_staticText53611, 0, wxALL, 5 ); + bSizer6511->Add( m_staticText53611, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - alt = new wxStaticText( this, wxID_ANY, wxT("alt"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - alt->Wrap( -1 ); - bSizer6511->Add( alt, 1, wxALL|wxEXPAND, 5 ); + alt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer6511->Add( alt, 3, wxALL, 5 ); bSizer196->Add( bSizer6511, 1, wxEXPAND, 5 ); @@ -326,11 +318,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText53614->Wrap( -1 ); m_staticText53614->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer6514->Add( m_staticText53614, 0, wxALL, 5 ); + bSizer6514->Add( m_staticText53614, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - gdop = new wxStaticText( this, wxID_ANY, wxT("gdop"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - gdop->Wrap( -1 ); - bSizer6514->Add( gdop, 1, wxALL|wxEXPAND, 5 ); + gdop = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer6514->Add( gdop, 3, wxALL, 5 ); bSizer196->Add( bSizer6514, 1, wxEXPAND, 5 ); @@ -352,11 +343,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText535->Wrap( -1 ); m_staticText535->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer64->Add( m_staticText535, 0, wxALL, 5 ); + bSizer64->Add( m_staticText535, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - px = new wxStaticText( this, wxID_ANY, wxT("px"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - px->Wrap( -1 ); - bSizer64->Add( px, 1, wxALL|wxEXPAND, 5 ); + px = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer64->Add( px, 4, wxALL, 5 ); bSizer197->Add( bSizer64, 1, wxEXPAND, 5 ); @@ -367,11 +357,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText5351->Wrap( -1 ); m_staticText5351->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer641->Add( m_staticText5351, 0, wxALL, 5 ); + bSizer641->Add( m_staticText5351, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - py = new wxStaticText( this, wxID_ANY, wxT("py"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - py->Wrap( -1 ); - bSizer641->Add( py, 1, wxALL|wxEXPAND, 5 ); + py = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer641->Add( py, 4, wxALL, 5 ); bSizer197->Add( bSizer641, 1, wxEXPAND, 5 ); @@ -382,11 +371,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText53612->Wrap( -1 ); m_staticText53612->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer6512->Add( m_staticText53612, 0, wxALL, 5 ); + bSizer6512->Add( m_staticText53612, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - pz = new wxStaticText( this, wxID_ANY, wxT("pz"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - pz->Wrap( -1 ); - bSizer6512->Add( pz, 1, wxALL|wxEXPAND, 5 ); + pz = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer6512->Add( pz, 4, wxALL, 5 ); bSizer197->Add( bSizer6512, 1, wxEXPAND, 5 ); @@ -411,11 +399,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText536->Wrap( -1 ); m_staticText536->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer65->Add( m_staticText536, 0, wxALL, 5 ); + bSizer65->Add( m_staticText536, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - vx = new wxStaticText( this, wxID_ANY, wxT("vx"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - vx->Wrap( -1 ); - bSizer65->Add( vx, 1, wxEXPAND|wxALL, 5 ); + vx = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer65->Add( vx, 4, wxALL, 5 ); bSizer198->Add( bSizer65, 1, wxEXPAND, 5 ); @@ -426,11 +413,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText5361->Wrap( -1 ); m_staticText5361->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer651->Add( m_staticText5361, 0, wxALL, 5 ); + bSizer651->Add( m_staticText5361, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - vy = new wxStaticText( this, wxID_ANY, wxT("vy"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE|wxSIMPLE_BORDER ); - vy->Wrap( -1 ); - bSizer651->Add( vy, 1, wxALL|wxEXPAND, 5 ); + vy = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer651->Add( vy, 4, wxALL, 5 ); bSizer198->Add( bSizer651, 1, wxEXPAND, 5 ); @@ -441,26 +427,24 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText53613->Wrap( -1 ); m_staticText53613->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer6513->Add( m_staticText53613, 0, wxALL, 5 ); + bSizer6513->Add( m_staticText53613, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - vz = new wxStaticText( this, wxID_ANY, wxT("vz"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - vz->Wrap( -1 ); - bSizer6513->Add( vz, 1, wxALL|wxEXPAND, 5 ); + vz = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer6513->Add( vz, 4, wxALL, 5 ); bSizer198->Add( bSizer6513, 1, wxEXPAND, 5 ); wxBoxSizer* bSizer632; bSizer632 = new wxBoxSizer( wxHORIZONTAL ); - m_staticText5342 = new wxStaticText( this, wxID_ANY, wxT("Speed"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText5342 = new wxStaticText( this, wxID_ANY, wxT("Vel"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText5342->Wrap( -1 ); m_staticText5342->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer632->Add( m_staticText5342, 0, wxALL, 5 ); + bSizer632->Add( m_staticText5342, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - speed = new wxStaticText( this, wxID_ANY, wxT("speed"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - speed->Wrap( -1 ); - bSizer632->Add( speed, 1, wxALL|wxEXPAND, 5 ); + speed = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer632->Add( speed, 4, wxALL, 5 ); bSizer198->Add( bSizer632, 1, wxEXPAND, 5 ); @@ -468,6 +452,9 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons bSizer18->Add( sbSizer13, 0, wxALL|wxEXPAND|wxFIXED_MINSIZE, 5 ); + wxBoxSizer* bSizer110; + bSizer110 = new wxBoxSizer( wxHORIZONTAL ); + wxStaticBoxSizer* sbSizer37; sbSizer37 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Date/Time") ), wxVERTICAL ); @@ -478,11 +465,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText57721->Wrap( -1 ); m_staticText57721->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer9221->Add( m_staticText57721, 0, wxALL, 5 ); + bSizer9221->Add( m_staticText57721, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - utct = new wxStaticText( this, wxID_ANY, wxT("utct"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - utct->Wrap( -1 ); - bSizer9221->Add( utct, 1, wxALL|wxEXPAND, 5 ); + utct = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer9221->Add( utct, 2, wxALL, 5 ); sbSizer37->Add( bSizer9221, 1, wxEXPAND, 5 ); @@ -493,11 +479,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText577->Wrap( -1 ); m_staticText577->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer92->Add( m_staticText577, 0, wxALL, 5 ); + bSizer92->Add( m_staticText577, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - gpsw = new wxStaticText( this, wxID_ANY, wxT("gpsw"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - gpsw->Wrap( -1 ); - bSizer92->Add( gpsw, 1, wxALL|wxEXPAND, 5 ); + gpsw = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer92->Add( gpsw, 2, wxALL, 5 ); sbSizer37->Add( bSizer92, 1, wxEXPAND, 5 ); @@ -508,11 +493,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText5772->Wrap( -1 ); m_staticText5772->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer922->Add( m_staticText5772, 0, wxALL, 5 ); + bSizer922->Add( m_staticText5772, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - gpss = new wxStaticText( this, wxID_ANY, wxT("gpss"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - gpss->Wrap( -1 ); - bSizer922->Add( gpss, 1, wxALL|wxEXPAND, 5 ); + gpss = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer922->Add( gpss, 2, wxALL, 5 ); sbSizer37->Add( bSizer922, 1, wxEXPAND, 5 ); @@ -523,11 +507,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText5771->Wrap( -1 ); m_staticText5771->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer921->Add( m_staticText5771, 0, wxALL, 5 ); + bSizer921->Add( m_staticText5771, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - cb = new wxStaticText( this, wxID_ANY, wxT("cb"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - cb->Wrap( -1 ); - bSizer921->Add( cb, 1, wxALL|wxEXPAND, 5 ); + cb = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer921->Add( cb, 2, wxALL, 5 ); sbSizer37->Add( bSizer921, 1, wxEXPAND, 5 ); @@ -538,15 +521,14 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText57711->Wrap( -1 ); m_staticText57711->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer9211->Add( m_staticText57711, 0, wxALL, 5 ); + bSizer9211->Add( m_staticText57711, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - cr = new wxStaticText( this, wxID_ANY, wxT("cr"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - cr->Wrap( -1 ); - bSizer9211->Add( cr, 1, wxALL|wxEXPAND, 5 ); + cr = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer9211->Add( cr, 2, wxALL, 5 ); sbSizer37->Add( bSizer9211, 1, wxEXPAND, 5 ); - bSizer18->Add( sbSizer37, 0, wxALL|wxEXPAND|wxFIXED_MINSIZE, 5 ); + bSizer110->Add( sbSizer37, 3, wxALL|wxEXPAND|wxFIXED_MINSIZE, 5 ); wxStaticBoxSizer* sbSizer371; sbSizer371 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("PPS ") ), wxVERTICAL ); @@ -558,11 +540,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText5773->Wrap( -1 ); m_staticText5773->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer923->Add( m_staticText5773, 0, wxALL, 5 ); + bSizer923->Add( m_staticText5773, 2, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - ppsstate = new wxStaticText( this, wxID_ANY, wxT("ppsstate"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - ppsstate->Wrap( -1 ); - bSizer923->Add( ppsstate, 1, wxALL|wxEXPAND, 5 ); + ppsstate = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer923->Add( ppsstate, 3, wxALL, 5 ); sbSizer371->Add( bSizer923, 1, wxEXPAND, 5 ); @@ -573,11 +554,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText577211->Wrap( -1 ); m_staticText577211->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer92211->Add( m_staticText577211, 0, wxALL, 5 ); + bSizer92211->Add( m_staticText577211, 2, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - ppscmd = new wxStaticText( this, wxID_ANY, wxT("ppscmd"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - ppscmd->Wrap( -1 ); - bSizer92211->Add( ppscmd, 1, wxALL|wxEXPAND, 5 ); + ppscmd = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer92211->Add( ppscmd, 3, wxALL, 5 ); sbSizer371->Add( bSizer92211, 1, wxEXPAND, 5 ); @@ -588,11 +568,10 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText57712->Wrap( -1 ); m_staticText57712->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer9212->Add( m_staticText57712, 0, wxALL, 5 ); + bSizer9212->Add( m_staticText57712, 2, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - ppscr = new wxStaticText( this, wxID_ANY, wxT("ppscr"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - ppscr->Wrap( -1 ); - bSizer9212->Add( ppscr, 1, wxALL|wxEXPAND, 5 ); + ppscr = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer9212->Add( ppscr, 3, wxALL, 5 ); sbSizer371->Add( bSizer9212, 1, wxEXPAND, 5 ); @@ -603,15 +582,19 @@ iGUI_PVT::iGUI_PVT( wxWindow* parent, wxWindowID id, const wxString& title, cons m_staticText577111->Wrap( -1 ); m_staticText577111->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer92111->Add( m_staticText577111, 0, wxALL, 5 ); + bSizer92111->Add( m_staticText577111, 2, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - ppserr = new wxStaticText( this, wxID_ANY, wxT("errflt"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); - ppserr->Wrap( -1 ); - bSizer92111->Add( ppserr, 1, wxALL|wxEXPAND, 5 ); + ppserr = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_RIGHT ); + bSizer92111->Add( ppserr, 3, wxALL, 5 ); sbSizer371->Add( bSizer92111, 1, wxEXPAND, 5 ); - bSizer18->Add( sbSizer371, 0, wxALL|wxEXPAND, 5 ); + + sbSizer371->Add( 0, 0, 1, wxEXPAND, 5 ); + + bSizer110->Add( sbSizer371, 2, wxALL|wxEXPAND, 5 ); + + bSizer18->Add( bSizer110, 1, wxEXPAND, 5 ); bSizer9->Add( bSizer18, 5, wxEXPAND, 5 ); @@ -670,7 +653,7 @@ iGUI_EKF::iGUI_EKF( wxWindow* parent, wxWindowID id, const wxString& title, cons bSizer633->Add( m_staticText5343, 0, wxALL, 5 ); - rticks = new wxStaticText( this, wxID_ANY, wxT("rticks"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); + rticks = new wxStaticText( this, wxID_ANY, wxT("rticks"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); rticks->Wrap( -1 ); bSizer633->Add( rticks, 1, wxALL|wxEXPAND, 5 ); @@ -858,7 +841,7 @@ iGUI_EKF::iGUI_EKF( wxWindow* parent, wxWindowID id, const wxString& title, cons bSizer64->Add( m_staticText535, 0, wxALL, 5 ); - px = new wxStaticText( this, wxID_ANY, wxT("px"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); + px = new wxStaticText( this, wxID_ANY, wxT("px"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); px->Wrap( -1 ); bSizer64->Add( px, 1, wxALL|wxEXPAND, 5 ); @@ -873,7 +856,7 @@ iGUI_EKF::iGUI_EKF( wxWindow* parent, wxWindowID id, const wxString& title, cons bSizer641->Add( m_staticText5351, 0, wxALL, 5 ); - py = new wxStaticText( this, wxID_ANY, wxT("py"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); + py = new wxStaticText( this, wxID_ANY, wxT("py"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); py->Wrap( -1 ); bSizer641->Add( py, 1, wxALL|wxEXPAND, 5 ); @@ -888,7 +871,7 @@ iGUI_EKF::iGUI_EKF( wxWindow* parent, wxWindowID id, const wxString& title, cons bSizer6512->Add( m_staticText53612, 0, wxALL, 5 ); - pz = new wxStaticText( this, wxID_ANY, wxT("pz"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); + pz = new wxStaticText( this, wxID_ANY, wxT("pz"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); pz->Wrap( -1 ); bSizer6512->Add( pz, 1, wxALL|wxEXPAND, 5 ); @@ -917,7 +900,7 @@ iGUI_EKF::iGUI_EKF( wxWindow* parent, wxWindowID id, const wxString& title, cons bSizer65->Add( m_staticText536, 0, wxALL, 5 ); - vx = new wxStaticText( this, wxID_ANY, wxT("vx"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); + vx = new wxStaticText( this, wxID_ANY, wxT("vx"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); vx->Wrap( -1 ); bSizer65->Add( vx, 1, wxEXPAND|wxALL, 5 ); @@ -932,7 +915,7 @@ iGUI_EKF::iGUI_EKF( wxWindow* parent, wxWindowID id, const wxString& title, cons bSizer651->Add( m_staticText5361, 0, wxALL, 5 ); - vy = new wxStaticText( this, wxID_ANY, wxT("vy"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE|wxSIMPLE_BORDER ); + vy = new wxStaticText( this, wxID_ANY, wxT("vy"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT|wxSIMPLE_BORDER ); vy->Wrap( -1 ); bSizer651->Add( vy, 1, wxALL|wxEXPAND, 5 ); @@ -947,7 +930,7 @@ iGUI_EKF::iGUI_EKF( wxWindow* parent, wxWindowID id, const wxString& title, cons bSizer6513->Add( m_staticText53613, 0, wxALL, 5 ); - vz = new wxStaticText( this, wxID_ANY, wxT("vz"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); + vz = new wxStaticText( this, wxID_ANY, wxT("vz"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); vz->Wrap( -1 ); bSizer6513->Add( vz, 1, wxALL|wxEXPAND, 5 ); @@ -1979,6 +1962,14 @@ iGUI_Log::iGUI_Log( wxWindow* parent, wxWindowID id, const wxString& title, cons wxBoxSizer* bSizer30; bSizer30 = new wxBoxSizer( wxVERTICAL ); + wxStaticBoxSizer* sbSizer27; + sbSizer27 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Log Path") ), wxVERTICAL ); + + mFile = new wxDirPickerCtrl( this, wxID_ANY, wxT("/home/gpssim/workspace/gps-sdr/gse"), wxT("Select a folder"), wxDefaultPosition, wxDefaultSize, wxDIRP_DEFAULT_STYLE|wxDIRP_DIR_MUST_EXIST|wxDIRP_USE_TEXTCTRL ); + sbSizer27->Add( mFile, 1, wxALL|wxEXPAND, 5 ); + + bSizer30->Add( sbSizer27, 0, wxALL|wxEXPAND, 5 ); + wxStaticBoxSizer* sbSizer14; sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Logged Items") ), wxVERTICAL ); @@ -2029,13 +2020,22 @@ iGUI_Log::iGUI_Log( wxWindow* parent, wxWindowID id, const wxString& title, cons gSizer3->Add( cSVPred, 0, wxALL, 5 ); + cGearth = new wxCheckBox( this, wxID_ANY, wxT("Google Earth"), wxDefaultPosition, wxDefaultSize, 0 ); + + gSizer3->Add( cGearth, 0, wxALL, 5 ); + + cRobs = new wxCheckBox( this, wxID_ANY, wxT("Rinex Observation"), wxDefaultPosition, wxDefaultSize, 0 ); + + gSizer3->Add( cRobs, 0, wxALL, 5 ); + + cRephem = new wxCheckBox( this, wxID_ANY, wxT("Rinex Ephemeris"), wxDefaultPosition, wxDefaultSize, 0 ); + + gSizer3->Add( cRephem, 0, wxALL, 5 ); + sbSizer14->Add( gSizer3, 0, wxEXPAND, 5 ); bSizer30->Add( sbSizer14, 1, wxALL|wxEXPAND, 5 ); - mFile = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, wxT("Create/Open File for Logging"), wxT("*.log"), wxDefaultPosition, wxSize( 600,-1 ), wxFLP_OVERWRITE_PROMPT|wxFLP_SAVE|wxFLP_USE_TEXTCTRL ); - bSizer30->Add( mFile, 0, wxALL|wxEXPAND, 5 ); - wxBoxSizer* bSizer31; bSizer31 = new wxBoxSizer( wxHORIZONTAL ); @@ -2052,7 +2052,6 @@ iGUI_Log::iGUI_Log( wxWindow* parent, wxWindowID id, const wxString& title, cons this->SetSizer( bSizer30 ); this->Layout(); - bSizer30->Fit( this ); } iGUI_Log::~iGUI_Log() gse/gui_classes.cpp @@ -115,68 +115,69 @@ class iGUI_PVT : public wxFrame wxPanel* pCN0; wxStaticText* m_staticText5311; wxStaticText* m_staticText5343; - wxStaticText* rticks; + wxTextCtrl* rticks; wxStaticText* m_staticText536111; - wxStaticText* sticks; + wxTextCtrl* sticks; wxStaticText* m_staticText53411; - wxStaticText* cticks; + wxTextCtrl* cticks; wxStaticText* m_staticText5321; wxStaticText* m_staticText53511; - wxStaticText* iter; + wxTextCtrl* iter; wxStaticText* m_staticText53431; - wxStaticText* nsv; + wxTextCtrl* nsv; wxStaticText* m_staticText531; wxStaticText* m_staticText534; - wxStaticText* lat; + wxTextCtrl* lat; wxStaticText* m_staticText5341; - wxStaticText* lon; + wxTextCtrl* lon; wxStaticText* m_staticText53611; - wxStaticText* alt; + wxTextCtrl* alt; wxStaticText* m_staticText53614; - wxStaticText* gdop; + wxTextCtrl* gdop; wxStaticText* m_staticText532; wxStaticText* m_staticText535; - wxStaticText* px; + wxTextCtrl* px; wxStaticText* m_staticText5351; - wxStaticText* py; + wxTextCtrl* py; wxStaticText* m_staticText53612; - wxStaticText* pz; + wxTextCtrl* pz; wxStaticText* m_staticText533; wxStaticText* m_staticText536; - wxStaticText* vx; + wxTextCtrl* vx; wxStaticText* m_staticText5361; - wxStaticText* vy; + wxTextCtrl* vy; wxStaticText* m_staticText53613; - wxStaticText* vz; + wxTextCtrl* vz; wxStaticText* m_staticText5342; - wxStaticText* speed; + wxTextCtrl* speed; wxStaticText* m_staticText57721; - wxStaticText* utct; + wxTextCtrl* utct; wxStaticText* m_staticText577; - wxStaticText* gpsw; + wxTextCtrl* gpsw; wxStaticText* m_staticText5772; - wxStaticText* gpss; + wxTextCtrl* gpss; wxStaticText* m_staticText5771; - wxStaticText* cb; + wxTextCtrl* cb; wxStaticText* m_staticText57711; - wxStaticText* cr; + wxTextCtrl* cr; wxStaticText* m_staticText5773; - wxStaticText* ppsstate; + wxTextCtrl* ppsstate; wxStaticText* m_staticText577211; - wxStaticText* ppscmd; + wxTextCtrl* ppscmd; wxStaticText* m_staticText57712; - wxStaticText* ppscr; + wxTextCtrl* ppscr; wxStaticText* m_staticText577111; - wxStaticText* ppserr; + wxTextCtrl* ppserr; + // Virtual event handlers, overide them in your derived class virtual void OnClose( wxCloseEvent& event ){ event.Skip(); } public: - iGUI_PVT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("PVT"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1000,600 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL ); + iGUI_PVT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("PVT"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1600,600 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL ); ~iGUI_PVT(); }; @@ -495,6 +496,7 @@ class iGUI_Log : public wxDialog wxButton* bOK; public: + wxDirPickerCtrl* mFile; wxCheckBox* cPVT; wxCheckBox* cClock; wxCheckBox* cPPS; @@ -506,8 +508,10 @@ class iGUI_Log : public wxDialog wxCheckBox* cTask; wxCheckBox* cBoard; wxCheckBox* cSVPred; - wxFilePickerCtrl* mFile; - iGUI_Log( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Logging Config"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + wxCheckBox* cGearth; + wxCheckBox* cRobs; + wxCheckBox* cRephem; + iGUI_Log( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Logging Config"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 600,400 ), long style = wxDEFAULT_DIALOG_STYLE ); ~iGUI_Log(); }; gse/gui_classes.h @@ -56,7 +56,7 @@ class GUI_Serial : public Threaded_Object /* Headers for CCSDC packets */ CCSDS_Packet_Header packet_header; //!< CCSDS Packet header CCSDS_Decoded_Header decoded_packet; //!< Decoded header - int32 packet_count[LAST_M_ID+1]; //!< Count the packets + int32 packet_count[LAST_M_ID + 1]; //!< Count the packets int32 byte_count; //!< Count the bytes /* Buffer for commands */ @@ -75,9 +75,13 @@ class GUI_Serial : public Threaded_Object /* Logging variables */ int32 logging_on; //!< Control overall logging - char filename[1024]; //!< Log to this file + char filepath[1024]; //!< Log to this path + FILE *robsfile; //!< Pointer to Rinex observation file + FILE *rephemfile; //!< Pointer to Rinex ephemeris file FILE *lfile; //!< Pointer to log file - int32 log_flag[LAST_M_ID]; //!< Control messages on/off + FILE *gfile; //!< Pointer to google earth file + int32 gfile_end; //!< Pointer to end of gfile + int32 log_flag[LAST_M_ID + 20]; //!< Control messages on/off public: @@ -115,7 +119,7 @@ class GUI_Serial : public Threaded_Object void logStop(); void logClear(); void setLogFile(const char *_str); - char *getLogFile(){return(&filename[0]);}; + char *getLogFile(){return(&filepath[0]);}; void printPVT(); void printClock(); @@ -130,6 +134,14 @@ class GUI_Serial : public Threaded_Object void printSVPred(int32 _sv); void printTask(); void printBoard(); + void printGoogleEarth(); + void printGoogleEarthHeader(); + void printGoogleEarthFooter(); + void printRinexObs(); + void printRinexObsHeader(); + void printRinexEphem(); + void printRinexEphemHeader(); + void pendCommand(); //!< Wait for a free command int32 peekCommand(); //!< Poll for a command gse/include/gui_serial.h @@ -187,58 +187,63 @@ void GUI_PVT::renderPVT() vel = sqrt(pNav->vz*pNav->vz + pNav->vy*pNav->vy + pNav->vx*pNav->vx); - str.Printf(wxT("%15d"),pNav->tic); rticks->SetLabel(str); - str.Printf(wxT("%15d"),pNav->converged_ticks); cticks->SetLabel(str); - str.Printf(wxT("%15d"),pNav->stale_ticks); sticks->SetLabel(str); - str.Printf(wxT("%15d"),nchan); nsv->SetLabel(str); - str.Printf(wxT("%15.2f m"),pNav->x); px->SetLabel(str); - str.Printf(wxT("%15.2f m"),pNav->y); py->SetLabel(str); - str.Printf(wxT("%15.2f m"),pNav->z); pz->SetLabel(str); - str.Printf(wxT("%.2f cm/s"),100.0*pNav->vx); vx->SetLabel(str); - str.Printf(wxT("%.2f cm/s"),100.0*pNav->vy); vy->SetLabel(str); - str.Printf(wxT("%.2f cm/s"),100.0*pNav->vz); vz->SetLabel(str); - str.Printf(wxT("%.2f m/s"),vel); speed->SetLabel(str); - - str.Printf(wxT("%15.9f"),pNav->latitude*RAD_2_DEG); lat->SetLabel(str); - str.Printf(wxT("%15.9f"),pNav->longitude*RAD_2_DEG); lon->SetLabel(str); - str.Printf(wxT("%15.2f"),pNav->altitude); alt->SetLabel(str); - - str.Printf(wxT("%15.9f"),pClock->bias); cb->SetLabel(str); - str.Printf(wxT("%15.6f"),pClock->rate); cr->SetLabel(str); - str.Printf(wxT("%15.6f"),pClock->time); gpss->SetLabel(str); - str.Printf(wxT("%8u"),pClock->week); gpsw->SetLabel(str); - str.Printf(wxT("%8u"),pNav->iterations); iter->SetLabel(str); - str.Printf(wxT("%15.2f"),pNav->gdop); gdop->SetLabel(str); - str.Printf(wxT("%15e"),pPPS->err_lp); ppserr->SetLabel(str); - str.Printf(wxT("%15e"),pPPS->feedback*SPEED_OF_LIGHT); ppscmd->SetLabel(str); - str.Printf(wxT("%15e"),pPPS->clock_rate*SPEED_OF_LIGHT);ppscr->SetLabel(str); + str.Printf(wxT("%15d"),pNav->tic); rticks->Clear(); rticks->WriteText(str); + str.Printf(wxT("%15d"),pNav->converged_ticks); cticks->Clear(); cticks->WriteText(str); + str.Printf(wxT("%15d"),pNav->stale_ticks); sticks->Clear(); sticks->WriteText(str); + str.Printf(wxT("%15d"),nchan); nsv->Clear(); nsv->WriteText(str); + str.Printf(wxT("%15.2f m"),pNav->x); px->Clear(); px->WriteText(str); + str.Printf(wxT("%15.2f m"),pNav->y); py->Clear(); py->WriteText(str); + str.Printf(wxT("%15.2f m"),pNav->z); pz->Clear(); pz->WriteText(str); + str.Printf(wxT("%.2f cm/s"),100.0*pNav->vx); vx->Clear(); vx->WriteText(str); + str.Printf(wxT("%.2f cm/s"),100.0*pNav->vy); vy->Clear(); vy->WriteText(str); + str.Printf(wxT("%.2f cm/s"),100.0*pNav->vz); vz->Clear(); vz->WriteText(str); + str.Printf(wxT("%.2f m/s"),vel); speed->Clear(); speed->WriteText(str); + + str.Printf(wxT("%15.9f"),pNav->latitude*RAD_2_DEG); lat->Clear(); lat->WriteText(str); + str.Printf(wxT("%15.9f"),pNav->longitude*RAD_2_DEG); lon->Clear(); lon->WriteText(str); + str.Printf(wxT("%15.2f"),pNav->altitude); alt->Clear(); alt->WriteText(str); + + str.Printf(wxT("%15.9f"),pClock->bias); cb->Clear(); cb->WriteText(str); + str.Printf(wxT("%15.6f"),pClock->rate); cr->Clear(); cr->WriteText(str); + str.Printf(wxT("%15.6f"),pClock->time); gpss->Clear(); gpss->WriteText(str); + str.Printf(wxT("%8u"),pClock->week); gpsw->Clear(); gpsw->WriteText(str); + + str.Printf(wxT("%8u"),pNav->iterations); iter->Clear(); iter->WriteText(str); + str.Printf(wxT("%15.2f"),pNav->gdop); gdop->Clear(); gdop->WriteText(str); + str.Printf(wxT("%.5e"),pPPS->err_lp); ppserr->Clear(); ppserr->WriteText(str); + str.Printf(wxT("%.5e"),pPPS->feedback*SPEED_OF_LIGHT); ppscmd->Clear(); ppscmd->WriteText(str); + str.Printf(wxT("%.5e"),pPPS->clock_rate*SPEED_OF_LIGHT);ppscr->Clear(); ppscr->WriteText(str); if(pPPS->state) - ppsstate->SetLabel(wxT("Slow Slew")); + { + ppsstate->Clear(); ppsstate->WriteText(wxT("Slow Slew")); + } else - ppsstate->SetLabel(wxT("Fast Slew")); + { + ppsstate->Clear(); ppsstate->WriteText(wxT("Fast Slew")); + } /* Get into unix time */ if(pTOT->valid) { utcsec = floor(pTOT->second); - utcsec += (pTOT->week + 1024*CURRENT_GPS_WEEK_ROLLOVER)*SECONDS_IN_WEEK; + utcsec += (pTOT->week)*SECONDS_IN_WEEK; utcsec += (pTOT->day)*SECONDS_IN_DAY; - utcsec -= 10; //Difference of TAI and UTC + utcsec -= 10; //!< Difference of TAI and UTC utcsec += 315964819; //!< 0 Unix time --> GPS time offset theTime.Set(utcsec); str = theTime.FormatISODate(); - str += wxT('\t'); + str += wxT(' '); str += theTime.FormatISOTime(); - str2.Printf(wxT("%15.6f"),fmod(pTOT->second,1.0)); - str += str2; - utct->SetLabel(str); + str2.Printf(wxT("%.6f"),fmod(pTOT->second,1.0)); + str += str2.Mid(1,wxSTRING_MAXLEN); + utct->Clear(); utct->WriteText(str); } else { utcsec = 0; - utct->SetLabel(wxT("No UTC Information\n")); + utct->Clear(); utct->WriteText(wxT("No UTC Information")); } } gse/src/gui_pvt.cpp @@ -33,9 +33,9 @@ GUI_Select::GUI_Select():iGUI_Select(NULL, wxID_ANY, wxT("SV Select"), wxDefault int32 strwidth; wxString str; - str = wxT("Ch# Vis Elev Azim Doppler Time"); + str = wxT("Ch# Vis Elev Azim Doppler Time "); strwidth = str.Length()+3; - SetSize(tDisplay->GetCharWidth()*strwidth, tDisplay->GetCharHeight()*(MAX_SV+2) + 280); + SetSize(tDisplay->GetCharWidth()*strwidth, tDisplay->GetCharHeight()*(MAX_SV+3) + 280); } gse/src/gui_select.cpp @@ -23,7 +23,7 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1 #include "gui_serial.h" #define SWAP64(X) *((long long *)(&X)) = (((*((long long *)(&X)) & (0x00000000ffffffffLLU)) << 32) | ((*((long long *)(&X)) & (0xffffffff00000000LLU)) >> 32)) -static uint32 SIZEOF_M[LAST_M_ID+1] = +static uint32 SIZEOF_M[LAST_M_ID + 1] = { 0, 0, @@ -139,13 +139,16 @@ GUI_Serial::GUI_Serial() npipe[READ] = -1; npipe[WRITE] = -1; lfile = NULL; + gfile = NULL; + robsfile = NULL; + rephemfile = NULL; packet_count[LAST_M_ID] = 0; decoded_packet.tic = decoded_packet.id = decoded_packet.length = 0; memset(&packet_count[0], 0x0, (LAST_M_ID+1)*sizeof(int)); memset(&command_body, 0x0, sizeof(Command_Union)); memset(&command_header, 0x0, sizeof(CCSDS_Packet_Header)); memset(&decoded_command, 0x0, sizeof(CCSDS_Decoded_Header)); - memset(&filename[0], 0x0, 1024*sizeof(char)); + memset(&filepath[0], 0x0, 1024*sizeof(char)); memset(&log_flag[0], 0x0, LAST_M_ID*sizeof(char)); signal(SIGPIPE, lost_client); @@ -186,7 +189,7 @@ void GUI_Serial::openSerial() } memset(&tty, 0x0, sizeof(tty)); //!< Initialize the port settings structure to all zeros - tty.c_cflag = B115200 | CS8 | CLOCAL | CREAD | CRTSCTS; //!< 8N1 + tty.c_cflag = B57600 | CS8 | CLOCAL | CREAD | CRTSCTS; //!< 8N1 tty.c_iflag = IGNPAR; tty.c_oflag = 0; tty.c_lflag = 0; @@ -517,9 +520,11 @@ void GUI_Serial::readGPS() } break; case SPS_M_ID: + if(log_flag[LAST_M_ID + 1]) printRinexObs(); FixDoubles((void *)&src->sps, 13); memcpy(&dst->sps, &src->sps, sizeof(SPS_M)); if(log_flag[SPS_M_ID]) printPVT(); + if(log_flag[LAST_M_ID]) printGoogleEarth(); break; case CLOCK_M_ID: FixDoubles((void *)&src->clock, 6); @@ -908,9 +913,7 @@ int32 GUI_Serial::peekCommand() /*----------------------------------------------------------------------------------------------*/ void GUI_Serial::setLogFile(const char *_str) { - if(lfile) fclose(lfile); - strcpy(filename, _str); - lfile = fopen(filename, "wt"); + strcpy(filepath, _str); } /*----------------------------------------------------------------------------------------------*/ @@ -918,10 +921,40 @@ void GUI_Serial::setLogFile(const char *_str) /*----------------------------------------------------------------------------------------------*/ void GUI_Serial::logStart() { + char filename[1024]; + if(lfile) fclose(lfile); - lfile = NULL; + if(gfile) fclose(gfile); + if(robsfile) fclose(robsfile); + if(rephemfile) fclose(rephemfile); + + strcpy(filename, filepath); + strcat(filename,"/gps-sdr.log"); lfile = fopen(filename, "wt"); + if(log_flag[LAST_M_ID]) + { + strcpy(filename, filepath); + strcat(filename,"/gps-sdr.klm"); + gfile = fopen(filename, "wt"); + printGoogleEarthHeader(); + } + + if(log_flag[LAST_M_ID + 1]) + { + strcpy(filename, filepath); + strcat(filename,"/gps-sdr.rnx"); + robsfile = fopen(filename, "wt"); + printRinexObsHeader(); + } + + if(log_flag[LAST_M_ID + 2]) + { + strcpy(filename, filepath); + strcat(filename,"/gps-sdr.epm"); + rephemfile = fopen(filename, "wt"); + } + if(lfile) logging_on = true; } @@ -932,7 +965,13 @@ void GUI_Serial::logStart() void GUI_Serial::logStop() { if(lfile) fclose(lfile); + if(gfile) fclose(gfile); + if(robsfile) fclose(robsfile); + if(rephemfile) fclose(rephemfile); lfile = NULL; + gfile = NULL; + robsfile = NULL; + rephemfile = NULL; logging_on = false; } /*----------------------------------------------------------------------------------------------*/ @@ -941,11 +980,39 @@ void GUI_Serial::logStop() /*----------------------------------------------------------------------------------------------*/ void GUI_Serial::logClear() { + char filename[1024]; + if(lfile) fclose(lfile); - lfile = NULL; + if(gfile) fclose(gfile); + if(robsfile) fclose(robsfile); + if(rephemfile) fclose(rephemfile); + + strcpy(filename, filepath); + strcat(filename,"/gps-sdr.log"); lfile = fopen(filename, "wt"); - if(lfile) fclose(lfile); - lfile = NULL; + + if(log_flag[LAST_M_ID]) + { + strcpy(filename, filepath); + strcat(filename,"/gps-sdr.klm"); + gfile = fopen(filename, "wt"); + } + + if(log_flag[LAST_M_ID + 1]) + { + strcpy(filename, filepath); + strcat(filename,"/gps-sdr.rnx"); + robsfile = fopen(filename, "wt"); + } + + if(log_flag[LAST_M_ID + 2]) + { + strcpy(filename, filepath); + strcat(filename,"/gps-sdr.epm"); + rephemfile = fopen(filename, "wt"); + } + + logStop(); } /*----------------------------------------------------------------------------------------------*/ @@ -1303,3 +1370,231 @@ void GUI_Serial::printBoard() } } /*----------------------------------------------------------------------------------------------*/ + + + +/*----------------------------------------------------------------------------------------------*/ +void GUI_Serial::printGoogleEarth() +{ + + SPS_M *pNav = &messages.sps; + + if(gfile != NULL) + { + if(pNav->converged) + { + fseek(gfile, gfile_end, SEEK_SET); + fprintf(gfile,"%15.9f,%15.9f,%15.9f\n",pNav->longitude*RAD_2_DEG,pNav->latitude*RAD_2_DEG,pNav->altitude); + gfile_end = ftell(gfile); + printGoogleEarthFooter(); + } + } + +} +/*----------------------------------------------------------------------------------------------*/ + + +/*----------------------------------------------------------------------------------------------*/ +void GUI_Serial::printGoogleEarthHeader() +{ + + if(gfile != NULL) + { + fprintf(gfile,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"); + fprintf(gfile,"<kml xmlns=\"http://earth.google.com/kml/2.1\">\n"); + fprintf(gfile,"<Document>\n"); + fprintf(gfile,"<name>\n"); + fprintf(gfile,"navigation.kml\n"); + fprintf(gfile,"</name>\n"); + fprintf(gfile,"<Placemark id=\"GPS SDR\">\n"); + fprintf(gfile,"<name>\n"); + fprintf(gfile,"GPS SDR\n"); + fprintf(gfile,"</name>\n"); + fprintf(gfile,"<visibility>\n"); + fprintf(gfile,"1\n"); + fprintf(gfile,"</visibility>\n"); + fprintf(gfile,"<description>\n"); + fprintf(gfile,"<![CDATA[]]>\n"); + fprintf(gfile,"</description>\n"); + fprintf(gfile,"<Style>\n"); + fprintf(gfile,"<LineStyle>\n"); + fprintf(gfile,"<color>\n"); + fprintf(gfile,"#FF0000FF\n"); + fprintf(gfile,"</color>\n"); + fprintf(gfile,"<width>\n"); + fprintf(gfile,"1.00\n"); + fprintf(gfile,"</width>\n"); + fprintf(gfile,"</LineStyle>\n"); + fprintf(gfile,"<PolyStyle>\n"); + fprintf(gfile,"<color>\n"); + fprintf(gfile,"00ffffff\n"); + fprintf(gfile,"</color>\n"); + fprintf(gfile,"</PolyStyle>\n"); + fprintf(gfile,"</Style>\n"); + fprintf(gfile,"<Polygon id=\"poly_plot3\">\n"); + fprintf(gfile,"<extrude>0</extrude>\n"); + fprintf(gfile,"<altitudeMode>\n"); + fprintf(gfile,"relativeToGround\n"); + fprintf(gfile,"</altitudeMode>\n"); + fprintf(gfile,"<outerBoundaryIs>\n"); + fprintf(gfile,"<extrude>0</extrude>\n"); + fprintf(gfile,"<LinearRing>\n"); + fprintf(gfile,"<extrude>0</extrude>\n"); + fprintf(gfile,"<tessellate>0</tessellate>\n"); + fprintf(gfile,"<altitudeMode>\n"); + fprintf(gfile,"absolute\n"); + fprintf(gfile,"</altitudeMode>\n"); + fprintf(gfile,"<coordinates>\n"); + gfile_end = ftell(gfile); + } +} +/*----------------------------------------------------------------------------------------------*/ + + +/*----------------------------------------------------------------------------------------------*/ +void GUI_Serial::printGoogleEarthFooter() +{ + if(gfile != NULL) + { + fprintf(gfile,"</coordinates>\n"); + fprintf(gfile,"</LinearRing>\n"); + fprintf(gfile,"</outerBoundaryIs>\n"); + fprintf(gfile,"</Polygon>\n"); + fprintf(gfile,"</Placemark>\n"); + fprintf(gfile,"</Document>\n"); + fprintf(gfile,"</kml>\n"); + } +} +/*----------------------------------------------------------------------------------------------*/ + + +/*----------------------------------------------------------------------------------------------*/ +void GUI_Serial::printRinexObsHeader() +{ + + if(robsfile != NULL) + { + fprintf(robsfile," 2.10 RINEX VERSION / TYPE\n"); + fprintf(robsfile," 4 C1 D1 L1 S1 # / TYPES OF OBSERV\n"); + fprintf(robsfile," END OF HEADER\n"); + } + +} +/*----------------------------------------------------------------------------------------------*/ + + +/*----------------------------------------------------------------------------------------------*/ +void GUI_Serial::printRinexObs() +{ + + int32 lcv; + int32 nsv; + time_t utcsec; + Channel_M *pChan; + Pseudorange_M *pPseudo; + SPS_M *pNav = &messages.sps; + Clock_M *pClock = &messages.clock; + wxDateTime theTime; + + if(robsfile != NULL) + { + + /* Get the time into UTC */ + utcsec = floor(pClock->time_raw); //!< Seconds in GPS week + utcsec += (pClock->week)*SECONDS_IN_WEEK; + utcsec -= 10; //!< Difference of TAI and UTC + utcsec += 315964819; //!< 0 Unix time --> GPS time offset + theTime.Set(utcsec); + + /* Pull out the individual PRN numbers */ + nsv = 0; + for(lcv = 0; lcv < MAX_CHANNELS; lcv++) + { + if(messages.pseudoranges[lcv].sv != NON_EXISTENT_SV) + { + nsv++; + } + } + + /* Generate the date line */ + fprintf(robsfile,"%3d%3d%3d%3d%3d%12.8f 0%3d", + theTime.GetYear() % 100, + theTime.GetMonth()+1, + theTime.GetDay(), + theTime.GetHour(), + theTime.GetMinute(), + (double)theTime.GetSecond() + fmod(pClock->time_raw, 1.0), + nsv); + + /* Push the individual PRN numbers */ + for(lcv = 0; lcv < MAX_CHANNELS; lcv++) + { + pPseudo = &messages.pseudoranges[lcv]; + if(pPseudo->sv != NON_EXISTENT_SV) + { + fprintf(robsfile,"%3d",pPseudo->sv+1); + } + } + + /* Newline */ + fprintf(robsfile,"\n"); + + /* Loop over all of the channels */ + for(lcv = 0; lcv < MAX_CHANNELS; lcv++) + { + pChan = &messages.channel[lcv]; + pPseudo = &messages.pseudoranges[lcv]; + if(pPseudo->sv != NON_EXISTENT_SV) + { + fprintf(robsfile," %14.3f %14.3f %14.3f %14.3f\n", + pPseudo->uncorrected, pPseudo->meters_rate, 0.0, icn0_2_fcn0(pChan->cn0)); + } + } + } +} +/*----------------------------------------------------------------------------------------------*/ + + +/*----------------------------------------------------------------------------------------------*/ +void GUI_Serial::printRinexEphemHeader() +{ + if(rephemfile != NULL) + { + fprintf(rephemfile," 2 N RINEX VERSION / TYPE\n"); + fprintf(rephemfile,"MATLAB G HECKLER 23-APR-02 PGM / RUN BY / DATE \n"); + fprintf(rephemfile,"PSEUDO-NAVIGATION DATA GENERATED FROM ALMANAC COMMENT \n"); + fprintf(rephemfile," 0.0000D+00 0.0000D+00 -0.0000D+00 0.0000D+00 ION ALPHA \n"); + fprintf(rephemfile," -0.0000D+00 -0.0000D+00 0.0000D+00 -0.0000D+00 ION BETA \n"); + fprintf(rephemfile," 0.000000000000D+00 0.000000000000D+00 0 0 DELTA-UTC: A0,A1,T,W\n"); + fprintf(rephemfile," 12 LEAP SECONDS \n"); + fprintf(rephemfile," END OF HEADER \n"); + } +} +/*----------------------------------------------------------------------------------------------*/ + + + + +/*----------------------------------------------------------------------------------------------*/ +void GUI_Serial::printRinexEphem() +{ + if(rephemfile != NULL) + { +// /*Generate the date using the TOC week and second*/ +// utilities::timeStruct time; +// utilities::gps2utc(tocwk+1024,toc,&time); +// +// /*Write out date and time information*/ +// sprintf(output,"%2d%3d%3d%3d%3d%3d%5.1f %- 19.12E%- 19.12E%- 19.12E\n", +// PRN,time.year,time.month,time.day,time.hour,time.minute,time.second,af0,af1,af2); +// +// /*Broadcast Ephemeris Line 1*/ +// fprintf(rephemfile," %- 20.12E%- 20.12E%- 20.12E%- 20.12E\n",iode,crs,deltan,m0); +// fprintf(rephemfile," %- 20.12E%- 20.12E%- 20.12E%- 20.12E\n",cuc,ecc,cus,sqrta); +// fprintf(rephemfile," %- 20.12E%- 20.12E%- 20.12E%- 20.12E\n",toe,cic,om0,cis); +// fprintf(rephemfile," %- 20.12E%- 20.12E%- 20.12E%- 20.12E\n",in0,crc,argp,omd); +// fprintf(rephemfile," %- 20.12E%- 20.12E%- 20.12E%- 20.12E\n",idot,(double)codeOnL2,(double)toewk,(double)L2PData); +// fprintf(rephemfile," %- 20.12E%- 20.12E%- 20.12E%- 20.12E\n",zeros,(double)health,tgd,iodc); +// fprintf(rephemfile," %- 20.12E%- 20.12E%- 20.12E%- 20.12E\n",tofXmission,zeros,zeros,zeros); + } +} gse/src/gui_serial.cpp @@ -166,6 +166,9 @@ void GUI_Toplevel::onLogConfig(wxCommandEvent& WXUNUSED(event)) log.cTask->SetValue(pSerial->getLog(TASK_HEALTH_M_ID)); log.cBoard->SetValue(pSerial->getLog(BOARD_HEALTH_M_ID)); log.cSVPred->SetValue(pSerial->getLog(SV_PREDICTION_M_ID)); + log.cGearth->SetValue(pSerial->getLog(LAST_M_ID)); + log.cRobs->SetValue(pSerial->getLog(LAST_M_ID + 1)); + log.cRephem->SetValue(pSerial->getLog(LAST_M_ID + 2)); if(log.ShowModal() == wxID_OK) { @@ -183,6 +186,9 @@ void GUI_Toplevel::onLogConfig(wxCommandEvent& WXUNUSED(event)) pSerial->logOn(TASK_HEALTH_M_ID, log.cTask->IsChecked()); pSerial->logOn(BOARD_HEALTH_M_ID, log.cBoard->IsChecked()); pSerial->logOn(SV_PREDICTION_M_ID, log.cSVPred->IsChecked()); + pSerial->logOn(LAST_M_ID, log.cGearth->IsChecked()); + pSerial->logOn(LAST_M_ID + 1, log.cRobs->IsChecked()); + pSerial->logOn(LAST_M_ID + 2, log.cRephem->IsChecked()); /* Get Filename */ log_filename = log.mFile->GetPath(); gse/src/gui_toplevel.cpp @@ -33,7 +33,7 @@ /* Software Version */ /*----------------------------------------------------------------------------------------------*/ #define SOFTWARE_VERSION_MAJOR (2) -#define SOFTWARE_VERSION_MINOR (5) +#define SOFTWARE_VERSION_MINOR (6) #define SOFTWARE_VERSION_POSTFIX (0) /*----------------------------------------------------------------------------------------------*/ @@ -42,7 +42,7 @@ #define MAX_CHANNELS (12) //!< Number of channel objects #define CPU_CORES (2) //!< 1 for a single core, 2 for a dual core system, etc #define CORR_PER_CPU (MAX_CHANNELS/CPU_CORES) //!< Distribute them up evenly (this should be an INTEGER!) -#define MAX_ANTENNAS (1) //!< The number of antennas +#define MAX_ANTENNAS (2) //!< The number of antennas #define TASK_STACK_SIZE (2048) //!< For Nucleus/Linux compatibility /*----------------------------------------------------------------------------------------------*/ @@ -57,12 +57,6 @@ /*----------------------------------------------------------------------------------------------*/ -/* Work on what kind of Data?? */ -/*----------------------------------------------------------------------------------------------*/ -#define USRP_RECORDER (1) //!< Data collected with USRP - /*----------------------------------------------------------------------------------------------*/ - - /* MISC GPS Constants */ /*----------------------------------------------------------------------------------------------*/ #define MAX_SV (32) //!< Number of PRN codes @@ -75,7 +69,6 @@ /*! Config the SV Select */ /*----------------------------------------------------------------------------------------------*/ #define MASK_ANGLE (0) //!< Add this many degrees to altitude dependant mask -#define MAX_ANTENNA (1) //!< 6 ADCs on board #define ACQ_MODULO_WEAK (8) //!< Do this many weak acqs per 32 PRN strong search #define MAX_DOPPLER_ABSOLUTE (15000) //!< Limit any and all Dopplers the be within this range #define MAX_DOPPLER_STRONG (15000) //!< Cold Doppler search space for strong signal @@ -119,7 +112,7 @@ #define CARRIER_AIDING (1) //!< Carrier aid the DLL #define PLL_BN (15) //!< PLL Bandwidth #define FLL_BN (10) //!< FLL Bandwidth -#define AGC_BITS (5) //!< AGC to this bit depth +#define AGC_BITS (6) //!< AGC to this bit depth #define OVERFLOW_LOW (4) //!< Overflow low #define OVERFLOW_HIGH (64) //!< Overflow high /*----------------------------------------------------------------------------------------------*/ @@ -144,9 +137,11 @@ enum TASK_IDS }; /*----------------------------------------------------------------------------------------------*/ + /* Account for GPS rollover here */ /*----------------------------------------------------------------------------------------------*/ #define CURRENT_GPS_WEEK_ROLLOVER (1) //!< The number of GPS week rollovers /*----------------------------------------------------------------------------------------------*/ + #endif includes/config.h @@ -73,6 +73,7 @@ typedef struct _Options_S int32 decimate; int32 realtime; int32 tlm_type; //!< Telemetry type (named pipe/serial) + int32 source; //!< GPS data source type double f_lo_a; //!< LO freq for board A double f_ddc_a; //!< DDC freq for board A double f_lo_b; //!< LO freq for board B includes/sdr_structs.h @@ -30,40 +30,18 @@ /* Data from the Universal Software Radio Peripheral */ /*----------------------------------------------------------------------------------------------*/ -#if USRP_RECORDER - - #define IF_SAMPLE_FREQUENCY (2048000) //!< How many CPX samples in a second - #define IF_FREQUENCY (160000) //!< IF frequency - #define ZERO_DOPPLER_RATE (IF_FREQUENCY) //!< IF frequency - #define NCO_CARR_INCR_NOM (0x14000000) //!< 160000 Hz - #define NCO_CODE_INCR_NOM (0x3FF00000) //!< = 1.023e6 Mcps, 1 chips/s = 1049 in terms of the code NCO - #define F_SAMPLE_NOM (64e6) - #define SAMPS_PER_READ (4096) - #define BYTES_PER_READ (SAMPS_PER_READ*4) - #define HZ_2_NCO_CARR_INCR (2.097152000000000e+03) - #define NCO_CARR_INCR_2_HZ (4.768371582031250e-04) - #define HZ_2_NCO_CODE_INCR (1.048576000000000e+03) - #define NCO_CODE_INCR_2_HZ (9.536743164062500e-04) - -#endif -/*----------------------------------------------------------------------------------------------*/ - -/* Data from the GN3S Recorder -/*----------------------------------------------------------------------------------------------*/ -#if GN3S_RECORDER - - #define IF_SAMPLE_FREQUENCY (2048000) //!< How many CPX samples in a second - #define IF_FREQUENCY (0) //!< IF frequency - #define ZERO_DOPPLER_RATE (IF_FREQUENCY) //!< IF frequency - #define NCO_CARR_INCR_NOM (0x0) //!< 0 Hz - #define NCO_CODE_INCR_NOM (0x3FF00000) //!< = 1.023e6 Mcps, 1 chips/s = 1049 in terms of the code NCO - #define IF_SAMPS_MS (2048) //!< Samples per millisecond - #define HZ_2_NCO_CARR_INCR (2.097152000000000e+03) - #define NCO_CARR_INCR_2_HZ (4.768371582031250e-04) - #define HZ_2_NCO_CODE_INCR (1.048576000000000e+03) - #define NCO_CODE_INCR_2_HZ (9.536743164062500e-04) - -#endif +#define IF_SAMPLE_FREQUENCY (2048000) //!< How many CPX samples in a second +#define IF_FREQUENCY (38400) //!< IF frequency +#define ZERO_DOPPLER_RATE (IF_FREQUENCY) //!< IF frequency +#define NCO_CARR_INCR_NOM (0x04CCCCCC) //!< 38400 Hz +#define NCO_CODE_INCR_NOM (0x3FF00000) //!< = 1.023e6 Mcps, 1 chips/s = 1049 in terms of the code NCO +#define F_SAMPLE_NOM (64e6) //!< Nominal USRP sample rate +#define SAMPS_PER_READ (4096) //!< Nominal samples per read +#define BYTES_PER_READ (4*SAMPS_PER_READ) //!< Read this many bytes +#define HZ_2_NCO_CARR_INCR (2.097152000000000e+03) //!< Convert from Hz to carrier NCO units +#define NCO_CARR_INCR_2_HZ (4.768371582031250e-04) //!< Convert from carrier NCO to Hz +#define HZ_2_NCO_CODE_INCR (1.048576000000000e+03) //!< Convert from Hz to code NCO units +#define NCO_CODE_INCR_2_HZ (9.536743164062500e-04) //!< Convert from code NCO to Hz /*----------------------------------------------------------------------------------------------*/ #endif includes/signaldef.h @@ -38,7 +38,7 @@ #include "telemetry.h" //!< Serial/GUI telemetry #include "commando.h" //!< Command interface #include "sv_select.h" //!< Drives acquisition/reacquisition process -#include "gps_source.h" +#include "gps_source.h" //!< Get GPS IF data from where? /*----------------------------------------------------------------------------------------------*/ @@ -47,16 +47,18 @@ void usage(char *_str) { fprintf(stdout,"\n"); - fprintf(stdout,"usage: [-c] [-v] [-gr] [-gi] [-d] [-l] [-w] [-x] [-s]\n"); + //fprintf(stdout,"usage: [-c] [-v] [-gr] [-gi] [-d] [-l] [-w] [-x] [-s]\n"); + fprintf(stdout,"usage: [-c] [-v] [-gr] [-gi] [-w] [-x] [-s]\n"); fprintf(stdout,"[-c] log high rate channel data\n"); fprintf(stdout,"[-v] be verbose \n"); fprintf(stdout,"[-gr] <gain> set rf gain in dB (DBSRX only)\n"); fprintf(stdout,"[-gi] <gain> set if gain in dB (DBSRX only)\n"); - fprintf(stdout,"[-d] operate in two antenna mode, A & B as L1\n"); - fprintf(stdout,"[-l] operate in L1-L2 mode, A as L1, B as L2\n"); +// fprintf(stdout,"[-d] operate in two antenna mode, A & B as L1\n"); +// fprintf(stdout,"[-l] operate in L1-L2 mode, A as L1, B as L2\n"); fprintf(stdout,"[-w] <bandwidth> bandwidth of lowpass filter\n"); fprintf(stdout,"[-x] the USRP samples at a modified 65.536 MHz (default is 64 MHz)\n"); fprintf(stdout,"[-s] output over /dev/ttyS0 instead of the named pipe\n"); + fprintf(stdout,"[-gn3s] use the SIGE GN3S sampling device\n"); fflush(stdout); exit(1); } @@ -75,13 +77,16 @@ void echo_options() fprintf(stdout,"Verbose: %13d\n",gopt.verbose); fprintf(stdout,"Log channel: %13d\n",gopt.log_channel); fprintf(stdout,"Telemetry: %13d\n",gopt.tlm_type); - fprintf(stdout,"USRP Decimation: %13d\n",gopt.decimate); - fprintf(stdout,"USRP Sample Rate: %13.2f\n",gopt.f_sample); - fprintf(stdout,"DBSRX LO A: %13.2f\n",gopt.f_lo_a); - fprintf(stdout,"DBSRX LO B: %13.2f\n",gopt.f_lo_b); - fprintf(stdout,"RF Gain: %13.2f\n",gopt.gr); - fprintf(stdout,"IF Gain: %13.2f\n",gopt.gi); - fprintf(stdout,"DBSRX Bandwidth: %13.2f\n",gopt.bandwidth); + if(gopt.source != SOURCE_SIGE_GN3S) + { + fprintf(stdout,"USRP Decimation: %13d\n",gopt.decimate); + fprintf(stdout,"USRP Sample Rate: %13.2f\n",gopt.f_sample); + fprintf(stdout,"DBSRX LO A: %13.2f\n",gopt.f_lo_a); + fprintf(stdout,"DBSRX LO B: %13.2f\n",gopt.f_lo_b); + fprintf(stdout,"RF Gain: %13.2f\n",gopt.gr); + fprintf(stdout,"IF Gain: %13.2f\n",gopt.gi); + fprintf(stdout,"DBSRX Bandwidth: %13.2f\n",gopt.bandwidth); + } fprintf(stdout,"\n"); fflush(stdout); } @@ -113,10 +118,11 @@ void Parse_Arguments(int32 argc, char* argv[]) gopt.bandwidth = 6.0e6; //!< DBS-RX is set to 10 MHz wide gopt.f_sample = 64.0e6; //!< Nominal sample rate gopt.realtime = 1; + gopt.source = SOURCE_USRP_V1; for(lcv = 1; lcv < argc; lcv++) { - switch (argv[lcv][1]) + switch(argv[lcv][1]) { case 'c': @@ -148,16 +154,20 @@ void Parse_Arguments(int32 argc, char* argv[]) usage (argv[0]); break; } + else if(strcmp(argv[lcv], "-gn3s") == 0) + { + gopt.source = SOURCE_SIGE_GN3S; + } else usage(argv[0]); break; - case 'd': - gopt.mode = 1; - break; - case 'l': - gopt.mode = 2; - gopt.f_lo_b = L2; /* L2C center frequency */ - break; +// case 'd': +// gopt.mode = 1; +// break; +// case 'l': +// gopt.mode = 2; +// gopt.f_lo_b = L2; /* L2C center frequency */ +// break; case 'w': if(++lcv >= argc) usage (argv[0]); @@ -280,12 +290,12 @@ int32 Object_Init(void) for(lcv = 0; lcv < MAX_CHANNELS; lcv++) pChannels[lcv] = new Channel(lcv); - /* Draw the GPS data from somewhere */ - pSource = new GPS_Source(&gopt); - /* Get data from either the USRP or disk */ pFIFO = new FIFO; + /* Draw the GPS data from somewhere */ + pSource = new GPS_Source(&gopt); + pCorrelator = new Correlator(); if(gopt.verbose) main/init.cpp @@ -1,25 +1,17 @@ -clear; clc; close all; +clear; clc; close all; pause(1) [data] = get_channel('channel.log'); figure +pause(1) hold all; grid on; for(lcv = 1:32) plot(data(lcv).tic,data(lcv).cn0,'.','MarkerSize',1); end figure +pause(1) hold all; grid on; for(lcv = 1:32) plot(data(lcv).tic,data(lcv).sv,'o'); end - -figure -hold all; grid on; -for(lcv = 1:32) - plot(data(lcv).code_nco-1.023e6,'.','MarkerSize',1); -end - -for(lcv = 1:32) - plot((data(lcv).carrier_nco-160000)*(1.023e6/1.57542e9),'k'); -end \ No newline at end of file matlab/plot_channel.m @@ -19,4 +19,4 @@ axis([1 length(data.p) -1e8 1e8]) subplot(313) plot(data.v) hold on; grid on; -axis([1 length(data.p) -1e4 1e4]) \ No newline at end of file +axis([1 length(data.p) -1e4 1e4]) matlab/plot_pvt.m @@ -437,19 +437,35 @@ void Channel::PLL() float dp; float dot; float cross; + int32 I1, I2, Q1, Q2, lcv; df = dp = 0; - /* FLL discriminator */ - dot = I[1]*I_prev + Q[1]*Q_prev; - cross = -I[1]*Q_prev + Q[1]*I_prev; + if(len != 1) + { + for(lcv = 0; lcv < 10; lcv++) + { + I2 += I_buff[lcv]; + Q2 += Q_buff[lcv]; + } + + for(lcv; lcv < 20; lcv++) + { + I1 += I_buff[lcv]; + Q1 += Q_buff[lcv]; + } + + /* FLL discriminator */ + dot = I2*I1 + Q2*Q1; + cross = -I2*Q1 + Q2*I1; - /* No FLL for now */ -// if((dot != 0.0) && (cross != 0.0)) -// { -// df = atan(dot/cross); -// df /= (aPLL.t * 360); -// } + /* No FLL for now */ + if((dot != 0.0) && (cross != 0.0)) + { + df = atan2(cross, dot); + df /= TWO_PI; + } + } /* PLL discriminator */ if(I[1] != 0) @@ -881,7 +897,7 @@ void Channel::PLL_W(float _bwpll) { aPLL.PLLBW = _bwpll; - aPLL.FLLBW = 50.0; + aPLL.FLLBW = 4.0; aPLL.b3 = 2.40; aPLL.a3 = 1.10; @@ -937,23 +953,23 @@ void Channel::Error() /* Adjust integration length based on cn0 */ if(bit_lock) { - if((mcn0 > 39.0) && (len != 1)) - { - len = 1; - PLL_W(30.0); - } +// if((mcn0 > 39.0) && (len != 1)) +// { +// len = 1; +// PLL_W(18.0); +// } - if((mcn0 < 37.0) && (len != 10)) - { - len = 10; - PLL_W(25.0); - } - - if((mcn0 < 30.0) && (len != 20)) +// if((mcn0 < 37.0) && (len != 20)) { len = 20; - PLL_W(20.0); + PLL_W(18.0); } + +// if((mcn0 < 30.0) && (len != 20)) +// { +// len = 20; +// PLL_W(20.0); +// } } } objects/channel.cpp @@ -58,14 +58,6 @@ void FIFO::Start() /*----------------------------------------------------------------------------------------------*/ -void FIFO::SetScale(int32 _agc_scale) -{ - agc_scale = _agc_scale; -} -/*----------------------------------------------------------------------------------------------*/ - - -/*----------------------------------------------------------------------------------------------*/ FIFO::FIFO():Threaded_Object("FIFTASK") { int32 lcv; @@ -82,9 +74,7 @@ FIFO::FIFO():Threaded_Object("FIFTASK") buff[FIFO_DEPTH-1].next = &buff[0]; - tic = overflw = soverflw = count = 0; - - agc_scale = 1; + tic = count = 0; sem_init(&sem_full, NULL, 0); sem_init(&sem_empty, NULL, FIFO_DEPTH); @@ -122,28 +112,6 @@ void FIFO::Import() /* Read from the GPS source */ pSource->Read(head); - /* Add to the buff */ - soverflw += run_agc(&head->data[0], SAMPS_MS, AGC_BITS, agc_scale); - - /* Figure out the agc_scale value */ - if((count & 0xF) == 0) - { - if(soverflw > OVERFLOW_HIGH*8) - agc_scale += 100; - - if(soverflw > OVERFLOW_HIGH) - agc_scale += 1; - - if(soverflw < OVERFLOW_LOW) - agc_scale -= 1; - - if(agc_scale < 1) - agc_scale = 1; - - overflw = soverflw; - soverflw = 0; - } - Enqueue(); IncStopTic(); objects/fifo.cpp @@ -29,7 +29,6 @@ #define FIFO_H_ #include "includes.h" -#include "telemetry.h" #include "gps_source.h" #define FIFO_DEPTH (2500) //!< In ms @@ -40,8 +39,6 @@ class FIFO : public Threaded_Object { - friend class Telemetry; - private: sem_t sem_full; @@ -52,9 +49,6 @@ class FIFO : public Threaded_Object ms_packet *tail; //!< Pointer to the tail int32 count; //!< Count the number of packets received - int32 agc_scale; //!< To do the AGC - int32 overflw; //!< Overflow counter - int32 soverflw; //!< Overflow counter int32 tic; //!< Master receiver tic public: @@ -68,7 +62,6 @@ class FIFO : public Threaded_Object void Open(); void Enqueue(); void Dequeue(ms_packet *p); - void SetScale(int32 _agc_scale); }; objects/fifo.h @@ -25,26 +25,131 @@ */ /*----------------------------------------------------------------------------------------------*/ + #include "gps_source.h" + +/*----------------------------------------------------------------------------------------------*/ GPS_Source::GPS_Source(Options_S *_opt) { memcpy(&opt, _opt, sizeof(Options_S)); - Open_USRP_V1(); - if(gopt.verbose) + switch(opt.source) + { + case SOURCE_USRP_V1: + source_type = SOURCE_USRP_V1; + Open_USRP_V1(); + break; + case SOURCE_USRP_V2: +// source_type = SOURCE_USRP_V2; +// Open_USRP_V2(); + break; + case SOURCE_SIGE_GN3S : + source_type = SOURCE_SIGE_GN3S; + Open_GN3S(); + break; + default: + source_type = SOURCE_USRP_V1; + Open_USRP_V1(); + break; + } + + overflw = soverflw = 0; + agc_scale = 1; + + /* Assign to base */ + buff_out_p = &buff_out[0]; + ms_count = 0; + + if(opt.verbose) fprintf(stdout,"Creating GPS Source\n"); + } +/*----------------------------------------------------------------------------------------------*/ + +/*----------------------------------------------------------------------------------------------*/ GPS_Source::~GPS_Source() { - Close_USRP_V1(); - if(gopt.verbose) + switch(source_type) + { + case SOURCE_USRP_V1: + Close_USRP_V1(); + break; + case SOURCE_USRP_V2: +// Close_SOURCE_USRP_V2(); + break; + case SOURCE_SIGE_GN3S : + Close_GN3S(); + break; + default: + Close_USRP_V1(); + break; + } + + if(opt.verbose) fprintf(stdout,"Destructing GPS Source\n"); } +/*----------------------------------------------------------------------------------------------*/ + + +/*----------------------------------------------------------------------------------------------*/ +void GPS_Source::Read(ms_packet *_p) +{ + double gain; + + switch(source_type) + { + case SOURCE_USRP_V1: + Read_USRP_V1(_p); + break; + case SOURCE_USRP_V2: +// Read_SOURCE_USRP_V2(_p); + break; + case SOURCE_SIGE_GN3S: + Read_GN3S(_p); + break; + default: + Read_USRP_V1(_p); + break; + } + + /* Dont need to AGC the SOURCE_SIGE_GN3S */ + if(source_type != SOURCE_SIGE_GN3S) + { + /* Add to the buff */ + soverflw += run_agc(&_p->data[0], SAMPS_MS, AGC_BITS, 1); + + /* Figure out the agc_scale value */ + if((ms_count & 0xF) == 0) + { + gain = dbs_rx_a->rf_gain(); + + if(soverflw > OVERFLOW_HIGH) + gain -= 0.5; + + if(soverflw < OVERFLOW_LOW) + gain += 0.5; + + dbs_rx_a->rf_gain(gain); + + overflw = soverflw; + soverflw = 0; + + agc_scale = (int32)floor(2.0*(dbs_rx_a->max_rf_gain() - gain)); + } + } + + ms_count++; + +} +/*----------------------------------------------------------------------------------------------*/ + + +/*----------------------------------------------------------------------------------------------*/ void GPS_Source::Open_USRP_V1() { @@ -202,8 +307,33 @@ void GPS_Source::Open_USRP_V1() urx->start(); } +/*----------------------------------------------------------------------------------------------*/ + +/*----------------------------------------------------------------------------------------------*/ +void GPS_Source::Open_GN3S() +{ + + int32 lcv; + const double mul = 8.1838e6/2.048e6; + /* Create the object */ + gn3s_a = new gn3s(0); + + /* Create decimation lookup table */ + for(lcv = 0; lcv < 10240; lcv++) + { + gdec[lcv] = (int32)floor((double)lcv * mul); + } + + /* Everything is super! */ + fprintf(stdout,"GN3S Start\n"); + +} +/*----------------------------------------------------------------------------------------------*/ + + +/*----------------------------------------------------------------------------------------------*/ void GPS_Source::Close_USRP_V1() { @@ -222,8 +352,25 @@ void GPS_Source::Close_USRP_V1() fprintf(stdout,"Destructing USRP\n"); } +/*----------------------------------------------------------------------------------------------*/ -void GPS_Source::Read(ms_packet *_p) + +/*----------------------------------------------------------------------------------------------*/ +void GPS_Source::Close_GN3S() +{ + + if(gn3s_a != NULL) + delete gn3s_a; + + if(opt.verbose) + fprintf(stdout,"Destructing GN3S\n"); + +} +/*----------------------------------------------------------------------------------------------*/ + + +/*----------------------------------------------------------------------------------------------*/ +void GPS_Source::Read_USRP_V1(ms_packet *_p) { bool overrun; @@ -238,8 +385,8 @@ void GPS_Source::Read(ms_packet *_p) Resample_USRP_V1(buff, buff_out); memcpy(_p->data, buff_out, SAMPS_MS*sizeof(CPX)); leftover -= 4000; - memcpy(db_a, &buff[4000], leftover*sizeof(int32)); - memcpy(buff, db_a, leftover*sizeof(int32)); + memcpy(dbuff, &buff[4000], leftover*sizeof(int32)); + memcpy(buff, dbuff, leftover*sizeof(int32)); return; } break; @@ -251,8 +398,8 @@ void GPS_Source::Read(ms_packet *_p) Resample_USRP_V1(buff, buff_out); memcpy(_p->data, buff_out, SAMPS_MS*sizeof(CPX)); leftover -= 8000; - memcpy(db_a, &buff[8000], leftover*sizeof(int32)); - memcpy(buff, db_a, leftover*sizeof(int32)); + memcpy(dbuff, &buff[8000], leftover*sizeof(int32)); + memcpy(buff, dbuff, leftover*sizeof(int32)); return; } break; @@ -272,7 +419,6 @@ void GPS_Source::Read(ms_packet *_p) // fflush(stdout); // } - /* Now we have SAMPS_PER_READ samps, 4 possible things to do depending on the state: * 0) mode == 0 && f_sample == 65.536e6: This mode is the easiest, 1 ms of data per FIFO node, * hence just call resample() and stuff in the pipe @@ -304,8 +450,8 @@ void GPS_Source::Read(ms_packet *_p) memcpy(_p->data, buff_out, SAMPS_MS*sizeof(CPX)); /* Move excess bytes at end of buffer down to the base */ - memcpy(db_a, &buff[4000], leftover*sizeof(int32)); - memcpy(buff, db_a, leftover*sizeof(int32)); + memcpy(dbuff, &buff[4000], leftover*sizeof(int32)); + memcpy(buff, dbuff, leftover*sizeof(int32)); break; case 3: @@ -315,8 +461,8 @@ void GPS_Source::Read(ms_packet *_p) memcpy(_p->data, buff_out, SAMPS_MS*sizeof(CPX)); /* Move excess bytes at end of buffer down to the base */ - memcpy(db_a, &buff[8000], leftover*sizeof(int32)); - memcpy(buff, db_a, leftover*sizeof(int32)); + memcpy(dbuff, &buff[8000], leftover*sizeof(int32)); + memcpy(buff, dbuff, leftover*sizeof(int32)); break; default: @@ -328,6 +474,65 @@ void GPS_Source::Read(ms_packet *_p) /*----------------------------------------------------------------------------------------------*/ +void GPS_Source::Read_GN3S(ms_packet *_p) +{ + + int bread; + bool overrun; + int32 ms_mod5; + int32 lcv; + int16 LUT[4] = {1, -1, 1, -1}; + int16 *pbuff; + + ms_mod5 = ms_count % 5; + + if(ms_count == 0) + { + /* Start transfer */ + gn3s_a->usrp_xfer(VRQ_XFER, 1); + } + + /* Do the GN3S reading */ + if(ms_mod5 == 0) + { + pbuff = (int16 *)&buff[7]; + + /* Read 5 ms */ + bread = gn3s_a->read((void *)&gbuff[0], 40919*2); + + /* Convert to +-1 */ + for(lcv = 0; lcv < 40919*2; lcv++) + pbuff[lcv] = LUT[gbuff[lcv] & 0x3]; + + /* Filter & decimate the data to regain bit precision */ + Resample_GN3S(&buff[0], &buff_out[0]); + + /* Move last 7 elements to the bottom */ + memcpy(&buff[0], &buff[40919], 7*sizeof(CPX)); + + /* Check the overrun */ + overrun = gn3s_a->check_rx_overrun(); + if(overrun && opt.verbose) + { + time(&rawtime); + timeinfo = localtime (&rawtime); + fprintf(stdout, "GN3S overflow at time %s\n", asctime(timeinfo)); + fflush(stdout); + } + + } + + /* Move pointer */ + buff_out_p = &buff_out[SAMPS_MS*ms_mod5]; + + /* Copy to destination */ + memcpy(_p->data, buff_out_p, SAMPS_MS*sizeof(CPX)); + +} +/*----------------------------------------------------------------------------------------------*/ + + +/*----------------------------------------------------------------------------------------------*/ void GPS_Source::Resample_USRP_V1(CPX *_in, CPX *_out) { @@ -375,3 +580,55 @@ void GPS_Source::Resample_USRP_V1(CPX *_in, CPX *_out) } } +/*----------------------------------------------------------------------------------------------*/ + + +/*----------------------------------------------------------------------------------------------*/ +void GPS_Source::Resample_GN3S(CPX *_in, CPX *_out) +{ + /* Runs specified filter on incoming signal. */ + //static short filter[7] = {3,4,5,6,5,4,3}; Mike's Filter + //static short filter[7] = {-3,10,27,34,27,10,-3}; Greg's Filter + int32 lcv, ind; + + /* Process the array */ + for(lcv = 0; lcv < 10240; lcv++) + { + ind = gdec[lcv]; + +// _out[lcv].i = _in[ind + 6].i * -3 + +// _in[ind + 5].i * 10 + +// _in[ind + 4].i * 27 + +// _in[ind + 3].i * 34 + +// _in[ind + 2].i * 27 + +// _in[ind + 1].i * 10 + +// _in[ind + 0].i * -3; +// +// _out[lcv].q = _in[ind + 6].q * -3 + +// _in[ind + 5].q * 10 + +// _in[ind + 4].q * 27 + +// _in[ind + 3].q * 34 + +// _in[ind + 2].q * 27 + +// _in[ind + 1].q * 10 + +// _in[ind + 0].q * -3; + + _out[lcv].i = _in[ind + 6].i * 4 + + _in[ind + 5].i * 5 + + _in[ind + 4].i * 6 + + _in[ind + 3].i * 7 + + _in[ind + 2].i * 6 + + _in[ind + 1].i * 5 + + _in[ind + 0].i * 4; + + _out[lcv].q = _in[ind + 6].q * 4 + + _in[ind + 5].q * 5 + + _in[ind + 4].q * 6 + + _in[ind + 3].q * 7 + + _in[ind + 2].q * 6 + + _in[ind + 1].q * 5 + + _in[ind + 0].q * 4; + } + + return; +} +/*----------------------------------------------------------------------------------------------*/ objects/gps_source.cpp @@ -30,30 +30,53 @@ #include "includes.h" #include "db_dbs_rx.h" +#include "gn3s.h" enum GPS_SOURCE_TYPE { - USRP_V1, - USRP_V2, - SIGE_GN3S + SOURCE_USRP_V1, + SOURCE_USRP_V2, + SOURCE_SIGE_GN3S, + SOURCE_DISK_FILE, }; +/*! \ingroup CLASSES + * + */ class GPS_Source { private: - /* Generic variables */ - int32 source_open; - int32 source_type; - int32 sample_mode; - int32 leftover; - int32 bwrite; - CPX buff[16384]; //!< Base buffer - CPX buff_out[4096]; //!< Output buffer - CPX db_a[16384]; //!< Buffer for double buffering + /* Options */ Options_S opt; //!< Options + /* Generic variables */ +// int32 source_open; //!< Is the source open? + int32 source_type; //!< Source type + int32 sample_mode; //!< Sample mode + int32 leftover; //!< Leftover bytes for USRP double buffering + int32 bwrite; //!< Bytes somthing something? + int32 ms_count; //!< Count the numbers of ms processed + + /* Tag overflows */ + time_t rawtime; + struct tm * timeinfo; + + /* AGC Values */ + int32 agc_scale; //!< To do the AGC + int32 overflw; //!< Overflow counter + int32 soverflw; //!< Overflow counter + + /* Data buffers */ + int8 gbuff[40919*2]; //!< Byte buffer for GN3S + CPX buff[40926]; //!< Base buffer for GN3S/USRP + CPX buff_out[10240]; //!< Output buffer @ 2.048 Msps + CPX *buff_out_p; //!< Pointer to a spot in buff_out + CPX dbuff[16384]; //!< Buffer for double buffering + MIX gn3s_mix[10240]; //!< Mix GN3S to the same IF frequency + int32 gdec[10240]; //!< Index array to filter & resample GN3S data to 2.048 Msps + /* USRP V1 Handles */ usrp_standard_rx *urx; db_dbs_rx *dbs_rx_a; @@ -61,17 +84,16 @@ class GPS_Source /* USRP V2 Handles */ - /* SIGE_GN3S Handles */ + /* SOURCE_SIGE_GN3S Handles */ + gn3s *gn3s_a; + gn3s *gn3s_b; /* File handles */ - + FILE *fp_a; + FILE *fp_b; private: - void Read_USRP_V1(); //!< Read from the USRP Version 1 - void Read_USRP_V2(); //!< Read from the USRP Version 2 - void Read_GN3S(); //!< Read from the SparkFun GN3S Sampler - void Read_File(); //!< Read from a file void Open_USRP_V1(); //!< Open the USRP Version 1 void Open_USRP_V2(); //!< Open the USRP Version 2 void Open_GN3S(); //!< Open the SparkFun GN3S Sampler @@ -80,12 +102,20 @@ class GPS_Source void Close_USRP_V2(); //!< Close the USRP Version 2 void Close_GN3S(); //!< Close the SparkFun GN3S Sampler void Close_File(); //!< Close the file + void Read_USRP_V1(ms_packet *_p);//!< Read from the USRP Version 1 + void Read_USRP_V2(ms_packet *_p);//!< Read from the USRP Version 2 + void Read_GN3S(ms_packet *_p); //!< Read from the SparkFun GN3S Sampler + void Read_File(ms_packet *_p); //!< Read from a file void Resample_USRP_V1(CPX *_in, CPX *_out); + void Resample_GN3S(CPX *_in, CPX *_out); public: - GPS_Source(Options_S *_opt); //!< Create the GPS source with the proper hardware type - ~GPS_Source(); //!< Kill the object - void Read(ms_packet *_p); //!< Read in a single ms of data + + GPS_Source(Options_S *_opt); //!< Create the GPS source with the proper hardware type + ~GPS_Source(); //!< Kill the object + void Read(ms_packet *_p); //!< Read in a single ms of data + int32 getScale(){return(agc_scale);} + int32 getOvrflw(){return(overflw);} }; objects/gps_source.h @@ -494,7 +494,7 @@ void PVT::ClockInit() master_clock.bias = 0; master_clock.time = master_clock.time0; master_clock.time_raw = master_clock.time0; - master_clock.week = ephemerides[lcv].week_number; + master_clock.week = ephemerides[lcv].week_number + CURRENT_GPS_WEEK_ROLLOVER * 1024; master_clock.state = PVT_CLOCK_NOMINAL; break; } objects/pvt.cpp @@ -76,14 +76,17 @@ Telemetry::Telemetry():Threaded_Object("TLMTASK") signal(SIGPIPE, lost_gui_pipe); remove("/tmp/GPS2GUI"); - fifo[WRITE] = mkfifo("/tmp/GPS2GUI", S_IRWXG | S_IRWXU | S_IRWXO); + fifo[WRITE] = mkfifo("/tmp/GPS2GUI", S_IRWXU|S_IRWXG|S_IRWXO|S_IROTH|S_IWOTH); if(fifo[WRITE] == -1) fprintf(stderr,"Error creating the named pipe /tmp/GPS2GUI\n"); + chmod("/tmp/GPS2GUI", S_IRWXU|S_IRWXG|S_IRWXO|S_IROTH|S_IWOTH); + remove("/tmp/GUI2GPS"); - fifo[READ] = mkfifo("/tmp/GUI2GPS", S_IRWXG | S_IRWXU | S_IRWXO); + fifo[READ] = mkfifo("/tmp/GUI2GPS", S_IRWXU|S_IRWXG|S_IRWXO|S_IROTH|S_IWOTH); if(fifo[READ] == -1) fprintf(stderr,"Error creating the named pipe /tmp/GUI2GPS\n"); + chmod("/tmp/GUI2GPS", S_IRWXU|S_IRWXG|S_IRWXO|S_IROTH|S_IWOTH); /* Build the function pointer array */ msg_handlers[FIRST_M_ID] = NULL; @@ -534,13 +537,13 @@ void Telemetry::SendBoardHealth() board_health->fft_version = 0; /* DSA Values */ - board_health->dsa0 = pFIFO->agc_scale; + board_health->dsa0 = pSource->getScale(); board_health->dsa1 = 0; board_health->dsa2 = 0; board_health->dsa3 = 0; /* Overflow on A/Ds */ - board_health->ovrflw0 = pFIFO->overflw; + board_health->ovrflw0 = pSource->getOvrflw(); board_health->ovrflw1 = 0; board_health->ovrflw2 = 0; board_health->ovrflw3 = 0; objects/telemetry.cpp @@ -47,6 +47,7 @@ enum Telemetry_Type #include "pvt.h" //!< Least squares PVT solution //#include "pps.h" //!< Control the PPS #include "channel.h" //!< Tracking loops +#include "gps_source.h" //!< Get GPS data from where /*! @ingroup CLASSES @brief The Telemetry services the RS422 port. objects/telemetry.h @@ -20,8 +20,8 @@ $(EXE): $(EXE).o $(OBJS) mv $(EXE) ../$(EXE) %.o:%.cpp - $(CC) $(CFLAGS) -c $< -o $@ - + $(CC) $(CFLAGS) -c $< -o $@ + clean: @rm -rvf *.dis @rm -rvf *.o usrp/Makefile @@ -44,8 +44,8 @@ typedef struct _options #define BYTES_PER_READ (SAMPS_PER_READ*4) #define READ (0) #define WRITE (1) -#define F_L1 (1.57542e9 - 160000) -#define F_L2 (1.2276e9 - 160000) +#define F_L1 (1.57542e9 - 38400) +#define F_L2 (1.2276e9 - 38400) #define FIFO_SIZE (4000) //!< 2 seconds deep? /*----------------------------------------------------------------------------------------------*/ usrp/gps-usrp.cpp 6153c01317f34a26b2fb41926505b9d97f764e90 gpssim gpssim@gpsdevc.(none) http://github.com/gps-sdr/gps-sdr/commit/42f84616d0c3cb54dbd1aa0d11680bc1c58bc390 42f84616d0c3cb54dbd1aa0d11680bc1c58bc390 2009-07-23T17:30:04-07:00 2009-07-23T17:30:04-07:00 GN3S now incorporated into the receiver. Use -gn3s flag to invoke. Must use the ./install_gn3s.sh script in /usrp to modify udev. Updated GUI a little bit. GUI will now log a .klm file and a Rinex observation file. Also changed USRP code to use the variable gain in the BDS-RX for automatic gain contol. 7f726c9e78f5f90253128690b83ebb60fbea6096 gpssim gpssim@gpsdevc.(none)