From 4754739c0f8f305df4021fc7f8535792f4317b8c Mon Sep 17 00:00:00 2001 From: DfAC Date: Sun, 18 Sep 2016 02:58:03 -0700 Subject: [PATCH] proofreading --- opensource/ProcessGnssMeasScript.m | 3 +- opensource/README.md | 6 +-- opensource/README.txt | 73 ------------------------------ 3 files changed, 3 insertions(+), 79 deletions(-) delete mode 100644 opensource/README.txt diff --git a/opensource/ProcessGnssMeasScript.m b/opensource/ProcessGnssMeasScript.m index 7928573..d0197c5 100644 --- a/opensource/ProcessGnssMeasScript.m +++ b/opensource/ProcessGnssMeasScript.m @@ -33,7 +33,6 @@ dbstop if error % dbstop in subRoutine at 17 if idx==7 dbstatus -param.llaTrueDegDegM = []; % get display screen file HW_ScrSize = get(0,'ScreenSize');%in pixels %% data @@ -46,7 +45,7 @@ HW_ScrSize = get(0,'ScreenSize');%in pixels %param.llaTrueDegDegM = []; %enter true WGS84 lla, if you know it: %param.llaTrueDegDegM = [37.422578, -122.081678, -28];%Charleston Park Test Site -param.llaTrueDegDegM = [45.5298979 -122.6619045 24.16] %trial +param.llaTrueDegDegM = [45.5298979 -122.6619045 24.16] %trial coords %% Set the data filter and Read log file dataFilter = SetDataFilter; [gnssRaw,gnssAnalysis] = ReadGnssLogger(dirName,prFileName,dataFilter,param); diff --git a/opensource/README.md b/opensource/README.md index a8f56e7..1eec6ea 100644 --- a/opensource/README.md +++ b/opensource/README.md @@ -15,10 +15,8 @@ https://github.com/google/gps-measurement-tools # Initial setup: -1. Extract the contents of the zip file to a directory, for example: - - ~/gpstools/* -2. Open and run ProcessGnssMeasScript.m, when prompted select `Change dir` +1. Extract the contents of the zip file to a directory +2. Open and run ProcessGnssMeasScript.m, when prompted by Matlab select `Change dir` ## To process a log file you collected from GnssLogger: diff --git a/opensource/README.txt b/opensource/README.txt deleted file mode 100644 index adbcdef..0000000 --- a/opensource/README.txt +++ /dev/null @@ -1,73 +0,0 @@ -The GNSS Measurement Tools code is provided for you to: - read data from GnssLogger App, - compute and visualize pseudoranges, - compute weighted least squares position and velocity, - view and analyze carrier phase (if it is present in the log file). - -Initial setup: -1) Extract the contents of the zip file to a directory, for example: - ~/gpstools/* - and include the directory '~/gpstools/opensource' in your matlab path: - addpath('~/gpstools/opensource'); - (Note: the tilde '~' is a place holder, don't actually use it, - fill in the actual complete path) -2) Edit ProcessGnssMeasScript.m to add the demoFiles directory, as follows: - dirName = '~/gpstools/opensource/demoFiles' - (again, replace tilde '~' with actual complete path) -3) Run ProcessGnssMeasScript.m, it will run with pre-recorded log files. - -To process a log file you collected from GnssLogger: -1) save the log file in a directory -2) edit ProcessGpsMeasScript.m, specify the file name and directory path -3) run ProcessGpsMeasScript.m - -The code includes a function (GetNasaHourlyEphemeris.m) to read ephemeris -files from the NASA's archive of Space Geodesy Data, ftp://cddis.gsfc.nasa.gov -It will automatically go to the ftp when you have a new log file. -On some systems you need to use passive mode FTP; if this is required, see -The Mathworks site for how to do it. -Or (simpler): get the appropriate ephemeris file 'by hand' from the Nasa ftp -site (GetNasaHourlyEphemeris.m will tell you the correct url and filename), -copy the file to the directory where your log file is, -and GetNasaHourlyEphemeris.m will read it from there. - -For a summary of the open source GNSS Measurements Tools, -see ~/gpstools/opensource/Contents.m -or type 'help opensource' in matlab command window - --------------------------------------------------------------------------------- -Platform specific notes: - -For Windows: use '\' (backslash), instead of '/' for directories. - -For Mac: when installing MATLAB. -System Preferences --> Security & Privacy --> -Allow Apps to be downloaded from: Mac App Store and identified developers - -Uncompress/Unzip utility called from GetNasaHourlyEphemeris.m: -The ephemeris on the Nasa ftp is Unix-compressed. GetNasaHourlyEphemeris will -automatically uncompress it, if you have the right uncompress function on your -computer. If you need to install an unzip utility, see http://www.gpzip.org -Then search for 'uncompress' in the GetNasaHourlyEphemeris function to find and -edit the name of the unzip utility: - unzipCommand='uncompress';%edit if your platform uses something different -If you uncompress the file 'by hand' and rerun GetNasaHourlyEphemeris.m, it will -read the uncompressed file. - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Copyright 2016 Google Inc. -% -% Licensed under the Apache License, Version 2.0 (the "License"); -% you may not use this file except in compliance with the License. -% You may obtain a copy of the License at -% -%     http://www.apache.org/licenses/LICENSE-2.0 -% -% Unless required by applicable law or agreed to in writing, software -% distributed under the License is distributed on an "AS IS" BASIS, -% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -% See the License for the specific language governing permissions and -% limitations under the License. - -