Release 2.0.4

.gitignore

@@ -13,10 +13,10 @@ pymagnum.code-workspace
 *.bak
 credentials.txt
 source/_build
+docs/_build
 testdata/**
 testing/**
 .pymodhis
 !testdata/allpackets.txt
 !testdata/allpackets.json
 !testdata/allpackets.sql
-examples/mqttlogger_2.py

CHANGES.rst

@@ -1,23 +1,15 @@
 =======================
  pyMagnum Release Notes
-========================
-Version 2.0.5 2023/11/13
-------------------------
-- Enhancement added ``allinone`` method to Magnum class. This creates a single record instead of one per device.
-- ``magdump`` has been enhanced to support ``--allinone`` option
-- A new example program ``magsql.py`` is available to log data to MariaDB/MySQL. Read the program comments for more information.
-- A new tool ``mag2sql`` is available to convert JSON from ``magdump`` output to a MySQL schema definition.
-
 Version 2.0.4 2023/11/05
 ------------------------
 - Fixed bug in emitted JSON when using multiple devices
 - Cleaned up code when using dummy data files instead of RS485 serial device
 - Provided a complete dummy test file testdata/allpackets.txt
 - Provided a JSON file testdata/allpackets.JSON
+
 - Fixed All revision values are defined as string. It used to be mixed
 - Enhancement --pretty option to magdump for formatted JSON output
 
-
 Version 2.0.3 2023/10/20
 ------------------------
 - Fixed problem with installing tzlocal on some systems

docs/conf.py

@@ -24,7 +24,9 @@
 
 # The full version, including alpha/beta/rc tags
 release = '2.0'
-version = '2.0.5'
+version = '2.0.4'
+=======
+
 
 # -- General configuration ---------------------------------------------------
 

magnum/__init__.py

@@ -4,7 +4,8 @@
 # SPDX-License-Identifier:    BSD-3-Clause
 #
 #  BUILDINFO
-__version__="2.0.5"
+__version__="2.0.4"
+
 #
 # names of devices
 #

magnum/aclddevice.py

@@ -8,6 +8,7 @@ def __init__(self, trace=False):
         self.trace = True # force packet dump
         self.data = {}
         self.deviceData = {}
+
         self.deviceData["device"] = ACLD
         self.deviceData["data"] = self.data
         if self.trace:

magnum/magdump.py

@@ -101,6 +101,7 @@ def main():
                     alldata["data"] = magnumdata
                     if args.allinone:
                         alldata = magnumReader.allinone(alldata)
+
                     commdevices.append(alldata)
             except Exception as e:
                 print("{0} {1}".format(comm_device, str(e)))