diff --git a/README.rst b/README.rst index 29e4154..01d69ba 100644 --- a/README.rst +++ b/README.rst @@ -213,19 +213,19 @@ Mode-S Enhanced Surveillance (EHS) .. code:: python - # For BDS register 4,0 + # BDS 4,0 pms.commb.alt40mcp(msg) # MCP/FCU selected altitude (ft) pms.commb.alt40fms(msg) # FMS selected altitude (ft) pms.commb.p40baro(msg) # Barometric pressure (mb) - # For BDS register 5,0 + # BDS 5,0 pms.commb.roll50(msg) # Roll angle (deg) pms.commb.trk50(msg) # True track angle (deg) pms.commb.gs50(msg) # Ground speed (kt) pms.commb.rtrk50(msg) # Track angle rate (deg/sec) pms.commb.tas50(msg) # True airspeed (kt) - # For BDS register 6,0 + # BDS 6,0 pms.commb.hdg60(msg) # Magnetic heading (deg) pms.commb.ias60(msg) # Indicated airspeed (kt) pms.commb.mach60(msg) # Mach number (-) @@ -234,15 +234,31 @@ Mode-S Enhanced Surveillance (EHS) Meteorological routine air report (MRAR) [Experimental] +******************************************************** + +.. code:: python + + # BDS 4,4 + pms.commb.wind44(msg) # Wind speed (kt) and direction (true) (deg) + pms.commb.temp44(msg) # Static air temperature (C) + pms.commb.p44(msg) # Average static pressure (hPa) + pms.commb.hum44(msg) # Humidity (%) + + +Meteorological hazard air report (MHR) [Experimental] ******************************************************* .. code:: python - # For BDS register 4,4 - pms.commb.wind44(msg, rev=False) # Wind speed (kt) and direction (true) (deg) - pms.commb.temp44(msg, rev=False) # Static air temperature (C) - pms.commb.p44(msg, rev=False) # Average static pressure (hPa) - pms.commb.hum44(msg, rev=False) # Humidity (%) + # BDS 4,5 + pms.commb.turb45(msg) # Turbulence level (0-3) + pms.commb.ws45(msg) # Wind shear level (0-3) + pms.commb.mb45(msg) # Microburst level (0-3) + pms.commb.ic45(msg) # Icing level (0-3) + pms.commb.wv45(msg) # Wake vortex level (0-3) + pms.commb.temp45(msg) # Static air temperature (C) + pms.commb.p45(msg) # Average static pressure (hPa) + pms.commb.rh45(msg) # Radio height (ft) Developement diff --git a/pyModeS/decoder/bds/bds45.py b/pyModeS/decoder/bds/bds45.py index 5a4daf4..0fd40c5 100644 --- a/pyModeS/decoder/bds/bds45.py +++ b/pyModeS/decoder/bds/bds45.py @@ -25,7 +25,7 @@ from pyModeS.decoder.common import hex2bin, bin2int, data, allzeros, wrongstatus def is45(msg): """Check if a message is likely to be BDS code 4,5. - Meteorological harzard report + Meteorological hazard report Args: msg (String): 28 bytes hexadecimal message string @@ -220,5 +220,5 @@ def rh45(msg): d = hex2bin(data(msg)) if d[38] == '0': return None - rh = bin2int(d[39:51]) + rh = bin2int(d[39:51]) * 16 return rh diff --git a/setup.py b/setup.py index 8ee5cd1..c47a7ae 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,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.0', + version='2.1', description='Python ADS-B/Mode-S Decoder', long_description=long_description,