reduce complexity and change default type to str

.gitignore

@@ -6,7 +6,7 @@ __pycache__/
 .pytest_cache/
 
 #cython
-*.c
+.c
 
 # C extensions
 *.so

Makefile

@@ -8,7 +8,7 @@ ext:
 	python setup.py build_ext --inplace
 
 test:
-	python -m pytest tests
+	python -m pytest
 
 clean:
 	find pyModeS/decoder -type f -name '*.c' -delete

README.rst

@@ -1,42 +1,6 @@
 The Python ADS-B/Mode-S Decoder
 ===============================
 
-PyModeS is a Python library designed to decode Mode-S (including ADS-B) message. It can be imported to your python project or used as a standalone tool to view and save live traffic data.
-
-This is a project created by Junzi Sun, who works at `TU Delft <https://www.tudelft.nl/en/>`_, `Aerospace Engineering Faculty <https://www.tudelft.nl/en/ae/>`_, `CNS/ATM research group <http://cs.lr.tudelft.nl/atm/>`_. It is supported by many `contributors <https://github.com/junzis/pyModeS/graphs/contributors>`_ from different institutions.
-
-Introduction
-------------
-
-pyModeS supports the decoding of following types of messages:
-
-- DF4 / DF20: Altitude code
-- DF5 / DF21: Identity code (squawk code)
-
-- DF17 / DF18: Automatic Dependent Surveillance-Broadcast (ADS-B)
-
-  - TC=1-4  / BDS 0,8: Aircraft identification and category
-  - TC=5-8  / BDS 0,6: Surface position
-  - TC=9-18 / BDS 0,5: Airborne position
-  - TC=19   / BDS 0,9: Airborne velocity
-  - TC=28   / BDS 6,1: Airborne status [to be implemented]
-  - TC=29   / BDS 6,2: Target state and status information [to be implemented]
-  - TC=31   / BDS 6,5: Aircraft operational status [to be implemented]
-
-- DF20 / DF21: Mode-S Comm-B messages
-
-  - BDS 1,0: Data link capability report
-  - BDS 1,7: Common usage GICB capability report
-  - BDS 2,0: Aircraft identification
-  - BDS 3,0: ACAS active resolution advisory
-  - BDS 4,0: Selected vertical intention
-  - BDS 4,4: Meteorological routine air report (experimental)
-  - BDS 4,5: Meteorological hazard report (experimental)
-  - BDS 5,0: Track and turn report
-  - BDS 6,0: Heading and speed report
-
-
-
 If you find this project useful for your research, please considering cite this tool as::
 
   @article{sun2019pymodes,
@@ -50,6 +14,40 @@ If you find this project useful for your research, please considering cite this
 
 
 
+Introduction
+---------------------
+PyModeS is a Python library designed to decode Mode-S (including ADS-B) message. It can be imported to your python project or be used as a standalone tool to view and save live traffic data.
+
+Messages with following Downlink Formats (DF) are supported:
+
+**DF17 / DF18: Automatic Dependent Surveillance-Broadcast (ADS-B)**
+
+- TC=1-4  / BDS 0,8: Aircraft identification and category
+- TC=5-8  / BDS 0,6: Surface position
+- TC=9-18 / BDS 0,5: Airborne position
+- TC=19   / BDS 0,9: Airborne velocity
+- TC=28   / BDS 6,1: Airborne status [to be implemented]
+- TC=29   / BDS 6,2: Target state and status information [to be implemented]
+- TC=31   / BDS 6,5: Aircraft operational status [to be implemented]
+
+
+**DF20 / DF21: Mode-S Comm-B replies**
+
+- BDS 1,0: Data link capability report
+- BDS 1,7: Common usage GICB capability report
+- BDS 2,0: Aircraft identification
+- BDS 3,0: ACAS active resolution advisory
+- BDS 4,0: Selected vertical intention
+- BDS 4,4: Meteorological routine air report (experimental)
+- BDS 4,5: Meteorological hazard report (experimental)
+- BDS 5,0: Track and turn report
+- BDS 6,0: Heading and speed report
+
+
+**DF4 / DF20: Altitude code**
+
+**DF5 / DF21: Identity code (squawk code)**
+
 
 Resources
 -----------
@@ -57,15 +55,15 @@ Check out and contribute to this open-source project at:
 https://github.com/junzis/pyModeS
 
 Detailed manual on Mode-S decoding is published at:
-https://mode-s.org/decode
+https://mode-s.org/decode.
 
 The API documentation of pyModeS is at:
-https://mode-s.org/api
+http://pymodes.readthedocs.io
 
 
 
-Basic installation
+Install
--------------------
+-------
 
 Installation examples::
 
@@ -78,16 +76,6 @@ Installation examples::
 
 Dependencies ``numpy``, ``pyzmq`` and ``pyrtlsdr`` are installed automatically during previous installations processes.
 
-Advanced installation (using c modules)
-------------------------------------------
-
-If you want to make use of the (faster) c module, install ``pyModeS`` as follows::
-
-  git clone https://github.com/junzis/pyModeS
-  cd pyModeS
-  make ext
-  make install
-
 
 View live traffic (modeslive)
 ----------------------------------------------------
@@ -153,7 +141,7 @@ Common functions
   pms.hex2bin(str)      # Convert hexadecimal string to binary string
   pms.bin2int(str)      # Convert binary string to integer
   pms.hex2int(str)      # Convert hexadecimal string to integer
-  pms.gray2int(str)     # Convert grey code to integer
+  pms.gray2int(str)     # Convert grey code to interger
 
 
 Core functions for ADS-B decoding
@@ -167,7 +155,7 @@ Core functions for ADS-B decoding
   # Typecode 1-4
   pms.adsb.callsign(msg)
 
-  # Typecode 5-8 (surface), 9-18 (airborne, barometric height), and 20-22 (airborne, GNSS height)
+  # Typecode 5-8 (surface), 9-18 (airborne, barometric height), and 9-18 (airborne, GNSS height)
   pms.adsb.position(msg_even, msg_odd, t_even, t_odd, lat_ref=None, lon_ref=None)
   pms.adsb.airborne_position(msg_even, msg_odd, t_even, t_odd)
   pms.adsb.surface_position(msg_even, msg_odd, t_even, t_odd, lat_ref, lon_ref)

doc/Makefile

@@ -17,5 +17,5 @@ help:
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
 	rm -f source/pyModeS*.rst source/modules.rst
-	sphinx-apidoc -f -e -M -o source/ ../pyModeS  ../pyModeS/decoder/ehs.py ../pyModeS/decoder/els.py  ../pyModeS/streamer ../pyModeS/extra
+	sphinx-apidoc -f -e -M -o source/ ../pyModeS
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

doc/source/_templates/layout.html

@@ -1,17 +0,0 @@
-{% extends "!layout.html" %}
-
-{% block footer %}
-{{ super() }}
-
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-74700456-1"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'UA-74700456-1');
-</script>
-
-
-{% endblock %}

doc/source/conf.py

@@ -14,20 +14,19 @@
 #
 import os
 import sys
-
+sys.path.insert(0, os.path.abspath('../..'))
-sys.path.insert(0, os.path.abspath("../.."))
 
 
 # -- Project information -----------------------------------------------------
 
-project = "pyModeS"
+project = 'pyModeS'
-copyright = "2019, Junzi Sun"
+copyright = '2019, Junzi Sun'
-author = "Junzi Sun"
+author = 'Junzi Sun'
 
 # The short X.Y version
-version = ""
+version = ''
 # The full version, including alpha/beta/rc tags
-release = ""
+release = ''
 
 
 # -- General configuration ---------------------------------------------------
@@ -40,24 +39,26 @@ release = ""
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    "sphinx.ext.autodoc",
+    'sphinx.ext.autodoc',
-    "sphinx.ext.mathjax",
+    'sphinx.ext.todo',
-    "sphinx.ext.viewcode",
+    'sphinx.ext.coverage',
-    "sphinx.ext.githubpages",
+    'sphinx.ext.mathjax',
-    "sphinx.ext.napoleon",
+    'sphinx.ext.viewcode',
+    'sphinx.ext.githubpages',
+    'sphinx.ext.napoleon',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
+# templates_path = ['']
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = ".rst"
+source_suffix = '.rst'
 
 # The master toctree document.
-master_doc = "index"
+master_doc = 'index'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -81,10 +82,6 @@ pygments_style = None
 # a list of builtin themes.
 #
 # html_theme = 'alabaster'
-html_theme = "neo_rtd_theme"
-import sphinx_theme
-
-html_theme_path = [sphinx_theme.get_html_theme_path()]
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -111,7 +108,7 @@ html_theme_path = [sphinx_theme.get_html_theme_path()]
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = "pyModeSdoc"
+htmlhelp_basename = 'pyModeSdoc'
 
 
 # -- Options for LaTeX output ------------------------------------------------
@@ -120,12 +117,15 @@ latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
+
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
+
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
+
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
@@ -135,7 +135,8 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, "pyModeS.tex", "pyModeS Documentation", "Junzi Sun", "manual")
+    (master_doc, 'pyModeS.tex', 'pyModeS Documentation',
+     'Junzi Sun', 'manual'),
 ]
 
 
@@ -143,7 +144,10 @@ latex_documents = [
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [(master_doc, "pymodes", "pyModeS Documentation", [author], 1)]
+man_pages = [
+    (master_doc, 'pymodes', 'pyModeS Documentation',
+     [author], 1)
+]
 
 
 # -- Options for Texinfo output ----------------------------------------------
@@ -152,15 +156,9 @@ man_pages = [(master_doc, "pymodes", "pyModeS Documentation", [author], 1)]
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (
+    (master_doc, 'pyModeS', 'pyModeS Documentation',
-        master_doc,
+     author, 'pyModeS', 'One line description of project.',
-        "pyModeS",
+     'Miscellaneous'),
-        "pyModeS Documentation",
-        author,
-        "pyModeS",
-        "One line description of project.",
-        "Miscellaneous",
-    )
 ]
 
 
@@ -179,7 +177,7 @@ epub_title = project
 # epub_uid = ''
 
 # A list of files that should not be packed into the epub file.
-epub_exclude_files = ["search.html"]
+epub_exclude_files = ['search.html']
 
 
 # -- Extension configuration -------------------------------------------------

doc/source/index.rst

@@ -9,49 +9,11 @@ Welcome to pyModeS documentation!
 The source code can be found at: https://github.com/junzis/pyModeS
 
 .. toctree::
-  :caption: Core modules
+   :maxdepth: 3
-  :maxdepth: 2
-
-  pyModeS.decoder.adsb
-  pyModeS.decoder.commb
-
-
-.. toctree::
-  :caption: ADS-B messages
-  :maxdepth: 2
-
-  pyModeS.decoder.bds.bds05
-  pyModeS.decoder.bds.bds06
-  pyModeS.decoder.bds.bds08
-  pyModeS.decoder.bds.bds09
-
-
-.. toctree::
-  :caption: ELS - elementary surveillance
-  :maxdepth: 2
-
-  pyModeS.decoder.bds.bds10
-  pyModeS.decoder.bds.bds17
-  pyModeS.decoder.bds.bds20
-  pyModeS.decoder.bds.bds30
-
-
-.. toctree::
-  :caption: EHS - enhanced surveillance
-  :maxdepth: 2
-
-  pyModeS.decoder.bds.bds40
-  pyModeS.decoder.bds.bds50
-  pyModeS.decoder.bds.bds60
-
-
-.. toctree::
-  :caption: MRAR / MHR
-  :maxdepth: 2
-
-  pyModeS.decoder.bds.bds44
-  pyModeS.decoder.bds.bds45
 
+   pyModeS.decoder
+   pyModeS.streamer
+   pyModeS.extra
 
 
 ----

doc/source/make.bat

@@ -0,0 +1,35 @@
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=.
+set BUILDDIR=_build
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+
+:end
+popd

doc/source/pyModeS.c_common.rst

@@ -1,7 +0,0 @@
-pyModeS.c\_common module
-========================
-
-.. automodule:: pyModeS.c_common
-   :members:
-   :undoc-members:
-   :show-inheritance:

doc/source/pyModeS.common.rst

@@ -1,7 +0,0 @@
-pyModeS.common module
-=====================
-
-.. automodule:: pyModeS.common
-   :members:
-   :undoc-members:
-   :show-inheritance:

doc/source/pyModeS.decoder.acas.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.acas module
 ===========================
 
 .. automodule:: pyModeS.decoder.acas
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.adsb.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.adsb module
 ===========================
 
 .. automodule:: pyModeS.decoder.adsb
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.allcall.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.allcall module
 ==============================
 
 .. automodule:: pyModeS.decoder.allcall
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.bds.bds05.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.bds.bds05 module
 ================================
 
 .. automodule:: pyModeS.decoder.bds.bds05
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.bds.bds06.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.bds.bds06 module
 ================================
 
 .. automodule:: pyModeS.decoder.bds.bds06
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.bds.bds08.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.bds.bds08 module
 ================================
 
 .. automodule:: pyModeS.decoder.bds.bds08
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.bds.bds09.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.bds.bds09 module
 ================================
 
 .. automodule:: pyModeS.decoder.bds.bds09
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.bds.bds10.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.bds.bds10 module
 ================================
 
 .. automodule:: pyModeS.decoder.bds.bds10
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.bds.bds17.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.bds.bds17 module
 ================================
 
 .. automodule:: pyModeS.decoder.bds.bds17
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.bds.bds20.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.bds.bds20 module
 ================================
 
 .. automodule:: pyModeS.decoder.bds.bds20
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.bds.bds30.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.bds.bds30 module
 ================================
 
 .. automodule:: pyModeS.decoder.bds.bds30
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.bds.bds40.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.bds.bds40 module
 ================================
 
 .. automodule:: pyModeS.decoder.bds.bds40
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.bds.bds44.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.bds.bds44 module
 ================================
 
 .. automodule:: pyModeS.decoder.bds.bds44
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.bds.bds45.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.bds.bds45 module
 ================================
 
 .. automodule:: pyModeS.decoder.bds.bds45
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.bds.bds50.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.bds.bds50 module
 ================================
 
 .. automodule:: pyModeS.decoder.bds.bds50
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.bds.bds53.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.bds.bds53 module
 ================================
 
 .. automodule:: pyModeS.decoder.bds.bds53
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.bds.bds60.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.bds.bds60 module
 ================================
 
 .. automodule:: pyModeS.decoder.bds.bds60
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.bds.rst

@@ -2,15 +2,14 @@ pyModeS.decoder.bds package
 ===========================
 
 .. automodule:: pyModeS.decoder.bds
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:
 
 Submodules
 ----------
 
 .. toctree::
-   :maxdepth: 4
 
    pyModeS.decoder.bds.bds05
    pyModeS.decoder.bds.bds06
@@ -26,3 +25,4 @@ Submodules
    pyModeS.decoder.bds.bds50
    pyModeS.decoder.bds.bds53
    pyModeS.decoder.bds.bds60
+

doc/source/pyModeS.decoder.commb.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.commb module
 ============================
 
 .. automodule:: pyModeS.decoder.commb
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.common.rst

@@ -0,0 +1,7 @@
+pyModeS.decoder.common module
+=============================
+
+.. automodule:: pyModeS.decoder.common
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/source/pyModeS.decoder.ehs.rst

@@ -0,0 +1,7 @@
+pyModeS.decoder.ehs module
+==========================
+
+.. automodule:: pyModeS.decoder.ehs
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/source/pyModeS.decoder.els.rst

@@ -0,0 +1,7 @@
+pyModeS.decoder.els module
+==========================
+
+.. automodule:: pyModeS.decoder.els
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/source/pyModeS.decoder.rst

@@ -2,28 +2,29 @@ pyModeS.decoder package
 =======================
 
 .. automodule:: pyModeS.decoder
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:
 
 Subpackages
 -----------
 
 .. toctree::
-   :maxdepth: 4
 
-   pyModeS.decoder.bds
+    pyModeS.decoder.bds
 
 Submodules
 ----------
 
 .. toctree::
-   :maxdepth: 4
 
    pyModeS.decoder.acas
    pyModeS.decoder.adsb
    pyModeS.decoder.allcall
    pyModeS.decoder.commb
+   pyModeS.decoder.common
+   pyModeS.decoder.ehs
+   pyModeS.decoder.els
    pyModeS.decoder.surv
    pyModeS.decoder.uncertainty
-   pyModeS.decoder.uplink
+

doc/source/pyModeS.decoder.surv.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.surv module
 ===========================
 
 .. automodule:: pyModeS.decoder.surv
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.uncertainty.rst

@@ -2,6 +2,6 @@ pyModeS.decoder.uncertainty module
 ==================================
 
 .. automodule:: pyModeS.decoder.uncertainty
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:

doc/source/pyModeS.decoder.uplink.rst

@@ -1,7 +0,0 @@
-pyModeS.decoder.uplink module
-=============================
-
-.. automodule:: pyModeS.decoder.uplink
-   :members:
-   :undoc-members:
-   :show-inheritance:

doc/source/pyModeS.extra.aero.rst

@@ -0,0 +1,7 @@
+pyModeS.extra.aero module
+=========================
+
+.. automodule:: pyModeS.extra.aero
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/source/pyModeS.extra.rst

@@ -0,0 +1,16 @@
+pyModeS.extra package
+=====================
+
+.. automodule:: pyModeS.extra
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+
+   pyModeS.extra.aero
+   pyModeS.extra.tcpclient
+

doc/source/pyModeS.extra.tcpclient.rst

@@ -0,0 +1,7 @@
+pyModeS.extra.tcpclient module
+==============================
+
+.. automodule:: pyModeS.extra.tcpclient
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/source/pyModeS.rst

@@ -2,23 +2,16 @@ pyModeS package
 ===============
 
 .. automodule:: pyModeS
-   :members:
+    :members:
-   :undoc-members:
+    :undoc-members:
-   :show-inheritance:
+    :show-inheritance:
 
 Subpackages
 -----------
 
 .. toctree::
-   :maxdepth: 4
 
-   pyModeS.decoder
+    pyModeS.decoder
+    pyModeS.extra
+    pyModeS.streamer
 
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   pyModeS.c_common
-   pyModeS.common

doc/source/pyModeS.streamer.rst

@@ -0,0 +1,16 @@
+pyModeS.streamer package
+========================
+
+.. automodule:: pyModeS.streamer
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+
+   pyModeS.streamer.screen
+   pyModeS.streamer.stream
+

doc/source/pyModeS.streamer.screen.rst

@@ -0,0 +1,7 @@
+pyModeS.streamer.screen module
+==============================
+
+.. automodule:: pyModeS.streamer.screen
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/source/pyModeS.streamer.stream.rst

@@ -0,0 +1,7 @@
+pyModeS.streamer.stream module
+==============================
+
+.. automodule:: pyModeS.streamer.stream
+    :members:
+    :undoc-members:
+    :show-inheritance:

pyModeS/__init__.py

@@ -1,12 +1,14 @@
+from __future__ import absolute_import, print_function, division
+
 import os
 import warnings
 
 try:
-    from . import c_common as common
+    from .decoder import c_common as common
-    from .c_common import *
+    from .decoder.c_common import *
 except:
-    from . import common
+    from .decoder import common
-    from .common import *
+    from .decoder.common import *
 
 from .decoder import tell
 from .decoder import adsb
@@ -15,7 +17,6 @@ from .decoder import bds
 from .extra import aero
 from .extra import tcpclient
 
-
 warnings.simplefilter("once", DeprecationWarning)
 
 dirpath = os.path.dirname(os.path.realpath(__file__))

pyModeS/decoder/__init__.py

@@ -1,6 +1,9 @@
-def tell(msg):
+from __future__ import absolute_import, print_function, division
-    from pyModeS import common, adsb, commb, bds
 
+from pyModeS.decoder import adsb, commb, common, bds
+
+
+def tell(msg):
     def _print(label, value, unit=None):
         print("%20s: " % label, end="")
         print("%s " % value, end="")
@@ -17,7 +20,7 @@ def tell(msg):
     _print("Downlink Format", df)
 
     if df == 17:
-        _print("Protocol", "Mode-S Extended Squitter (ADS-B)")
+        _print("Protocal", "Mode-S Extended Squitter (ADS-B)")
 
         tc = common.typecode(msg)
         if 1 <= tc <= 4:  # callsign
@@ -26,7 +29,7 @@ def tell(msg):
             _print("Callsign:", callsign)
 
         if 5 <= tc <= 8:  # surface position
-            _print("Type", "Surface position")
+            _print("Type", "Surface postition")
             oe = adsb.oe_flag(msg)
             msgbin = common.hex2bin(msg)
             cprlat = common.bin2int(msgbin[54:71]) / 131072.0
@@ -72,11 +75,11 @@ def tell(msg):
             _print("Altitude", alt, "feet")
 
     if df == 20:
-        _print("Protocol", "Mode-S Comm-B altitude reply")
+        _print("Protocal", "Mode-S Comm-B altitude reply")
         _print("Altitude", common.altcode(msg), "feet")
 
     if df == 21:
-        _print("Protocol", "Mode-S Comm-B identity reply")
+        _print("Protocal", "Mode-S Comm-B identity reply")
         _print("Squawk code", common.idcode(msg))
 
     if df == 20 or df == 21:

pyModeS/decoder/acas.py

@@ -3,3 +3,6 @@ Decoding Air-Air Surveillance (ACAS) DF=0/16
 
 [To be implemented]
 """
+
+from __future__ import absolute_import, print_function, division
+from pyModeS.decoder import common

pyModeS/decoder/adsb.py

@@ -1,18 +1,22 @@
-"""ADS-B module.
+"""ADS-B Wrapper.
 
-The ADS-B module also imports functions from the following modules:
+The ADS-B wrapper also imports functions from the following modules:
 
-- pyModeS.decoder.bds.bds05: ``airborne_position()``, ``airborne_position_with_ref()``, ``altitude()``
+- pyModeS.decoder.bds.bds05
-- pyModeS.decoder.bds.bds06: ``surface_position()``, ``surface_position_with_ref()``, ``surface_velocity()``
+    Functions: ``airborne_position``, ``airborne_position_with_ref``, ``altitude``
-- pyModeS.decoder.bds.bds08: ``category()``, ``callsign()``
+- pyModeS.decoder.bds.bds06
-- pyModeS.decoder.bds.bds09: ``airborne_velocity()``, ``altitude_diff()``
+    Functions: ``surface_position``, ``surface_position_with_ref``, ``surface_velocity``
+- pyModeS.decoder.bds.bds08
+    Functions: ``category``, ``callsign``
+- pyModeS.decoder.bds.bds09
+    Functions: ``airborne_velocity``, ``altitude_diff``
 
 """
 
+from __future__ import absolute_import, print_function, division
+
 import pyModeS as pms
-
+from pyModeS.decoder import common
-from pyModeS import common
-
 from pyModeS.decoder import uncertainty
 
 # from pyModeS.decoder.bds import bds05, bds06, bds09
@@ -43,32 +47,27 @@ def typecode(msg):
 
 
 def position(msg0, msg1, t0, t1, lat_ref=None, lon_ref=None):
-    """Decode surface or airborne position from a pair of even and odd
+    """Decode position from a pair of even and odd position message
-    position messages.
+    (works with both airborne and surface position messages)
-
-    Note, that to decode surface position using the position message pair,
-    the reference position has to be provided.
 
     Args:
-        msg0 (string): even message (28 hexdigits)
+        msg0 (string): even message (28 bytes hexadecimal string)
-        msg1 (string): odd message (28 hexdigits)
+        msg1 (string): odd message (28 bytes hexadecimal string)
         t0 (int): timestamps for the even message
         t1 (int): timestamps for the odd message
-        lat_ref (float): latitude of reference position
-        lon_ref (float): longitude of reference position
 
     Returns:
         (float, float): (latitude, longitude) of the aircraft
-
     """
     tc0 = typecode(msg0)
     tc1 = typecode(msg1)
 
     if 5 <= tc0 <= 8 and 5 <= tc1 <= 8:
-        if lat_ref is None or lon_ref is None:
+        if (not lat_ref) or (not lon_ref):
             raise RuntimeError(
-                "Surface position encountered, a reference position"
+                "Surface position encountered, a reference \
-                " lat/lon required. Location of receiver can be used."
+                               position lat/lon required. Location of \
+                               receiver can be used."
             )
         else:
             return surface_position(msg0, msg1, t0, t1, lat_ref, lon_ref)
@@ -82,20 +81,19 @@ def position(msg0, msg1, t0, t1, lat_ref=None, lon_ref=None):
         return airborne_position(msg0, msg1, t0, t1)
 
     else:
-        raise RuntimeError("Incorrect or inconsistent message types")
+        raise RuntimeError("incorrect or inconsistant message types")
 
 
 def position_with_ref(msg, lat_ref, lon_ref):
-    """Decode position with only one message.
+    """Decode position with only one message,
-
+    knowing reference nearby location, such as previously
-    A reference position is required, which can be previously
+    calculated location, ground station, or airport location, etc.
-    calculated location, ground station, or airport location.
+    Works with both airborne and surface position messages.
-    The function works with both airborne and surface position messages.
     The reference position shall be with in 180NM (airborne) or 45NM (surface)
     of the true position.
 
     Args:
-        msg (str): even message (28 hexdigits)
+        msg (string): even message (28 bytes hexadecimal string)
         lat_ref: previous known latitude
         lon_ref: previous known longitude
 
@@ -112,19 +110,19 @@ def position_with_ref(msg, lat_ref, lon_ref):
         return airborne_position_with_ref(msg, lat_ref, lon_ref)
 
     else:
-        raise RuntimeError("incorrect or inconsistent message types")
+        raise RuntimeError("incorrect or inconsistant message types")
 
 
 def altitude(msg):
-    """Decode aircraft altitude.
+    """Decode aircraft altitude
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (string): 28 bytes hexadecimal message string
 
     Returns:
         int: altitude in feet
-
     """
+
     tc = typecode(msg)
 
     if tc < 5 or tc == 19 or tc > 22:
@@ -139,35 +137,40 @@ def altitude(msg):
         return altitude05(msg)
 
 
-def velocity(msg, source=False):
+def velocity(msg, rtn_sources=False):
-    """Calculate the speed, heading, and vertical rate (handles both airborne or surface message).
+    """Calculate the speed, heading, and vertical rate
+    (handles both airborne or surface message)
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (string): 28 bytes hexadecimal message string
-        source (boolean): Include direction and vertical rate sources in return. Default to False.
+        rtn_source (boolean): If the function will return
-            If set to True, the function will return six value instead of four.
+            the sources for direction of travel and vertical
+            rate. This will change the return value from a four
+            element array to a six element array.
 
     Returns:
-        int, float, int, string, [string], [string]: Four or six parameters, including:
+        (int, float, int, string, string, string): speed (kt),
-            - Speed (kt)
+            ground track or heading (degree),
-            - Angle (degree), either ground track or heading
+            rate of climb/descent (ft/min), speed type
-            - Vertical rate (ft/min)
+            ('GS' for ground speed, 'AS' for airspeed),
-            - Speed type ('GS' for ground speed, 'AS' for airspeed)
+            direction source ('true_north' for ground track / true north
-            - [Optional] Direction source ('TRUE_NORTH' or 'MAGENTIC_NORTH')
+            as refrence, 'mag_north' for magnetic north as reference),
-            - [Optional] Vertical rate source ('BARO' or 'GNSS')
+            rate of climb/descent source ('Baro' for barometer, 'GNSS'
-
+            for GNSS constellation).
-        For surface messages, vertical rate and its respective sources are set to None.
 
+            In the case of surface messages, None will be put in place
+            for vertical rate and its respective sources.
     """
+
     if 5 <= typecode(msg) <= 8:
-        return surface_velocity(msg, source)
+        return surface_velocity(msg, rtn_sources)
 
     elif typecode(msg) == 19:
-        return airborne_velocity(msg, source)
+        return airborne_velocity(msg, rtn_sources)
 
     else:
         raise RuntimeError(
-            "incorrect or inconsistent message types, expecting 4<TC<9 or TC=19"
+            "incorrect or inconsistant message types, expecting 4<TC<9 or TC=19"
         )
 
 
@@ -176,7 +179,7 @@ def speed_heading(msg):
     (handles both airborne or surface message)
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (string): 28 bytes hexadecimal message string
 
     Returns:
         (int, float): speed (kt), ground track or heading (degree)
@@ -188,7 +191,7 @@ def speed_heading(msg):
 def oe_flag(msg):
     """Check the odd/even flag. Bit 54, 0 for even, 1 for odd.
     Args:
-        msg (str): 28 hexdigits string
+        msg (string): 28 bytes hexadecimal message string
     Returns:
         int: 0 or 1, for even or odd frame
     """
@@ -200,7 +203,7 @@ def version(msg):
     """ADS-B Version
 
     Args:
-        msg (str): 28 hexdigits string, TC = 31
+        msg (string): 28 bytes hexadecimal message string, TC = 31
 
     Returns:
         int: version number
@@ -222,7 +225,7 @@ def nuc_p(msg):
     """Calculate NUCp, Navigation Uncertainty Category - Position (ADS-B version 1)
 
     Args:
-        msg (str): 28 hexdigits string,
+        msg (string): 28 bytes hexadecimal message string,
 
     Returns:
         int: Horizontal Protection Limit
@@ -258,7 +261,7 @@ def nuc_v(msg):
     """Calculate NUCv, Navigation Uncertainty Category - Velocity (ADS-B version 1)
 
     Args:
-        msg (str): 28 hexdigits string,
+        msg (string): 28 bytes hexadecimal message string,
 
     Returns:
         int or string: 95% Horizontal Velocity Error
@@ -287,7 +290,7 @@ def nic_v1(msg, NICs):
     """Calculate NIC, navigation integrity category, for ADS-B version 1
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (string): 28 bytes hexadecimal message string
         NICs (int or string): NIC supplement
 
     Returns:
@@ -321,7 +324,7 @@ def nic_v2(msg, NICa, NICbc):
     """Calculate NIC, navigation integrity category, for ADS-B version 2
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (string): 28 bytes hexadecimal message string
         NICa (int or string): NIC supplement - A
         NICbc (int or srting): NIC supplement - B or C
 
@@ -359,7 +362,7 @@ def nic_s(msg):
     """Obtain NIC supplement bit, TC=31 message
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (string): 28 bytes hexadecimal message string
 
     Returns:
         int: NICs number (0 or 1)
@@ -381,7 +384,7 @@ def nic_a_c(msg):
     """Obtain NICa/c, navigation integrity category supplements a and c
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (string): 28 bytes hexadecimal message string
 
     Returns:
         (int, int): NICa and NICc number (0 or 1)
@@ -404,7 +407,7 @@ def nic_b(msg):
     """Obtain NICb, navigation integrity category supplement-b
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (string): 28 bytes hexadecimal message string
 
     Returns:
         int: NICb number (0 or 1)
@@ -426,7 +429,7 @@ def nac_p(msg):
     """Calculate NACp, Navigation Accuracy Category - Position
 
     Args:
-        msg (str): 28 hexdigits string, TC = 29 or 31
+        msg (string): 28 bytes hexadecimal message string, TC = 29 or 31
 
     Returns:
         int or string: 95% horizontal accuracy bounds, Estimated Position Uncertainty
@@ -461,7 +464,7 @@ def nac_v(msg):
     """Calculate NACv, Navigation Accuracy Category - Velocity
 
     Args:
-        msg (str): 28 hexdigits string, TC = 19
+        msg (string): 28 bytes hexadecimal message string, TC = 19
 
     Returns:
         int or string: 95% horizontal accuracy bounds for velocity, Horizontal Figure of Merit
@@ -490,7 +493,7 @@ def sil(msg, version):
     """Calculate SIL, Surveillance Integrity Level
 
     Args:
-        msg (str): 28 hexdigits string with TC = 29, 31
+        msg (string): 28 bytes hexadecimal message string with TC = 29, 31
 
     Returns:
         int or string: Probability of exceeding Horizontal Radius of Containment RCu
@@ -501,7 +504,7 @@ def sil(msg, version):
 
     if tc not in [29, 31]:
         raise RuntimeError(
-            "%s: Not a target state and status message, \
+            "%s: Not a target state and status messag, \
                            or operation status message, expecting TC = 29 or 31"
             % msg
         )

pyModeS/decoder/allcall.py

@@ -3,3 +3,6 @@ Decoding all call replies DF=11
 
 [To be implemented]
 """
+
+from __future__ import absolute_import, print_function, division
+from pyModeS.decoder import common

pyModeS/decoder/bds/__init__.py

@@ -18,11 +18,11 @@
 Common functions for Mode-S decoding
 """
 
+from __future__ import absolute_import, print_function, division
 import numpy as np
 
 from pyModeS.extra import aero
-from pyModeS import common
+from pyModeS.decoder import common
-
 from pyModeS.decoder.bds import (
     bds05,
     bds06,
@@ -45,7 +45,7 @@ def is50or60(msg, spd_ref, trk_ref, alt_ref):
     """Use reference ground speed and trk to determine BDS50 and DBS60.
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
         spd_ref (float): reference speed (ADS-B ground speed), kts
         trk_ref (float): reference track (ADS-B track angle), deg
         alt_ref (float): reference altitude (ADS-B altitude), ft
@@ -108,7 +108,7 @@ def infer(msg, mrar=False):
     """Estimate the most likely BDS code of an message.
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
         mrar (bool): Also infer MRAR (BDS 44) and MHR (BDS 45). Defaults to False.
 
     Returns:
@@ -125,7 +125,7 @@ def infer(msg, mrar=False):
         tc = common.typecode(msg)
 
         if 1 <= tc <= 4:
-            return "BDS08"  # identification and category
+            return "BDS08"  # indentification and category
         if 5 <= tc <= 8:
             return "BDS06"  # surface movement
         if 9 <= tc <= 18:

pyModeS/decoder/bds/bds05.py

@@ -4,15 +4,17 @@
 #   Airborn position
 # ------------------------------------------
 
-from pyModeS import common
+
+from __future__ import absolute_import, print_function, division
+from pyModeS.decoder import common
 
 
 def airborne_position(msg0, msg1, t0, t1):
     """Decode airborn position from a pair of even and odd position message
 
     Args:
-        msg0 (string): even message (28 hexdigits)
+        msg0 (string): even message (28 bytes hexadecimal string)
-        msg1 (string): odd message (28 hexdigits)
+        msg1 (string): odd message (28 bytes hexadecimal string)
         t0 (int): timestamps for the even message
         t1 (int): timestamps for the odd message
 
@@ -85,7 +87,7 @@ def airborne_position_with_ref(msg, lat_ref, lon_ref):
     be with in 180NM of the true position.
 
     Args:
-        msg (str): even message (28 hexdigits)
+        msg (string): even message (28 bytes hexadecimal string)
         lat_ref: previous known latitude
         lon_ref: previous known longitude
 
@@ -127,7 +129,7 @@ def altitude(msg):
     """Decode aircraft altitude
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (string): 28 bytes hexadecimal message string
 
     Returns:
         int: altitude in feet

pyModeS/decoder/bds/bds06.py

@@ -1,10 +1,12 @@
 # ------------------------------------------
 #   BDS 0,6
 #   ADS-B TC=5-8
-#   Surface movment
+#   Surface position
 # ------------------------------------------
 
-from pyModeS import common
+from __future__ import absolute_import, print_function, division
+from pyModeS.decoder import common
+import math
 
 
 def surface_position(msg0, msg1, t0, t1, lat_ref, lon_ref):
@@ -12,8 +14,8 @@ def surface_position(msg0, msg1, t0, t1, lat_ref, lon_ref):
     the lat/lon of receiver must be provided to yield the correct solution.
 
     Args:
-        msg0 (string): even message (28 hexdigits)
+        msg0 (string): even message (28 bytes hexadecimal string)
-        msg1 (string): odd message (28 hexdigits)
+        msg1 (string): odd message (28 bytes hexadecimal string)
         t0 (int): timestamps for the even message
         t1 (int): timestamps for the odd message
         lat_ref (float): latitude of the receiver
@@ -89,7 +91,7 @@ def surface_position_with_ref(msg, lat_ref, lon_ref):
     be with in 45NM of the true position.
 
     Args:
-        msg (str): even message (28 hexdigits)
+        msg (string): even message (28 bytes hexadecimal string)
         lat_ref: previous known latitude
         lon_ref: previous known longitude
 
@@ -127,24 +129,23 @@ def surface_position_with_ref(msg, lat_ref, lon_ref):
     return round(lat, 5), round(lon, 5)
 
 
-def surface_velocity(msg, source=False):
+def surface_velocity(msg, rtn_sources=False):
-    """Decode surface velocity from a surface position message
+    """Decode surface velocity from from a surface position message
-
     Args:
-        msg (str): 28 hexdigits string
+        msg (string): 28 bytes hexadecimal message string
-        source (boolean): Include direction and vertical rate sources in return. Default to False.
+        rtn_source (boolean): If the function will return
-            If set to True, the function will return six value instead of four.
+            the sources for direction of travel and vertical
+            rate. This will change the return value from a four
+            element array to a six element array.
 
     Returns:
-        int, float, int, string, [string], [string]: Four or six parameters, including:
+        (int, float, int, string, string, None): speed (kt),
-            - Speed (kt)
+            ground track (degree), None for rate of climb/descend (ft/min),
-            - Angle (degree), ground track
+            and speed type ('GS' for ground speed), direction source
-            - Vertical rate, always 0
+            ('true_north' for ground track / true north as reference),
-            - Speed type ('GS' for ground speed, 'AS' for airspeed)
+            None rate of climb/descent source.
-            - [Optional] Direction source ('TRUE_NORTH')
-            - [Optional] Vertical rate source (None)
-
     """
+
     if common.typecode(msg) < 5 or common.typecode(msg) > 8:
         raise RuntimeError("%s: Not a surface message, expecting 5<TC<8" % msg)
 
@@ -158,7 +159,7 @@ def surface_velocity(msg, source=False):
     else:
         trk = None
 
-    # ground movement / speed
+    # ground movment / speed
     mov = common.bin2int(mb[5:12])
 
     if mov == 0 or mov > 124:
@@ -175,7 +176,7 @@ def surface_velocity(msg, source=False):
         spd = kts[i - 1] + (mov - movs[i - 1]) * step
         spd = round(spd, 2)
 
-    if source:
+    if rtn_sources:
-        return spd, trk, 0, "GS", "TRUE_NORTH", None
+        return spd, trk, 0, "GS", "true_north", None
     else:
         return spd, trk, 0, "GS"

pyModeS/decoder/bds/bds08.py

@@ -4,14 +4,15 @@
 #   Aircraft identitification and category
 # ------------------------------------------
 
-from pyModeS import common
+from __future__ import absolute_import, print_function, division
+from pyModeS.decoder import common
 
 
 def category(msg):
     """Aircraft category number
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (string): 28 bytes hexadecimal message string
 
     Returns:
         int: category number
@@ -29,7 +30,7 @@ def callsign(msg):
     """Aircraft callsign
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (string): 28 bytes hexadecimal message string
 
     Returns:
         string: callsign

pyModeS/decoder/bds/bds09.py

@@ -4,30 +4,32 @@
 #   Aircraft Airborn velocity
 # ------------------------------------------
 
-from pyModeS import common
+from __future__ import absolute_import, print_function, division
-
+from pyModeS.decoder import common
-
 import math
 
 
-def airborne_velocity(msg, source=False):
+def airborne_velocity(msg, rtn_sources=False):
-    """Decode airborne velocity.
+    """Calculate the speed, track (or heading), and vertical rate
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (string): 28 bytes hexadecimal message string
-        source (boolean): Include direction and vertical rate sources in return. Default to False.
+        rtn_source (boolean): If the function will return
-            If set to True, the function will return six value instead of four.
+            the sources for direction of travel and vertical
+            rate. This will change the return value from a four
+            element array to a six element array.
 
     Returns:
-        int, float, int, string, [string], [string]: Four or six parameters, including:
+        (int, float, int, string, string, string): speed (kt),
-            - Speed (kt)
+            ground track or heading (degree),
-            - Angle (degree), either ground track or heading
+            rate of climb/descent (ft/min), speed type
-            - Vertical rate (ft/min)
+            ('GS' for ground speed, 'AS' for airspeed),
-            - Speed type ('GS' for ground speed, 'AS' for airspeed)
+            direction source ('true_north' for ground track / true north
-            - [Optional] Direction source ('TRUE_NORTH' or 'MAGENTIC_NORTH')
+            as refrence, 'mag_north' for magnetic north as reference),
-            - [Optional] Vertical rate source ('BARO' or 'GNSS')
+            rate of climb/descent source ('Baro' for barometer, 'GNSS'
-
+            for GNSS constellation).
     """
+
     if common.typecode(msg) != 19:
         raise RuntimeError("%s: Not a airborne velocity message, expecting TC=19" % msg)
 
@@ -59,9 +61,9 @@ def airborne_velocity(msg, source=False):
         trk = math.degrees(trk)  # convert to degrees
         trk = trk if trk >= 0 else trk + 360  # no negative val
 
-        spd_type = "GS"
+        tag = "GS"
         trk_or_hdg = round(trk, 2)
-        dir_type = "TRUE_NORTH"
+        dir_type = "true_north"
 
     else:
         if mb[13] == "0":
@@ -78,33 +80,32 @@ def airborne_velocity(msg, source=False):
             spd *= 4
 
         if mb[24] == "0":
-            spd_type = "IAS"
+            tag = "IAS"
         else:
-            spd_type = "TAS"
+            tag = "TAS"
 
-        dir_type = "MAGENTIC_NORTH"
+        dir_type = "mag_north"
 
-    vr_source = "GNSS" if mb[35] == "0" else "BARO"
+    vr_source = "GNSS" if mb[35] == "0" else "Baro"
     vr_sign = -1 if mb[36] == "1" else 1
     vr = common.bin2int(mb[37:46])
-    vs = None if vr == 0 else int(vr_sign * (vr - 1) * 64)
+    rocd = None if vr == 0 else int(vr_sign * (vr - 1) * 64)
 
-    if source:
+    if rtn_sources:
-        return spd, trk_or_hdg, vs, spd_type, dir_type, vr_source
+        return spd, trk_or_hdg, rocd, tag, dir_type, vr_source
     else:
-        return spd, trk_or_hdg, vs, spd_type
+        return spd, trk_or_hdg, rocd, tag
 
 
 def altitude_diff(msg):
-    """Decode the differece between GNSS and barometric altitude.
+    """Decode the differece between GNSS and barometric altitude
 
     Args:
-        msg (str): 28 hexdigits string, TC=19
+        msg (string): 28 bytes hexadecimal message string, TC=19
 
     Returns:
-        int: Altitude difference in feet. Negative value indicates GNSS altitude
+        int: Altitude difference in ft. Negative value indicates GNSS altitude
-        below barometric altitude.
+            below barometric altitude.
-
     """
     tc = common.typecode(msg)
 

pyModeS/decoder/bds/bds10.py

@@ -3,36 +3,37 @@
 # Data link capability report
 # ------------------------------------------
 
-from pyModeS import common
+from __future__ import absolute_import, print_function, division
+from pyModeS.decoder.common import hex2bin, bin2int, data, allzeros
 
 
 def is10(msg):
     """Check if a message is likely to be BDS code 1,0
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         bool: True or False
     """
 
-    if common.allzeros(msg):
+    if allzeros(msg):
         return False
 
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     # first 8 bits must be 0x10
     if d[0:8] != "00010000":
         return False
 
     # bit 10 to 14 are reserved
-    if common.bin2int(d[9:14]) != 0:
+    if bin2int(d[9:14]) != 0:
         return False
 
-    # overlay capability conflict
+    # overlay capabilty conflict
-    if d[14] == "1" and common.bin2int(d[16:23]) < 5:
+    if d[14] == "1" and bin2int(d[16:23]) < 5:
         return False
-    if d[14] == "0" and common.bin2int(d[16:23]) > 4:
+    if d[14] == "0" and bin2int(d[16:23]) > 4:
         return False
 
     return True
@@ -42,11 +43,11 @@ def ovc10(msg):
     """Return the overlay control capability
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         int: Whether the transponder is OVC capable
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     return int(d[14])

pyModeS/decoder/bds/bds17.py

@@ -3,25 +3,27 @@
 #   Common usage GICB capability report
 # ------------------------------------------
 
-from pyModeS import common
+
+from __future__ import absolute_import, print_function, division
+from pyModeS.decoder.common import hex2bin, bin2int, data, allzeros
 
 
 def is17(msg):
     """Check if a message is likely to be BDS code 1,7
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         bool: True or False
     """
 
-    if common.allzeros(msg):
+    if allzeros(msg):
         return False
 
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
-    if common.bin2int(d[28:56]) != 0:
+    if bin2int(d[28:56]) != 0:
         return False
 
     caps = cap17(msg)
@@ -42,10 +44,10 @@ def cap17(msg):
     """Extract capacities from BDS 1,7 message
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
-        list: list of support BDS codes
+        list: list of suport BDS codes
     """
     allbds = [
         "05",
@@ -78,7 +80,7 @@ def cap17(msg):
         "E2",
     ]
 
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
     idx = [i for i, v in enumerate(d[:28]) if v == "1"]
     capacity = ["BDS" + allbds[i] for i in idx if allbds[i] is not "NA"]
 

pyModeS/decoder/bds/bds20.py

@@ -3,23 +3,24 @@
 # Aircraft identification
 # ------------------------------------------
 
-from pyModeS import common
+from __future__ import absolute_import, print_function, division
+from pyModeS.decoder.common import hex2bin, bin2int, data, allzeros
 
 
 def is20(msg):
     """Check if a message is likely to be BDS code 2,0
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         bool: True or False
     """
 
-    if common.allzeros(msg):
+    if allzeros(msg):
         return False
 
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[0:8] != "00100000":
         return False
@@ -36,23 +37,23 @@ def cs20(msg):
     """Aircraft callsign
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message (BDS40) string
 
     Returns:
         string: callsign, max. 8 chars
     """
     chars = "#ABCDEFGHIJKLMNOPQRSTUVWXYZ#####_###############0123456789######"
 
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     cs = ""
-    cs += chars[common.bin2int(d[8:14])]
+    cs += chars[bin2int(d[8:14])]
-    cs += chars[common.bin2int(d[14:20])]
+    cs += chars[bin2int(d[14:20])]
-    cs += chars[common.bin2int(d[20:26])]
+    cs += chars[bin2int(d[20:26])]
-    cs += chars[common.bin2int(d[26:32])]
+    cs += chars[bin2int(d[26:32])]
-    cs += chars[common.bin2int(d[32:38])]
+    cs += chars[bin2int(d[32:38])]
-    cs += chars[common.bin2int(d[38:44])]
+    cs += chars[bin2int(d[38:44])]
-    cs += chars[common.bin2int(d[44:50])]
+    cs += chars[bin2int(d[44:50])]
-    cs += chars[common.bin2int(d[50:56])]
+    cs += chars[bin2int(d[50:56])]
 
     return cs

pyModeS/decoder/bds/bds30.py

@@ -3,23 +3,24 @@
 # ACAS active resolution advisory
 # ------------------------------------------
 
-from pyModeS import common
+from __future__ import absolute_import, print_function, division
+from pyModeS.decoder.common import hex2bin, bin2int, data, allzeros
 
 
 def is30(msg):
     """Check if a message is likely to be BDS code 2,0
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         bool: True or False
     """
 
-    if common.allzeros(msg):
+    if allzeros(msg):
         return False
 
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[0:8] != "00110000":
         return False
@@ -29,7 +30,7 @@ def is30(msg):
         return False
 
     # reserved for ACAS III, in far future
-    if common.bin2int(d[15:22]) >= 48:
+    if bin2int(d[15:22]) >= 48:
         return False
 
     return True

pyModeS/decoder/bds/bds40.py

@@ -3,48 +3,49 @@
 # Selected vertical intention
 # ------------------------------------------
 
+from __future__ import absolute_import, print_function, division
 import warnings
-from pyModeS import common
+from pyModeS.decoder.common import hex2bin, bin2int, data, allzeros, wrongstatus
 
 
 def is40(msg):
     """Check if a message is likely to be BDS code 4,0
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         bool: True or False
     """
 
-    if common.allzeros(msg):
+    if allzeros(msg):
         return False
 
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     # status bit 1, 14, and 27
 
-    if common.wrongstatus(d, 1, 2, 13):
+    if wrongstatus(d, 1, 2, 13):
         return False
 
-    if common.wrongstatus(d, 14, 15, 26):
+    if wrongstatus(d, 14, 15, 26):
         return False
 
-    if common.wrongstatus(d, 27, 28, 39):
+    if wrongstatus(d, 27, 28, 39):
         return False
 
-    if common.wrongstatus(d, 48, 49, 51):
+    if wrongstatus(d, 48, 49, 51):
         return False
 
-    if common.wrongstatus(d, 54, 55, 56):
+    if wrongstatus(d, 54, 55, 56):
         return False
 
     # bits 40-47 and 52-53 shall all be zero
 
-    if common.bin2int(d[39:47]) != 0:
+    if bin2int(d[39:47]) != 0:
         return False
 
-    if common.bin2int(d[51:53]) != 0:
+    if bin2int(d[51:53]) != 0:
         return False
 
     return True
@@ -54,17 +55,17 @@ def selalt40mcp(msg):
     """Selected altitude, MCP/FCU
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message (BDS40) string
 
     Returns:
         int: altitude in feet
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[0] == "0":
         return None
 
-    alt = common.bin2int(d[1:13]) * 16  # ft
+    alt = bin2int(d[1:13]) * 16  # ft
     return alt
 
 
@@ -72,17 +73,17 @@ def selalt40fms(msg):
     """Selected altitude, FMS
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message (BDS40) string
 
     Returns:
         int: altitude in feet
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[13] == "0":
         return None
 
-    alt = common.bin2int(d[14:26]) * 16  # ft
+    alt = bin2int(d[14:26]) * 16  # ft
     return alt
 
 
@@ -90,17 +91,17 @@ def p40baro(msg):
     """Barometric pressure setting
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message (BDS40) string
 
     Returns:
         float: pressure in millibar
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[26] == "0":
         return None
 
-    p = common.bin2int(d[27:39]) * 0.1 + 800  # millibar
+    p = bin2int(d[27:39]) * 0.1 + 800  # millibar
     return p
 
 

pyModeS/decoder/bds/bds44.py

@@ -3,7 +3,8 @@
 # Meteorological routine air report
 # ------------------------------------------
 
-from pyModeS import common
+from __future__ import absolute_import, print_function, division
+from pyModeS.decoder.common import hex2bin, bin2int, data, allzeros, wrongstatus
 
 
 def is44(msg):
@@ -12,32 +13,32 @@ def is44(msg):
     Meteorological routine air report
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         bool: True or False
 
     """
-    if common.allzeros(msg):
+    if allzeros(msg):
         return False
 
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     # status bit 5, 35, 47, 50
-    if common.wrongstatus(d, 5, 6, 23):
+    if wrongstatus(d, 5, 6, 23):
         return False
 
-    if common.wrongstatus(d, 35, 36, 46):
+    if wrongstatus(d, 35, 36, 46):
         return False
 
-    if common.wrongstatus(d, 47, 48, 49):
+    if wrongstatus(d, 47, 48, 49):
         return False
 
-    if common.wrongstatus(d, 50, 51, 56):
+    if wrongstatus(d, 50, 51, 56):
         return False
 
     # Bits 1-4 indicate source, values > 4 reserved and should not occur
-    if common.bin2int(d[0:4]) > 4:
+    if bin2int(d[0:4]) > 4:
         return False
 
     vw, dw = wind44(msg)
@@ -55,20 +56,20 @@ def wind44(msg):
     """Wind speed and direction.
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         (int, float): speed (kt), direction (degree)
 
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     status = int(d[4])
     if not status:
         return None, None
 
-    speed = common.bin2int(d[5:14])  # knots
+    speed = bin2int(d[5:14])  # knots
-    direction = common.bin2int(d[14:23]) * 180.0 / 256.0  # degree
+    direction = bin2int(d[14:23]) * 180.0 / 256.0  # degree
 
     return round(speed, 0), round(direction, 1)
 
@@ -77,18 +78,18 @@ def temp44(msg):
     """Static air temperature.
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         float, float: temperature and alternative temperature in Celsius degree.
-            Note: Two values returns due to what seems to be an inconsistency
+            Note: Two values returns due to what seems to be an inconsistancy
             error in ICAO 9871 (2008) Appendix A-67.
 
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     sign = int(d[23])
-    value = common.bin2int(d[24:34])
+    value = bin2int(d[24:34])
 
     if sign:
         value = value - 1024
@@ -106,18 +107,18 @@ def p44(msg):
     """Static pressure.
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         int: static pressure in hPa
 
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[34] == "0":
         return None
 
-    p = common.bin2int(d[35:46])  # hPa
+    p = bin2int(d[35:46])  # hPa
 
     return p
 
@@ -126,17 +127,17 @@ def hum44(msg):
     """humidity
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         float: percentage of humidity, [0 - 100] %
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[49] == "0":
         return None
 
-    hm = common.bin2int(d[50:56]) * 100.0 / 64  # %
+    hm = bin2int(d[50:56]) * 100.0 / 64  # %
 
     return round(hm, 1)
 
@@ -145,17 +146,17 @@ def turb44(msg):
     """Turblence.
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         int: turbulence level. 0=NIL, 1=Light, 2=Moderate, 3=Severe
 
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[46] == "0":
         return None
 
-    turb = common.bin2int(d[47:49])
+    turb = bin2int(d[47:49])
 
     return turb

pyModeS/decoder/bds/bds45.py

@@ -3,7 +3,8 @@
 # Meteorological hazard report
 # ------------------------------------------
 
-from pyModeS import common
+from __future__ import absolute_import, print_function, division
+from pyModeS.decoder.common import hex2bin, bin2int, data, allzeros, wrongstatus
 
 
 def is45(msg):
@@ -12,44 +13,44 @@ def is45(msg):
     Meteorological hazard report
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         bool: True or False
 
     """
-    if common.allzeros(msg):
+    if allzeros(msg):
         return False
 
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     # status bit 1, 4, 7, 10, 13, 16, 27, 39
-    if common.wrongstatus(d, 1, 2, 3):
+    if wrongstatus(d, 1, 2, 3):
         return False
 
-    if common.wrongstatus(d, 4, 5, 6):
+    if wrongstatus(d, 4, 5, 6):
         return False
 
-    if common.wrongstatus(d, 7, 8, 9):
+    if wrongstatus(d, 7, 8, 9):
         return False
 
-    if common.wrongstatus(d, 10, 11, 12):
+    if wrongstatus(d, 10, 11, 12):
         return False
 
-    if common.wrongstatus(d, 13, 14, 15):
+    if wrongstatus(d, 13, 14, 15):
         return False
 
-    if common.wrongstatus(d, 16, 17, 26):
+    if wrongstatus(d, 16, 17, 26):
         return False
 
-    if common.wrongstatus(d, 27, 28, 38):
+    if wrongstatus(d, 27, 28, 38):
         return False
 
-    if common.wrongstatus(d, 39, 40, 51):
+    if wrongstatus(d, 39, 40, 51):
         return False
 
     # reserved
-    if common.bin2int(d[51:56]) != 0:
+    if bin2int(d[51:56]) != 0:
         return False
 
     temp = temp45(msg)
@@ -64,17 +65,17 @@ def turb45(msg):
     """Turbulence.
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         int: Turbulence level. 0=NIL, 1=Light, 2=Moderate, 3=Severe
 
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
     if d[0] == "0":
         return None
 
-    turb = common.bin2int(d[1:3])
+    turb = bin2int(d[1:3])
     return turb
 
 
@@ -82,17 +83,17 @@ def ws45(msg):
     """Wind shear.
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         int: Wind shear level. 0=NIL, 1=Light, 2=Moderate, 3=Severe
 
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
     if d[3] == "0":
         return None
 
-    ws = common.bin2int(d[4:6])
+    ws = bin2int(d[4:6])
     return ws
 
 
@@ -100,17 +101,17 @@ def mb45(msg):
     """Microburst.
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         int: Microburst level. 0=NIL, 1=Light, 2=Moderate, 3=Severe
 
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
     if d[6] == "0":
         return None
 
-    mb = common.bin2int(d[7:9])
+    mb = bin2int(d[7:9])
     return mb
 
 
@@ -118,17 +119,17 @@ def ic45(msg):
     """Icing.
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         int: Icing level. 0=NIL, 1=Light, 2=Moderate, 3=Severe
 
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
     if d[9] == "0":
         return None
 
-    ic = common.bin2int(d[10:12])
+    ic = bin2int(d[10:12])
     return ic
 
 
@@ -136,17 +137,17 @@ def wv45(msg):
     """Wake vortex.
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         int: Wake vortex level. 0=NIL, 1=Light, 2=Moderate, 3=Severe
 
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
     if d[12] == "0":
         return None
 
-    ws = common.bin2int(d[13:15])
+    ws = bin2int(d[13:15])
     return ws
 
 
@@ -154,16 +155,16 @@ def temp45(msg):
     """Static air temperature.
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         float: tmeperature in Celsius degree
 
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     sign = int(d[16])
-    value = common.bin2int(d[17:26])
+    value = bin2int(d[17:26])
 
     if sign:
         value = value - 512
@@ -178,16 +179,16 @@ def p45(msg):
     """Average static pressure.
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         int: static pressure in hPa
 
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
     if d[26] == "0":
         return None
-    p = common.bin2int(d[27:38])  # hPa
+    p = bin2int(d[27:38])  # hPa
     return p
 
 
@@ -195,14 +196,14 @@ def rh45(msg):
     """Radio height.
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         int: radio height in ft
 
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
     if d[38] == "0":
         return None
-    rh = common.bin2int(d[39:51]) * 16
+    rh = bin2int(d[39:51]) * 16
     return rh

pyModeS/decoder/bds/bds50.py

@@ -3,7 +3,8 @@
 # Track and turn report
 # ------------------------------------------
 
-from pyModeS import common
+from __future__ import absolute_import, print_function, division
+from pyModeS.decoder.common import hex2bin, bin2int, data, allzeros, wrongstatus
 
 
 def is50(msg):
@@ -11,32 +12,32 @@ def is50(msg):
     (Track and turn report)
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         bool: True or False
     """
 
-    if common.allzeros(msg):
+    if allzeros(msg):
         return False
 
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     # status bit 1, 12, 24, 35, 46
 
-    if common.wrongstatus(d, 1, 3, 11):
+    if wrongstatus(d, 1, 3, 11):
         return False
 
-    if common.wrongstatus(d, 12, 13, 23):
+    if wrongstatus(d, 12, 13, 23):
         return False
 
-    if common.wrongstatus(d, 24, 25, 34):
+    if wrongstatus(d, 24, 25, 34):
         return False
 
-    if common.wrongstatus(d, 35, 36, 45):
+    if wrongstatus(d, 35, 36, 45):
         return False
 
-    if common.wrongstatus(d, 46, 47, 56):
+    if wrongstatus(d, 46, 47, 56):
         return False
 
     roll = roll50(msg)
@@ -61,19 +62,19 @@ def roll50(msg):
     """Roll angle, BDS 5,0 message
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message (BDS50) string
 
     Returns:
         float: angle in degrees,
                negative->left wing down, positive->right wing down
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[0] == "0":
         return None
 
     sign = int(d[1])  # 1 -> left wing down
-    value = common.bin2int(d[2:11])
+    value = bin2int(d[2:11])
 
     if sign:
         value = value - 512
@@ -86,18 +87,18 @@ def trk50(msg):
     """True track angle, BDS 5,0 message
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message (BDS50) string
 
     Returns:
         float: angle in degrees to true north (from 0 to 360)
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[11] == "0":
         return None
 
     sign = int(d[12])  # 1 -> west
-    value = common.bin2int(d[13:23])
+    value = bin2int(d[13:23])
 
     if sign:
         value = value - 1024
@@ -115,17 +116,17 @@ def gs50(msg):
     """Ground speed, BDS 5,0 message
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message (BDS50) string
 
     Returns:
         int: ground speed in knots
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[23] == "0":
         return None
 
-    spd = common.bin2int(d[24:34]) * 2  # kts
+    spd = bin2int(d[24:34]) * 2  # kts
     return spd
 
 
@@ -133,12 +134,12 @@ def rtrk50(msg):
     """Track angle rate, BDS 5,0 message
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message (BDS50) string
 
     Returns:
         float: angle rate in degrees/second
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[34] == "0":
         return None
@@ -147,7 +148,7 @@ def rtrk50(msg):
         return None
 
     sign = int(d[35])  # 1 -> negative value, two's complement
-    value = common.bin2int(d[36:45])
+    value = bin2int(d[36:45])
     if sign:
         value = value - 512
 
@@ -159,15 +160,15 @@ def tas50(msg):
     """Aircraft true airspeed, BDS 5,0 message
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message (BDS50) string
 
     Returns:
         int: true airspeed in knots
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[45] == "0":
         return None
 
-    tas = common.bin2int(d[46:56]) * 2  # kts
+    tas = bin2int(d[46:56]) * 2  # kts
     return tas

pyModeS/decoder/bds/bds53.py

@@ -3,7 +3,8 @@
 # Air-referenced state vector
 # ------------------------------------------
 
-from pyModeS import common
+from __future__ import absolute_import, print_function, division
+from pyModeS.decoder.common import hex2bin, bin2int, data, allzeros, wrongstatus
 
 
 def is53(msg):
@@ -11,32 +12,32 @@ def is53(msg):
     (Air-referenced state vector)
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         bool: True or False
     """
 
-    if common.allzeros(msg):
+    if allzeros(msg):
         return False
 
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     # status bit 1, 13, 24, 34, 47
 
-    if common.wrongstatus(d, 1, 3, 12):
+    if wrongstatus(d, 1, 3, 12):
         return False
 
-    if common.wrongstatus(d, 13, 14, 23):
+    if wrongstatus(d, 13, 14, 23):
         return False
 
-    if common.wrongstatus(d, 24, 25, 33):
+    if wrongstatus(d, 24, 25, 33):
         return False
 
-    if common.wrongstatus(d, 34, 35, 46):
+    if wrongstatus(d, 34, 35, 46):
         return False
 
-    if common.wrongstatus(d, 47, 49, 56):
+    if wrongstatus(d, 47, 49, 56):
         return False
 
     ias = ias53(msg)
@@ -62,18 +63,18 @@ def hdg53(msg):
     """Magnetic heading, BDS 5,3 message
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message (BDS53) string
 
     Returns:
         float: angle in degrees to true north (from 0 to 360)
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[0] == "0":
         return None
 
     sign = int(d[1])  # 1 -> west
-    value = common.bin2int(d[2:12])
+    value = bin2int(d[2:12])
 
     if sign:
         value = value - 1024
@@ -91,17 +92,17 @@ def ias53(msg):
     """Indicated airspeed, DBS 5,3 message
 
     Args:
-        msg (str): 28 hexdigits
+        msg (String): 28 bytes hexadecimal message
 
     Returns:
         int: indicated arispeed in knots
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[12] == "0":
         return None
 
-    ias = common.bin2int(d[13:23])  # knots
+    ias = bin2int(d[13:23])  # knots
     return ias
 
 
@@ -109,17 +110,17 @@ def mach53(msg):
     """MACH number, DBS 5,3 message
 
     Args:
-        msg (str): 28 hexdigits
+        msg (String): 28 bytes hexadecimal message
 
     Returns:
         float: MACH number
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[23] == "0":
         return None
 
-    mach = common.bin2int(d[24:33]) * 0.008
+    mach = bin2int(d[24:33]) * 0.008
     return round(mach, 3)
 
 
@@ -127,17 +128,17 @@ def tas53(msg):
     """Aircraft true airspeed, BDS 5,3 message
 
     Args:
-        msg (str): 28 hexdigits
+        msg (String): 28 bytes hexadecimal message
 
     Returns:
         float: true airspeed in knots
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[33] == "0":
         return None
 
-    tas = common.bin2int(d[34:46]) * 0.5  # kts
+    tas = bin2int(d[34:46]) * 0.5  # kts
     return round(tas, 1)
 
 
@@ -145,18 +146,18 @@ def vr53(msg):
     """Vertical rate
 
     Args:
-        msg (str): 28 hexdigits (BDS60) string
+        msg (String): 28 bytes hexadecimal message (BDS60) string
 
     Returns:
         int: vertical rate in feet/minutes
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[46] == "0":
         return None
 
     sign = int(d[47])  # 1 -> negative value, two's complement
-    value = common.bin2int(d[48:56])
+    value = bin2int(d[48:56])
 
     if value == 0 or value == 255:  # all zeros or all ones
         return 0

pyModeS/decoder/bds/bds60.py

@@ -3,39 +3,40 @@
 # Heading and speed report
 # ------------------------------------------
 
-from pyModeS import common
+from __future__ import absolute_import, print_function, division
+from pyModeS.decoder.common import hex2bin, bin2int, data, allzeros, wrongstatus
 
 
 def is60(msg):
     """Check if a message is likely to be BDS code 6,0
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message string
 
     Returns:
         bool: True or False
     """
 
-    if common.allzeros(msg):
+    if allzeros(msg):
         return False
 
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     # status bit 1, 13, 24, 35, 46
 
-    if common.wrongstatus(d, 1, 2, 12):
+    if wrongstatus(d, 1, 2, 12):
         return False
 
-    if common.wrongstatus(d, 13, 14, 23):
+    if wrongstatus(d, 13, 14, 23):
         return False
 
-    if common.wrongstatus(d, 24, 25, 34):
+    if wrongstatus(d, 24, 25, 34):
         return False
 
-    if common.wrongstatus(d, 35, 36, 45):
+    if wrongstatus(d, 35, 36, 45):
         return False
 
-    if common.wrongstatus(d, 46, 47, 56):
+    if wrongstatus(d, 46, 47, 56):
         return False
 
     ias = ias60(msg)
@@ -61,18 +62,18 @@ def hdg60(msg):
     """Megnetic heading of aircraft
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message (BDS60) string
 
     Returns:
         float: heading in degrees to megnetic north (from 0 to 360)
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[0] == "0":
         return None
 
     sign = int(d[1])  # 1 -> west
-    value = common.bin2int(d[2:12])
+    value = bin2int(d[2:12])
 
     if sign:
         value = value - 1024
@@ -90,17 +91,17 @@ def ias60(msg):
     """Indicated airspeed
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message (BDS60) string
 
     Returns:
         int: indicated airspeed in knots
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[12] == "0":
         return None
 
-    ias = common.bin2int(d[13:23])  # kts
+    ias = bin2int(d[13:23])  # kts
     return ias
 
 
@@ -108,17 +109,17 @@ def mach60(msg):
     """Aircraft MACH number
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message (BDS60) string
 
     Returns:
         float: MACH number
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[23] == "0":
         return None
 
-    mach = common.bin2int(d[24:34]) * 2.048 / 512.0
+    mach = bin2int(d[24:34]) * 2.048 / 512.0
     return round(mach, 3)
 
 
@@ -126,18 +127,18 @@ def vr60baro(msg):
     """Vertical rate from barometric measurement, this value may be very noisy.
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message (BDS60) string
 
     Returns:
         int: vertical rate in feet/minutes
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[34] == "0":
         return None
 
     sign = int(d[35])  # 1 -> negative value, two's complement
-    value = common.bin2int(d[36:45])
+    value = bin2int(d[36:45])
 
     if value == 0 or value == 511:  # all zeros or all ones
         return 0
@@ -149,21 +150,21 @@ def vr60baro(msg):
 
 
 def vr60ins(msg):
-    """Vertical rate measurd by onbard equiments (IRS, AHRS)
+    """Vertical rate messured by onbard equiments (IRS, AHRS)
 
     Args:
-        msg (str): 28 hexdigits string
+        msg (String): 28 bytes hexadecimal message (BDS60) string
 
     Returns:
         int: vertical rate in feet/minutes
     """
-    d = common.hex2bin(common.data(msg))
+    d = hex2bin(data(msg))
 
     if d[45] == "0":
         return None
 
     sign = int(d[46])  # 1 -> negative value, two's complement
-    value = common.bin2int(d[47:56])
+    value = bin2int(d[47:56])
 
     if value == 0 or value == 511:  # all zeros or all ones
         return 0

pyModeS/decoder/c_common.pxd

@@ -19,5 +19,5 @@ cpdef int cprNL(double lat)
 cpdef str idcode(str msg)
 cpdef int altcode(str msg)
 
-cpdef str data(str msg)
+cdef str data(str msg)
 cpdef bint allzeros(str msg)

pyModeS/decoder/c_common.pyx

@@ -5,7 +5,7 @@ from cpython cimport array
 from cpython.bytes cimport PyBytes_GET_SIZE
 from cpython.bytearray cimport PyByteArray_GET_SIZE
 
-from libc.math cimport abs, cos, acos, fabs, M_PI as pi, floor as c_floor
+from libc.math cimport cos, acos, fabs, M_PI as pi, floor as c_floor
 
 
 cdef int char_to_int(unsigned char binstr):
@@ -231,11 +231,13 @@ cpdef int typecode(str msg):
 cpdef int cprNL(double lat):
     """NL() function in CPR decoding."""
 
-    if abs(lat) <= 1e-08:
+    if lat == 0:
         return 59
-    elif abs(abs(lat) - 87) <= 1e-08 + 1e-05 * 87:
+
+    if lat == 87 or lat == -87:
         return 2
-    elif lat > 87 or lat < -87:
+
+    if lat > 87 or lat < -87:
         return 1
 
     cdef int nz = 15
@@ -389,7 +391,7 @@ cdef int gray2int(str graystr):
     return num
 
 
-cpdef str data(str msg):
+cdef str data(str msg):
     """Return the data frame in the message, bytes 9 to 22."""
     return msg[8:-6]
 

pyModeS/decoder/commb.py

@@ -1,27 +1,26 @@
-"""Comm-B module.
+"""Comm-B Wrapper.
 
-The Comm-B module imports all functions from the following modules:
+The Comm-B wrapper imports all functions from the following modules:
 
-ELS - elementary surveillance
+**ELS - elementary surveillance**
+    - pyModeS.decoder.bds.bds10
+    - pyModeS.decoder.bds.bds17
+    - pyModeS.decoder.bds.bds20
+    - pyModeS.decoder.bds.bds30
 
-- pyModeS.decoder.bds.bds10
+**EHS - enhanced surveillance**
-- pyModeS.decoder.bds.bds17
+    - pyModeS.decoder.bds.bds40
-- pyModeS.decoder.bds.bds20
+    - pyModeS.decoder.bds.bds50
-- pyModeS.decoder.bds.bds30
+    - pyModeS.decoder.bds.bds60
 
-EHS - enhanced surveillance
+**MRAR and MHR**
-
+    - pyModeS.decoder.bds.bds44
-- pyModeS.decoder.bds.bds40
+    - pyModeS.decoder.bds.bds45
-- pyModeS.decoder.bds.bds50
-- pyModeS.decoder.bds.bds60
-
-MRAR and MHR
-
-- pyModeS.decoder.bds.bds44
-- pyModeS.decoder.bds.bds45
 
 """
 
+from __future__ import absolute_import, print_function, division
+
 # ELS - elementary surveillance
 from pyModeS.decoder.bds.bds10 import *
 from pyModeS.decoder.bds.bds17 import *

pyModeS/decoder/common.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import, print_function, division
 import numpy as np
 from textwrap import wrap
 
@@ -20,7 +21,7 @@ def bin2int(binstr):
 
 
 def df(msg):
-    """Decode Downlink Format value, bits 1 to 5."""
+    """Decode Downlink Format vaule, bits 1 to 5."""
     dfbin = hex2bin(msg[:2])
     return min(bin2int(dfbin[0:5]), 24)
 
@@ -182,11 +183,13 @@ def typecode(msg):
 def cprNL(lat):
     """NL() function in CPR decoding."""
 
-    if np.isclose(lat, 0):
+    if lat == 0:
         return 59
-    elif np.isclose(abs(lat), 87):
+
+    if lat == 87 or lat == -87:
         return 2
-    elif lat > 87 or lat < -87:
+
+    if lat > 87 or lat < -87:
         return 1
 
     nz = 15

pyModeS/decoder/ehs.py

@@ -9,6 +9,7 @@ The EHS wrapper imports all functions from the following modules:
 
 """
 
+from __future__ import absolute_import, print_function, division
 import warnings
 
 from pyModeS.decoder.bds.bds40 import *

pyModeS/decoder/els.py

@@ -10,6 +10,8 @@ The ELS wrapper imports all functions from the following modules:
 
 """
 
+from __future__ import absolute_import, print_function, division
+
 from pyModeS.decoder.bds.bds10 import *
 from pyModeS.decoder.bds.bds17 import *
 from pyModeS.decoder.bds.bds20 import *

pyModeS/decoder/surv.py

@@ -3,3 +3,6 @@ Warpper for short roll call surveillance replies DF=4/5
 
 [To be implemented]
 """
+
+from __future__ import absolute_import, print_function, division
+from pyModeS.decoder import common

pyModeS/decoder/uplink.py

@@ -1,25 +0,0 @@
-from pyModeS import common
-
-
-def uplink_icao(msg):
-    """Calculate the ICAO address from a Mode-S interrogation (uplink message)"""
-    p_gen = 0xFFFA0480 << ((len(msg) - 14) * 4)
-    data = int(msg[:-6], 16)
-    PA = int(msg[-6:], 16)
-    ad = 0
-    topbit = 0b1 << (len(msg) * 4 - 25)
-    for j in range(0, len(msg) * 4, 1):
-        if data & topbit:
-            data ^= p_gen
-        data = (data << 1) + ((PA >> 23) & 1)
-        PA = PA << 1
-        if j > (len(msg) * 4 - 26):
-            ad = ad + ((data >> (len(msg) * 4 - 25)) & 1)
-            ad = ad << 1
-    return "%06X" % (ad >> 2)
-
-
-def uf(msg):
-    """Decode Uplink Format value, bits 1 to 5."""
-    ufbin = common.hex2bin(msg[:2])
-    return min(common.bin2int(ufbin[0:5]), 24)

pyModeS/encoder/__init__.py

@@ -1,68 +0,0 @@
-from .bds.bds08 import me08
-from .bds.bds09 import me09
-from pyModeS import common
-
-
-def encode_adsb(**kwargs):
-    """Encode ADS-B message.
-
-    Args:
-        icao (string): Transponder ICAO address (6 hexdigits)
-        capability (int): Transponder capability, between 0 and 7
-        typecode (int): Typecode, less than 32
-
-        callsign (string): Callsign (6 hexdigits)
-        category (int): Aircraft category, between 0 and 7, Default to 0.
-
-        speed (int): Speed in knots.
-        angle (float): Track angle or heading angle in degrees.
-        vertical_rate (int): vertical rate in feet/minute
-        intent_change (int): Intent change flag, 0 or 1. Default to 0.
-        ifr_capability (int): IFR capability flag, 0 or 1. Default to 1.
-        navigation_quality (int): NUC (ver 0) or NACv (ver 1, 2), between 0 and 7.
-            Default to 0.
-        supersonic (bool): Is this a supersonic flight? Default to False.
-        speed_type (str): Speed type: GS, IAS, or TAS. Default to GS.
-        vertical_rate_source (str): GNSS or BARO. Default to BARO.
-        gnss_baro_alt_diff (int): Different between GNSS and barometric altitude in feet.
-            Negative value indicates GNSS altitude below barometric altitude. Default to 0
-
-    Returns:
-        string: 28 hexdigits raw message
-
-    """
-    tc = kwargs.get("typecode")
-
-    if 1 <= tc <= 4:
-        me = me08(**kwargs)
-    elif tc == 19:
-        me = me09(**kwargs)
-
-    msg = _constuct(**dict(kwargs, me=me))
-    return msg
-
-
-def _constuct(**kwargs):
-    icao = kwargs.get("icao")
-    me = kwargs.get("me")
-    capability = kwargs.get("capability", 6)
-
-    if icao is None or len(icao) != 6:
-        raise Exception("Transponder address must be 6 hexadecimal characters.")
-
-    if me is None or len(me) != 14:
-        raise Exception("Message be 14 hexadecimal characters.")
-
-    if capability > 6:
-        raise Exception("Transponder capability must be smaller than 7.")
-
-    header_bin = "10001" + "{0:03b}".format(capability)
-    header_hex = "{0:02X}".format(int(header_bin, 2))
-
-    msg = header_hex + icao + me + "000000"
-
-    pi = common.crc(msg, encode=True)
-    pi_hex = "{0:06X}".format(pi)
-
-    msg = msg[:-6] + pi_hex
-    return msg

pyModeS/encoder/bds/bds05.py

@@ -1,5 +0,0 @@
-# ------------------------------------------
-#   BDS 0,5
-#   ADS-B TC=9-18
-#   Airborn position
-# ------------------------------------------

pyModeS/encoder/bds/bds06.py

@@ -1,5 +0,0 @@
-# ------------------------------------------
-#   BDS 0,6
-#   ADS-B TC=5-8
-#   Surface position
-# ------------------------------------------

pyModeS/encoder/bds/bds08.py

@@ -1,40 +0,0 @@
-# ------------------------------------------
-#   BDS 0,8
-#   ADS-B TC=1-4
-#   Aircraft identitification and category
-# ------------------------------------------
-
-from pyModeS import common
-
-charmap = "#ABCDEFGHIJKLMNOPQRSTUVWXYZ##### ###############0123456789######"
-
-
-def me08(callsign, **kwargs):
-    cs = callsign
-    tc = kwargs.get("typecode")
-    cat = kwargs.get("category", 0)
-
-    if len(cs) > 8:
-        raise Exception("callsign must contain less than 9 characters")
-
-    if tc > 4:
-        raise Exception("typecode must be less 5")
-
-    if cat > 7:
-        raise Exception("category must be less 8")
-
-    if not cs.isalnum():
-        raise Exception("callsign must only contain alphanumeric characters")
-
-    cs = "{:<8}".format(cs.upper())
-
-    idx = [charmap.index(c) for c in cs]
-    me_bin = (
-        "{0:05b}".format(tc)
-        + "{0:03b}".format(cat)
-        + "".join("{0:06b}".format(i) for i in idx)
-    )
-
-    me_hex = "{0:04X}".format(int(me_bin, 2))
-
-    return me_hex

pyModeS/encoder/bds/bds09.py

@@ -1,119 +0,0 @@
-# ------------------------------------------
-#   BDS 0,9
-#   ADS-B TC=19
-#   Aircraft Airborn velocity
-# ------------------------------------------
-
-import numpy as np
-
-
-def me09(speed, angle, vertical_rate, **kwargs):
-    spd = speed
-    agl = angle
-    vr = vertical_rate
-
-    tc = kwargs.get("typecode")
-    intent = kwargs.get("intent_change", 0)
-    ifr = kwargs.get("ifr_capability", 1)
-    navq = kwargs.get("navigation_quality", 0)
-    supersonic = kwargs.get("supersonic", False)
-    spd_type = kwargs.get("speed_type", "gs").lower()
-    vr_source = kwargs.get("vertical_rate_source", "baro").lower()
-    alt_diff = kwargs.get("gnss_baro_alt_diff", 0)
-
-    if tc != 19:
-        raise Exception("Typecode must be 19.")
-
-    if intent not in (0, 1):
-        raise Exception("Intent change flag must be 0 or 1.")
-
-    if ifr not in (0, 1):
-        raise Exception("IFR capability flag must be 0 or 1.")
-
-    if type(supersonic) != bool:
-        raise Exception("Subsonic flag must be True or False.")
-
-    if navq > 7:
-        raise Exception("Navigation quality indicator must be smaller than 8.")
-
-    if spd_type not in ["gs", "tas"]:
-        raise Exception("Speed type must be 'gs', 'ias', or 'tas'.")
-
-    if vr_source not in ["baro", "gnss"]:
-        raise Exception("Vertical rate source must be 'baro' or 'gnss'.")
-
-    me_bin = ""
-
-    # typecode
-    me_bin += "{0:05b}".format(tc)
-
-    # sub-type
-    if supersonic:
-        if spd_type == "gs":
-            me_bin += "010"
-        else:
-            me_bin += "100"
-    else:
-        if spd_type == "gs":
-            me_bin += "001"
-        else:
-            me_bin += "011"
-
-    # intent, ifr, navigation quality
-    me_bin += str(intent) + str(ifr) + "{0:03b}".format(navq)
-
-    # speed and angle part
-    if spd_type == "gs":
-        vx = spd * np.sin(np.radians(agl))
-        vy = spd * np.cos(np.radians(agl))
-
-        if supersonic:
-            vx /= 4
-            vy /= 4
-
-        vx = int(round(vx))
-        vy = int(round(vy))
-
-        sew = "0" if vx >= 0 else "1"
-        sns = "0" if vy >= 0 else "1"
-        vew = "{0:010b}".format(min(abs(vx), 1023) + 1)
-        vns = "{0:010b}".format(min(abs(vy), 1023) + 1)
-
-        me_bin += sew + vew + sns + vns
-
-    elif spd_type == "ias" or spd_type == "tas":
-        hdg = int(round(agl * 1024 / 360))
-        hdg = min(hdg, 1023)
-
-        air_type = "1" if spd_type == "tas" else "0"
-
-        if supersonic:
-            spd /= 4
-
-        spd = min(int(round(spd)), 1023)
-
-        me_bin += "1" + "{0:010b}".format(hdg) + air_type + "{0:010b}".format(spd)
-
-    # vertical rate source
-    me_bin += "1" if vr_source == "baro" else "0"
-
-    # vertical rate
-    me_bin += "0" if vr > 0 else "1"
-    vr = int(round((abs(vr) / 64 + 1)))
-    vr = min(vr, 511)
-    me_bin += "{0:09b}".format(vr)
-
-    # reserved
-    me_bin += "00"
-
-    # altitude difference
-    me_bin += "1" if alt_diff < 0 else "0"
-    alt_diff = int(round(abs(alt_diff) / 25 + 1))
-    alt_diff = min(alt_diff, 127)
-    me_bin += "{0:07b}".format(alt_diff)
-    print(me_bin)
-
-    # convert to hexdigits
-    me_hex = "{0:04X}".format(int(me_bin, 2))
-
-    return me_hex

pyModeS/extra/__init__.py

@@ -0,0 +1 @@
+from __future__ import absolute_import, print_function, division

pyModeS/extra/aero.py

@@ -9,9 +9,9 @@ International Standard Atmosphere
 
     p,rho,T = atmos(H)    # atmos as function of geopotential altitude H [m]
     a = vsound(H)         # speed of sound [m/s] as function of H[m]
-    p = pressure(H)       # calls atmos but returns only pressure [Pa]
+    p = pressure(H)       # calls atmos but retruns only pressure [Pa]
     T = temperature(H)    # calculates temperature [K]
-    rho = density(H)      # calls atmos but returns only pressure [Pa]
+    rho = density(H)      # calls atmos but retruns only pressure [Pa]
 
 Speed conversion at altitude H[m] in ISA
 ::

pyModeS/extra/rtlreader.py

@@ -1,112 +1,90 @@
-import traceback
 import numpy as np
 import pyModeS as pms
 from rtlsdr import RtlSdr
 import time
 
-sampling_rate = 2e6
+modes_sample_rate = 2e6
-smaples_per_microsec = 2
-
 modes_frequency = 1090e6
-buffer_size = 1024 * 200
+buffer_size = 1024 * 100
-read_size = 1024 * 100
+read_size = 1024 * 20
 
 pbits = 8
 fbits = 112
 preamble = [1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0]
+th_amp = 0.2  # signal amplitude threshold for 0 and 1 bit
 th_amp_diff = 0.8  # signal amplitude threshold difference between 0 and 1 bit
 
 
 class RtlReader(object):
     def __init__(self, **kwargs):
         super(RtlReader, self).__init__()
-        self.signal_buffer = []  # amplitude of the sample only
+        self.signal_buffer = []
         self.sdr = RtlSdr()
-        self.sdr.sample_rate = sampling_rate
+        self.sdr.sample_rate = modes_sample_rate
         self.sdr.center_freq = modes_frequency
         self.sdr.gain = "auto"
+        # sdr.freq_correction = 75
 
         self.debug = kwargs.get("debug", False)
         self.raw_pipe_in = None
         self.stop_flag = False
-        self.noise_floor = 1e6
-
-    def _calc_noise(self):
-        """Calculate noise floor"""
-        window = smaples_per_microsec * 100
-        total_len = len(self.signal_buffer)
-        means = (
-            np.array(self.signal_buffer[: total_len // window * window])
-            .reshape(-1, window)
-            .mean(axis=1)
-        )
-        return min(means)
 
     def _process_buffer(self):
-        """process raw IQ data in the buffer"""
-
-        # update noise floor
-        self.noise_floor = min(self._calc_noise(), self.noise_floor)
-
-        # set minimum signal amplitude
-        min_sig_amp = 3.162 * self.noise_floor  # 10 dB SNR
-
-        # Mode S messages
         messages = []
 
+        # signal_array = np.array(self.signal_buffer)
+        # pulses_array = np.where(np.array(self.signal_buffer) < th_amp, 0, 1)
+        # pulses = "".join(str(x) for x in pulses_array)
         buffer_length = len(self.signal_buffer)
 
         i = 0
         while i < buffer_length:
-            if self.signal_buffer[i] < min_sig_amp:
+            if self.signal_buffer[i] < th_amp:
                 i += 1
                 continue
 
+            # if pulses[i : i + pbits * 2] == preamble:
             if self._check_preamble(self.signal_buffer[i : i + pbits * 2]):
                 frame_start = i + pbits * 2
                 frame_end = i + pbits * 2 + (fbits + 1) * 2
                 frame_length = (fbits + 1) * 2
                 frame_pulses = self.signal_buffer[frame_start:frame_end]
 
-                threshold = max(frame_pulses) * 0.2
+                msgbin = ""
-
-                msgbin = []
                 for j in range(0, frame_length, 2):
                     p2 = frame_pulses[j : j + 2]
                     if len(p2) < 2:
                         break
 
-                    if p2[0] < threshold and p2[1] < threshold:
+                    if p2[0] < th_amp and p2[1] < th_amp:
                         break
                     elif p2[0] >= p2[1]:
-                        c = 1
+                        c = "1"
                     elif p2[0] < p2[1]:
-                        c = 0
+                        c = "0"
                     else:
-                        msgbin = []
+                        msgbin = ""
                         break
-
+                    msgbin += c
-                    msgbin.append(c)
 
                 # advance i with a jump
                 i = frame_start + j
 
                 if len(msgbin) > 0:
-                    msghex = pms.bin2hex("".join([str(i) for i in msgbin]))
+                    msghex = pms.bin2hex(msgbin)
                     if self._check_msg(msghex):
                         messages.append([msghex, time.time()])
                     if self.debug:
                         self._debug_msg(msghex)
 
-            # elif i > buffer_length - 500:
+            elif i > buffer_length - 500:
-            #     # save some for next process
+                # save some for next process
-            #     break
+                break
             else:
                 i += 1
 
-        # reset the buffer
+        # keep reminder of buffer for next iteration
         self.signal_buffer = self.signal_buffer[i:]
-
         return messages
 
     def _check_preamble(self, pulses):
@@ -144,8 +122,10 @@ class RtlReader(object):
             pass
 
     def _read_callback(self, data, rtlsdr_obj):
+        # scaling signal (imporatant)
         amp = np.absolute(data)
-        self.signal_buffer.extend(amp.tolist())
+        amp_norm = np.interp(amp, (amp.min(), amp.max()), (0, 1))
+        self.signal_buffer.extend(amp_norm.tolist())
 
         if len(self.signal_buffer) >= buffer_size:
             messages = self._process_buffer()
@@ -158,24 +138,18 @@ class RtlReader(object):
             pass
 
     def stop(self, *args, **kwargs):
-        self.sdr.close()
+        self.sdr.cancel_read_async()
 
-    def run(self, raw_pipe_in=None, stop_flag=None, exception_queue=None):
+    def run(self, raw_pipe_in=None, stop_flag=None):
         self.raw_pipe_in = raw_pipe_in
         self.stop_flag = stop_flag
+        self.sdr.read_samples_async(self._read_callback, read_size)
 
-        try:
+        # count = 1
-            # raise RuntimeError("test exception")
+        # while count < 1000:
-
+        #     count += 1
-            while True:
+        #     data = self.sdr.read_samples(read_size)
-                data = self.sdr.read_samples(read_size)
+        #     self._read_callback(data, None)
-                self._read_callback(data, None)
-
-        except Exception as e:
-            tb = traceback.format_exc()
-            if exception_queue is not None:
-                exception_queue.put(tb)
-            raise e
 
 
 if __name__ == "__main__":

pyModeS/extra/tcpclient.py

@@ -1,5 +1,6 @@
 """Stream beast raw data from a TCP server, convert to mode-s messages."""
 
+from __future__ import print_function, division
 import os
 import sys
 import time
@@ -169,7 +170,7 @@ class TcpClient(object):
               Start character '$'
 
             MS field - Payload
-            Position 1 through 14:
+            Postion 1 through 14:
               14 bytes = 112 bits
               Mode-S payload
               In case of DF types that only carry 7 bytes of information
@@ -253,7 +254,7 @@ class TcpClient(object):
         for msg, t in messages:
             print("%15.9f %s" % (t, msg))
 
-    def run(self, raw_pipe_in=None, stop_flag=None, exception_queue=None):
+    def run(self, raw_pipe_in=None, stop_flag=None):
         self.raw_pipe_in = raw_pipe_in
         self.stop_flag = stop_flag
         self.connect()
@@ -268,6 +269,11 @@ class TcpClient(object):
                 self.buffer.extend(received)
                 # print(''.join(x.encode('hex') for x in self.buffer))
 
+                # process self.buffer when it is longer enough
+                # if len(self.buffer) < 2048:
+                #     continue
+                # -- Removed!! Cause delay in low data rate scenario --
+
                 if self.datatype == "beast":
                     messages = self.read_beast_buffer()
                 elif self.datatype == "raw":
@@ -280,12 +286,22 @@ class TcpClient(object):
                 else:
                     self.handle_messages(messages)
 
-                # raise RuntimeError("test exception")
-
             except Exception as e:
-                tb = traceback.format_exc()
+                # Provides the user an option to supply the environment
-                exception_queue.put(tb)
+                # variable PYMODES_DEBUG to halt the execution
-                raise e
+                # for debugging purposes
+                debug_intent = os.environ.get("PYMODES_DEBUG", "false")
+                if debug_intent.lower() == "true":
+                    traceback.print_exc()
+                    sys.exit()
+                else:
+                    print("Unexpected Error:", e)
+
+                try:
+                    sock = self.connect()
+                    time.sleep(1)
+                except Exception as e:
+                    print("Unexpected Error:", e)
 
 
 if __name__ == "__main__":

pyModeS/streamer/decode.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import, print_function, division
 import os
 import time
 import datetime
@@ -26,7 +27,7 @@ class Decode:
             self.dumpto = None
 
     def process_raw(self, adsb_ts, adsb_msg, commb_ts, commb_msg, tnow=None):
-        """process a chunk of adsb and commb messages received in the same
+        """process a chunk of adsb and commb messages recieved in the same
         time period.
         """
         if tnow is None:
@@ -258,31 +259,26 @@ class Decode:
         return
 
     def get_aircraft(self):
-        """all aircraft that are stored in memory"""
+        """all aircraft that are stored in memeory"""
         acs = self.acs
         return acs
 
-    def run(self, raw_pipe_out, ac_pipe_in, exception_queue):
+    def run(self, raw_pipe_out, ac_pipe_in):
         local_buffer = []
         while True:
-            try:
+            while raw_pipe_out.poll():
-                while raw_pipe_out.poll():
+                data = raw_pipe_out.recv()
-                    data = raw_pipe_out.recv()
+                local_buffer.append(data)
-                    local_buffer.append(data)
 
-                for data in local_buffer:
+            for data in local_buffer:
-                    self.process_raw(
+                self.process_raw(
-                        data["adsb_ts"],
+                    data["adsb_ts"],
-                        data["adsb_msg"],
+                    data["adsb_msg"],
-                        data["commb_ts"],
+                    data["commb_ts"],
-                        data["commb_msg"],
+                    data["commb_msg"],
-                    )
+                )
-                local_buffer = []
+            local_buffer = []
 
-                acs = self.get_aircraft()
+            acs = self.get_aircraft()
-                ac_pipe_in.send(acs)
+            ac_pipe_in.send(acs)
-                time.sleep(0.001)
+            time.sleep(0.001)
-
-            except Exception as e:
-                tb = traceback.format_exc()
-                exception_queue.put((e, tb))

pyModeS/streamer/modeslive

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
+from __future__ import print_function, division
 import os
 import sys
-import time
 import argparse
 import curses
 import signal
@@ -15,6 +15,7 @@ from pyModeS.streamer.source import NetSource, RtlSdrSource
 # redirect all stdout to null, avoiding messing up with the screen
 sys.stdout = open(os.devnull, "w")
 
+
 support_rawtypes = ["raw", "beast", "skysense"]
 
 parser = argparse.ArgumentParser()
@@ -70,7 +71,7 @@ elif SOURCE == "net":
     else:
         SERVER, PORT, DATATYPE = args.connect
         if DATATYPE not in support_rawtypes:
-            print("Data type not supported, available ones are %s" % support_rawtypes)
+            print("Data type not supported, avaiable ones are %s" % support_rawtypes)
 
 else:
     print('Source must be "rtlsdr" or "net".')
@@ -86,9 +87,13 @@ if DUMPTO is not None:
         sys.exit(1)
 
 
+# raw_event = multiprocessing.Event()
+# ac_event = multiprocessing.Event()
+# raw_queue = multiprocessing.Queue()
+# ac_queue = multiprocessing.Queue()
+
 raw_pipe_in, raw_pipe_out = multiprocessing.Pipe()
 ac_pipe_in, ac_pipe_out = multiprocessing.Pipe()
-exception_queue = multiprocessing.Queue()
 stop_flag = multiprocessing.Value("b", False)
 
 if SOURCE == "net":
@@ -97,38 +102,29 @@ elif SOURCE == "rtlsdr":
     source = RtlSdrSource()
 
 
-recv_process = multiprocessing.Process(
+recv_process = multiprocessing.Process(target=source.run, args=(raw_pipe_in, stop_flag))
-    target=source.run, args=(raw_pipe_in, stop_flag, exception_queue)
-)
 
 
 decode = Decode(latlon=LATLON, dumpto=DUMPTO)
 decode_process = multiprocessing.Process(
-    target=decode.run, args=(raw_pipe_out, ac_pipe_in, exception_queue)
+    target=decode.run, args=(raw_pipe_out, ac_pipe_in)
 )
 
 screen = Screen(uncertainty=UNCERTAINTY)
-screen_process = multiprocessing.Process(
+screen_process = multiprocessing.Process(target=screen.run, args=(ac_pipe_out,))
-    target=screen.run, args=(ac_pipe_out, exception_queue)
-)
 
 
-def shutdown():
+def closeall(signal, frame):
+    print("KeyboardInterrupt (ID: {}). Cleaning up...".format(signal))
     stop_flag.value = True
     curses.endwin()
-    sys.stdout = sys.__stdout__
     recv_process.terminate()
     decode_process.terminate()
     screen_process.terminate()
     recv_process.join()
     decode_process.join()
     screen_process.join()
-
+    exit(0)
-
-def closeall(signal, frame):
-    print("KeyboardInterrupt (ID: {}). Cleaning up...".format(signal))
-    shutdown()
-    sys.exit(0)
 
 
 signal.signal(signal.SIGINT, closeall)
@@ -136,19 +132,3 @@ signal.signal(signal.SIGINT, closeall)
 recv_process.start()
 decode_process.start()
 screen_process.start()
-
-
-while True:
-    if (
-        (not recv_process.is_alive())
-        or (not decode_process.is_alive())
-        or (not screen_process.is_alive())
-    ):
-        shutdown()
-        while not exception_queue.empty():
-            trackback = exception_queue.get()
-            print(trackback)
-
-        sys.exit(1)
-
-    time.sleep(0.01)

pyModeS/streamer/screen.py

@@ -1,8 +1,8 @@
+from __future__ import print_function, division
 import curses
 import numpy as np
 import time
 import threading
-import traceback
 
 COLUMNS = [
     ("call", 10),
@@ -187,32 +187,24 @@ class Screen(object):
                 self.screen.refresh()
                 self.draw_frame()
 
-    def run(self, ac_pipe_out, exception_queue):
+    def run(self, ac_pipe_out):
         local_buffer = []
         key_thread = threading.Thread(target=self.kye_handling)
-        key_thread.daemon = True
         key_thread.start()
 
         while True:
+            while ac_pipe_out.poll():
+                acs = ac_pipe_out.recv()
+                local_buffer.append(acs)
+
+            for acs in local_buffer:
+                self.update_ac(acs)
+
+            local_buffer = []
+
             try:
-                # raise RuntimeError("test exception")
-
-                while ac_pipe_out.poll():
-                    acs = ac_pipe_out.recv()
-                    local_buffer.append(acs)
-
-                for acs in local_buffer:
-                    self.update_ac(acs)
-
-                local_buffer = []
-
                 self.update()
-            except curses.error:
+            except:
                 pass
-            except Exception as e:
-                tb = traceback.format_exc()
-                exception_queue.put(tb)
-                time.sleep(0.1)
-                raise e
 
             time.sleep(0.001)

setup.py

@@ -4,7 +4,7 @@ See:
 https://packaging.python.org/en/latest/distributing.html
 https://github.com/pypa/sampleproject
 
-Steps for deploying a new version:
+Steps for deploying a new verison:
 1. Increase the version number
 2. remove the old deployment under [dist] and [build] folder
 3. run: python setup.py sdist
@@ -19,7 +19,7 @@ from setuptools import setup, find_packages
 from setuptools.extension import Extension
 from Cython.Build import cythonize
 
-extensions = [Extension("pyModeS.c_common", ["pyModeS/c_common.pyx"])]
+extensions = [Extension("pyModeS.decoder.c_common", ["pyModeS/decoder/c_common.pyx"])]
 
 
 # To use a consistent encoding
@@ -37,7 +37,7 @@ setup(
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version="2.5",
+    version="2.4",
     description="Python Mode-S and ADS-B Decoder",
     long_description=long_description,
     # The project's main homepage.
@@ -61,7 +61,7 @@ setup(
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         # Specify the Python versions you support here. In particular, ensure
         # that you indicate whether you support Python 2, Python 3 or both.
-        # "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 3",
     ],
     ext_modules=cythonize(extensions),
@@ -77,7 +77,7 @@ setup(
     # your project is installed. For an analysis of "install_requires" vs pip's
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=["numpy", "pyzmq", "pyrtlsdr"],
+    install_requires=["numpy", "argparse", "pyzmq", "pyrtlsdr"],
     # List additional groups of dependencies here (e.g. development
     # dependencies). You can install these using the following syntax,
     # for example:

tests/sample_run_commb.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 from pyModeS import commb, common, bds
 
 # === Decode sample data file ===

tests/test_c_common.py

@@ -1,58 +1,60 @@
-try:
+from pyModeS.decoder import c_common as common
-    from pyModeS.decoder import c_common as common
-
-    def test_conversions():
-        assert common.hex2bin("6E406B") == "011011100100000001101011"
-
-    def test_crc_decode():
-
-        assert common.crc("8D406B902015A678D4D220AA4BDA") == 0
-        assert common.crc("8d8960ed58bf053cf11bc5932b7d") == 0
-        assert common.crc("8d45cab390c39509496ca9a32912") == 0
-        assert common.crc("8d74802958c904e6ef4ba0184d5c") == 0
-        assert common.crc("8d4400cd9b0000b4f87000e71a10") == 0
-        assert common.crc("8d4065de58a1054a7ef0218e226a") == 0
-
-        assert common.crc("c80b2dca34aa21dd821a04cb64d4") == 10719924
-        assert common.crc("a800089d8094e33a6004e4b8a522") == 4805588
-        assert common.crc("a8000614a50b6d32bed000bbe0ed") == 5659991
-        assert common.crc("a0000410bc900010a40000f5f477") == 11727682
-        assert common.crc("8d4ca251204994b1c36e60a5343d") == 16
-        assert common.crc("b0001718c65632b0a82040715b65") == 353333
-
-    def test_crc_encode():
-        parity = common.crc("8D406B902015A678D4D220AA4BDA", encode=True)
-        assert parity == 11160538
-
-    def test_icao():
-        assert common.icao("8D406B902015A678D4D220AA4BDA") == "406B90"
-        assert common.icao("A0001839CA3800315800007448D9") == "400940"
-        assert common.icao("A000139381951536E024D4CCF6B5") == "3C4DD2"
-        assert common.icao("A000029CFFBAA11E2004727281F1") == "4243D0"
-
-    def test_modes_altcode():
-        assert common.altcode("A02014B400000000000000F9D514") == 32300
-
-    def test_modes_idcode():
-        assert common.idcode("A800292DFFBBA9383FFCEB903D01") == "1346"
-
-    def test_graycode_to_altitude():
-        assert common.gray2alt("00000000010") == -1000
-        assert common.gray2alt("00000001010") == -500
-        assert common.gray2alt("00000011011") == -100
-        assert common.gray2alt("00000011010") == 0
-        assert common.gray2alt("00000011110") == 100
-        assert common.gray2alt("00000010011") == 600
-        assert common.gray2alt("00000110010") == 1000
-        assert common.gray2alt("00001001001") == 5800
-        assert common.gray2alt("00011100100") == 10300
-        assert common.gray2alt("01100011010") == 32000
-        assert common.gray2alt("01110000100") == 46300
-        assert common.gray2alt("01010101100") == 50200
-        assert common.gray2alt("11011110100") == 73200
-        assert common.gray2alt("10000000011") == 126600
-        assert common.gray2alt("10000000001") == 126700
 
 
-except:
+def test_conversions():
-    pass
+    assert common.hex2bin("6E406B") == "011011100100000001101011"
+
+
+def test_crc_decode():
+
+    assert common.crc("8D406B902015A678D4D220AA4BDA") == 0
+    assert common.crc("8d8960ed58bf053cf11bc5932b7d") == 0
+    assert common.crc("8d45cab390c39509496ca9a32912") == 0
+    assert common.crc("8d74802958c904e6ef4ba0184d5c") == 0
+    assert common.crc("8d4400cd9b0000b4f87000e71a10") == 0
+    assert common.crc("8d4065de58a1054a7ef0218e226a") == 0
+
+    assert common.crc("c80b2dca34aa21dd821a04cb64d4") == 10719924
+    assert common.crc("a800089d8094e33a6004e4b8a522") == 4805588
+    assert common.crc("a8000614a50b6d32bed000bbe0ed") == 5659991
+    assert common.crc("a0000410bc900010a40000f5f477") == 11727682
+    assert common.crc("8d4ca251204994b1c36e60a5343d") == 16
+    assert common.crc("b0001718c65632b0a82040715b65") == 353333
+
+
+def test_crc_encode():
+    parity = common.crc("8D406B902015A678D4D220AA4BDA", encode=True)
+    assert parity == 11160538
+
+
+def test_icao():
+    assert common.icao("8D406B902015A678D4D220AA4BDA") == "406B90"
+    assert common.icao("A0001839CA3800315800007448D9") == "400940"
+    assert common.icao("A000139381951536E024D4CCF6B5") == "3C4DD2"
+    assert common.icao("A000029CFFBAA11E2004727281F1") == "4243D0"
+
+
+def test_modes_altcode():
+    assert common.altcode("A02014B400000000000000F9D514") == 32300
+
+
+def test_modes_idcode():
+    assert common.idcode("A800292DFFBBA9383FFCEB903D01") == "1346"
+
+
+def test_graycode_to_altitude():
+    assert common.gray2alt("00000000010") == -1000
+    assert common.gray2alt("00000001010") == -500
+    assert common.gray2alt("00000011011") == -100
+    assert common.gray2alt("00000011010") == 0
+    assert common.gray2alt("00000011110") == 100
+    assert common.gray2alt("00000010011") == 600
+    assert common.gray2alt("00000110010") == 1000
+    assert common.gray2alt("00001001001") == 5800
+    assert common.gray2alt("00011100100") == 10300
+    assert common.gray2alt("01100011010") == 32000
+    assert common.gray2alt("01110000100") == 46300
+    assert common.gray2alt("01010101100") == 50200
+    assert common.gray2alt("11011110100") == 73200
+    assert common.gray2alt("10000000011") == 126600
+    assert common.gray2alt("10000000001") == 126700

tests/test_common.py

@@ -1,4 +1,4 @@
-from pyModeS import common
+from pyModeS.decoder import common
 
 
 def test_conversions():

tests/test_encoder.py

@@ -1,23 +0,0 @@
-from pyModeS import encoder
-
-
-def test_identification():
-    msg = encoder.encode_adsb(
-        icao="406B90", typecode=4, capability=5, category=0, callsign="EZY85MH"
-    )
-    assert msg == "8D406B902015A678D4D220AA4BDA"
-
-
-def test_speed():
-    msg = encoder.encode_adsb(
-        icao="485020",
-        typecode=19,
-        capability=5,
-        speed_type="gs",
-        speed=159,
-        angle=182.88,
-        vertical_rate=-832,
-        vertical_rate_source="gnss",
-        gnss_baro_alt_diff=550,
-    )
-    assert msg == "8D485020994409940838175B284F"