Merge pull request #126 from leewujung/master

Update OOI notebook and info about EK80 branch
OSOceanAcoustics · Apr 22, 2020 · 78e10a4 · 78e10a4
2 parents 9a5d47f + 94f5f85
commit 78e10a4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/README.rst b/README.rst
@@ -30,9 +30,10 @@ Echopype currently supports file conversion and computation of data produced by:
 - Simrad EK60 echosounder (``.raw`` files)
 - ASL Environmental Sciences AZFP echosounders (``.01A`` files)
 
-In the `ek80 <https://github.com/OSOceanAcoustics/echopype/tree/ek80>`_ development branch
-we are actively developing file conversion and processing routines
-such as pulse compression and calibration for the broadband Simrad EK80 ``.raw`` files.
+Support for ``.raw`` files from the broadband Simrad EK80 echosounder is currently
+in the development branch
+`combine-refactor <https://github.com/OSOceanAcoustics/echopype/tree/convert-refactor>`_
+and we will merge it to the master branch once it's ready for alpha testing.
 
 The file conversion functionality converts data from manufacturer-specific
 binary formats into a standardized netCDF files, based on which all subsequent

diff --git a/docs/source/usage.rst b/docs/source/usage.rst
@@ -46,9 +46,10 @@ Echopype currently supports conversion from
 
 into netCDF (stable) or zarr (beta) files.
 
-In the `ek80 <https://github.com/OSOceanAcoustics/echopype/tree/ek80>`_ development branch
-we are actively developing file conversion and processing routines
-such as pulse compression and calibration for the broadband Simrad EK80 ``.raw`` files.
+Support for ``.raw`` files from the broadband Simrad EK80 echosounder is currently
+in the development branch
+`combine-refactor <https://github.com/OSOceanAcoustics/echopype/tree/convert-refactor>`_
+and we will merge it to the master branch once it's ready for alpha testing.
 
 We are considering implementing calibration routines for
 *raw beam* data from common-found Acoustic Doppler Current Profilers (ADCPs).

diff --git a/notebooks/EK60_demo_OOI.ipynb b/notebooks/EK60_demo_OOI.ipynb