diff --git a/app/rtknavi/naviopt.dfm b/app/rtknavi/naviopt.dfm index a493c73cb9dd83daa27a00d3c1c3d6f086f894cf..65eaefc3189a80baf73f1a899fe386766da6b61e 100644 --- a/app/rtknavi/naviopt.dfm +++ b/app/rtknavi/naviopt.dfm @@ -62,8 +62,6 @@ object OptDialog: TOptDialog TabOrder = 4 object TabSheet1: TTabSheet Caption = 'Setting&1' - ExplicitLeft = 8 - ExplicitTop = 22 object Label3: TLabel Left = 24 Top = 137 @@ -214,14 +212,13 @@ object OptDialog: TOptDialog Width = 152 Height = 21 Style = csDropDownList - ItemIndex = 1 TabOrder = 1 - Text = 'L1+L2' OnChange = FreqChange Items.Strings = ( 'L1' 'L1+L2' - 'L1+L2+L5') + 'L1+L2+L5' + 'L1+L2+L5+L6') end object SatEphem: TComboBox Left = 248 diff --git a/app/rtkpost/postopt.dfm b/app/rtkpost/postopt.dfm index 337bd989badbc5f691cd9b1d8efdc7ad1099d843..70806f3eabb8fc929e4501a0f78b72ba7aea316d 100644 --- a/app/rtkpost/postopt.dfm +++ b/app/rtkpost/postopt.dfm @@ -105,8 +105,6 @@ object OptDialog: TOptDialog TabOrder = 4 object TabSheet1: TTabSheet Caption = 'Setting&1' - ExplicitLeft = 1 - ExplicitTop = 21 object Label3: TLabel Left = 24 Top = 95 @@ -246,13 +244,15 @@ object OptDialog: TOptDialog Width = 152 Height = 21 Style = csDropDownList + ItemIndex = 1 TabOrder = 1 + Text = 'L1+L2' OnChange = FreqChange Items.Strings = ( 'L1' 'L1+L2' - 'L1+L2+E5b' - 'L1+L2+E5b+L5') + 'L1+L2+L5' + 'L1+L2+L5+L6') end object Solution: TComboBox Left = 248 diff --git a/src/options.c b/src/options.c index 60fc70913da2a54960a8e72ba562233be03f2c4b..1d18d4188e3651924d6fa9659c12e0ddfe054a15 100644 --- a/src/options.c +++ b/src/options.c @@ -40,7 +40,7 @@ static char snrmask_[NFREQ][1024]; /* system options table ------------------------------------------------------*/ #define SWTOPT "0:off,1:on" #define MODOPT "0:single,1:dgps,2:kinematic,3:static,4:static-start,5:movingbase,6:fixed,7:ppp-kine,8:ppp-static,9:ppp-fixed" -#define FRQOPT "1:l1,2:l1+l2,3:l1+l2+l5,4:l1+l2+l5+l6,2:l1+l2+e5b" +#define FRQOPT "1:l1,2:l1+l2,3:l1+l2+l5,4:l1+l2+l5+l6" #define TYPOPT "0:forward,1:backward,2:combined" #define IONOPT "0:off,1:brdc,2:sbas,3:dual-freq,4:est-stec,5:ionex-tec,6:qzs-brdc,7:qzs-lex,8:stec" #define TRPOPT "0:off,1:saas,2:sbas,3:est-ztd,4:est-ztdgrad,5:ztd"