Index: .gitignore
===================================================================
diff -u -r61479ce1965fdcf793913f5e58af92e56c3aea67 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- .gitignore	(.../.gitignore)	(revision 61479ce1965fdcf793913f5e58af92e56c3aea67)
+++ .gitignore	(.../.gitignore)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -14,3 +14,11 @@
 build/
 dialin.egg-info/
 README.pdf
+docs/build
+docs/source/dialin.dg.rst
+docs/source/dialin.hd.rst
+docs/source/dialin.protocols.rst
+docs/source/dialin.rst
+docs/source/dialin.utils.rst
+docs/source/modules.rst
+
Index: README.md
===================================================================
diff -u -rf5992e425a0fea2f531119bd762853227a4bed77 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- README.md	(.../README.md)	(revision f5992e425a0fea2f531119bd762853227a4bed77)
+++ README.md	(.../README.md)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -3,8 +3,8 @@
 
 This repository contains the source code for the Dialin API.
 The Dialin API supports cross-functional testing of the Denali system.
-It supports the Systems level testing, Software Verification & Validation, and pre-release SW and FW developmental testing by exposing and simulating interaction with
- the UI, HD, and DG sub-components.
+It supports the Systems level testing, Software Verification & Validation, and pre-release SW and FW developmental 
+testing by exposing and simulating interaction with the UI, HD, and DG sub-components.
 
 To use this API, it is recommended to install the API directly from this locally hosted git repository. 
 It is also possible to install it from a pre-packaged .whl file. Once installed to your local 
Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -rf1ac0e8ba99d1ddb0138918e408dffc0f5eba3c5 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision f1ac0e8ba99d1ddb0138918e408dffc0f5eba3c5)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -27,11 +27,8 @@
 
 class DG:
     """
-    \class DG
-
     Dialysate Generator (DG) Dialin object API.  It provides the basic interface to communicate with
     the DG firmware.
-
     """
 
     # DG message IDs
@@ -77,14 +74,12 @@
         """
         DG constructor using can bus
 
-        \param can_interface:  string with can bus name, e.g. "can0"
-        \returns DG object that allows communication with board via port
-
-        \details For example:
-
+        For example:
                 dg_object = DG(can_interface='can0') or
                 dg_object = DG('can0')
 
+        @param can_interface:  string with can bus name, e.g. "can0"
+        @return: DG object that allows communication with board via port
         """
         # Create listener
         self.can_interface = DenaliCanMessenger(can_interface=can_interface)
@@ -119,13 +114,13 @@
         """
         Handler for response from DG regarding its version.
 
-        \param message:  response message from HD regarding valid treatment parameter ranges.\n
+        @param message:  response message from HD regarding valid treatment parameter ranges.\n
             U08  Major \n
             U08  Minor \n
             U08  Micro \n
             U16  Build \n
 
-        \returns None if unsuccessful, the version string if unpacked successfully
+        @return: None if unsuccessful, the version string if unpacked successfully
         """
         major = struct.unpack('B', bytearray(
             message['message'][self.START_POS_MAJOR:self.END_POS_MAJOR]))
@@ -146,8 +141,8 @@
         Handles published DG operation mode messages.  Current DG operation mode
         is captured for reference.
 
-        \param message:  published DG operation mode broadcast message
-        \returns none
+        @param message:  published DG operation mode broadcast message
+        @return: None
         """
 
         mode = struct.unpack('i', bytearray(
@@ -163,7 +158,7 @@
         Constructs and sends a login command via CAN bus.  Login required before \n
         other commands can be sent to the DG.
 
-        \returns 1 if logged in, 0 if log in failed
+        @return: 1 if logged in, 0 if log in failed
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
@@ -190,9 +185,9 @@
         Constructs and sends the insert DG message command.  Given message will \n
         be inserted into the DG's received message queue for processing.
 
-        \param msg:  byte array - properly formatted DG message to insert
+        @param msg:  byte array - properly formatted DG message to insert
 
-        \returns 1 if successful, zero otherwise
+        @return: 1 if successful, zero otherwise
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
Index: dialin/dg/drain_pump.py
===================================================================
diff -u -rcd974f59a331830091dc9518dc217f03b1ebd969 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/dg/drain_pump.py	(.../drain_pump.py)	(revision cd974f59a331830091dc9518dc217f03b1ebd969)
+++ dialin/dg/drain_pump.py	(.../drain_pump.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -22,10 +22,7 @@
 
 class DGDrainPump:
     """
-        \class DGDrainPump
-
-        \brief Dialysate Generator (DG) Dialin API sub-class for drain pump related commands.
-
+    Dialysate Generator (DG) Dialin API sub-class for drain pump related commands.
     """
 
     # Drain pump message IDs
@@ -43,7 +40,7 @@
         """
         DGDrainPump constructor
 
-        \param outer_instance: reference to the DG (outer) class.
+        @param outer_instance: reference to the DG (outer) class.
         """
         self.can_interface = can_interface
 
@@ -61,8 +58,8 @@
         Handles published drain pump data messages.  Drain pump data are captured
         for reference.
 
-        \param message:  published drain pump data message
-        \returns none
+        @param message:  published drain pump data message
+        @return: none
         """
 
         tgt = struct.unpack('i', bytearray(
@@ -77,9 +74,9 @@
         """
         Constructs and sends the drain pump speed set point override command
 
-        \param speed:  integer - speed set point (in RPM) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param speed:  integer - speed set point (in RPM) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -115,9 +112,9 @@
         """
         Constructs and sends the drain pump speed set point override command
 
-        \param ms:  integer - interval (in ms) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param ms:  integer - interval (in ms) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
Index: dialin/dg/hd_proxy.py
===================================================================
diff -u -rb3aa5c2a28904bdd0571efd4ec3273938babf3d1 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/dg/hd_proxy.py	(.../hd_proxy.py)	(revision b3aa5c2a28904bdd0571efd4ec3273938babf3d1)
+++ dialin/dg/hd_proxy.py	(.../hd_proxy.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -39,18 +39,18 @@
         """
         DGHDProxy constructor
 
-        \param outer_instance: reference to the DG (outer) class.
+        @param outer_instance: reference to the DG (outer) class.
 
-        \returns DGHDProxy object.
+        @return: DGHDProxy object.
         """
         self.can_interface = can_interface
 
     def cmd_switch_reservoirs(self, reservoirID=RESERVOIR1):
         """
         Constructs and sends the switch reservoirs command
 
-        \param res:  unsigned int - reservoir to set as active (HD will draw from this reservoir).
-        \returns 1 if successful, zero otherwise
+        @param res:  unsigned int - reservoir to set as active (HD will draw from this reservoir).
+        @return: 1 if successful, zero otherwise
 
         \details Reservoir IDs: \n
             0 = RESERVOIR 1 \n
@@ -81,8 +81,8 @@
         """
         Constructs and sends the fill command
 
-        \param volume:  unsigned int - volume (in mL) to fill inactive reservoir to.
-        \returns 1 if successful, zero otherwise
+        @param volume:  unsigned int - volume (in mL) to fill inactive reservoir to.
+        @return: 1 if successful, zero otherwise
         """
 
         vol = integer_to_bytearray(volume)
@@ -109,8 +109,8 @@
         """
         Constructs and sends the drain command
 
-        \param volume:  unsigned int - volume (in mL) to drain the inactive reservoir to.
-        \returns 1 if successful, zero otherwise
+        @param volume:  unsigned int - volume (in mL) to drain the inactive reservoir to.
+        @return: 1 if successful, zero otherwise
         """
 
         vol = integer_to_bytearray(volume)
@@ -137,8 +137,8 @@
         """
         Constructs and sends the start/stop DG command
 
-        \param start:  boolean - True = start DG, False = stop DG.
-        \returns 1 if successful, zero otherwise
+        @param start:  boolean - True = start DG, False = stop DG.
+        @return: 1 if successful, zero otherwise
         """
 
         if start:
@@ -170,8 +170,8 @@
         """
         Constructs and sends the start/stop DG trimmer heater command
 
-        \param start:  boolean - True = start heater, False = stop heater.
-        \returns non-zero integer if successful, False otherwise
+        @param start:  boolean - True = start heater, False = stop heater.
+        @return: non-zero integer if successful, False otherwise
         """
 
         if start:
Index: dialin/dg/load_cells.py
===================================================================
diff -u -r28c6de16995eccda5170c5385752da0cc4277183 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/dg/load_cells.py	(.../load_cells.py)	(revision 28c6de16995eccda5170c5385752da0cc4277183)
+++ dialin/dg/load_cells.py	(.../load_cells.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -52,9 +52,9 @@
         """
         DGLoadCells constructor
 
-        \param outer_instance: reference to the DG (outer) class.
+        @param outer_instance: reference to the DG (outer) class.
 
-        \returns DGLoadCells object.
+        @return: DGLoadCells object.
         """
         self.can_interface = can_interface
 
@@ -74,8 +74,8 @@
         Handles published load cell data messages.  Load cell data are captured
         for reference.
 
-        \param message:  published load cell data message
-        \returns none
+        @param message:  published load cell data message
+        @return: none
         """
 
         a1 = struct.unpack('f', bytearray(
@@ -96,10 +96,10 @@
         """
         Constructs and sends the load cell override command
 
-        \param grams:  float - weight (in grams) to override sensor with
-        \param sensor: unsigned int - sensor ID
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param grams:  float - weight (in grams) to override sensor with
+        @param sensor: unsigned int - sensor ID
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
 
         \details Load Cell sensor IDs: \n
             0 = A1 \n
@@ -134,9 +134,9 @@
         """
         Constructs and sends the load cell data broadcast interval override command
 
-        \param ms:  integer - interval (in ms) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param ms:  integer - interval (in ms) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
Index: dialin/dg/pressures.py
===================================================================
diff -u -rc260906118f578a6d20e5579ed660466ee874fee -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/dg/pressures.py	(.../pressures.py)	(revision c260906118f578a6d20e5579ed660466ee874fee)
+++ dialin/dg/pressures.py	(.../pressures.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -52,9 +52,9 @@
         """
         DGPressures constructor
 
-        \param outer_instance: reference to the DG (outer) class.
+        @param outer_instance: reference to the DG (outer) class.
 
-        \returns HDPressureOcclusion object.
+        @return: HDPressureOcclusion object.
         """
         self.can_interface = can_interface
 
@@ -74,8 +74,8 @@
         Handles published pressure data messages.  Pressure data are captured
         for reference.
 
-        \param message:  published pressure data message
-        \returns none
+        @param message:  published pressure data message
+        @return: none
         """
 
         roi = struct.unpack('f', bytearray(
@@ -96,10 +96,10 @@
         """
         Constructs and sends the pressure override command
 
-        \param pressure:  unsigned int - pressure (in PSI)
-        \param sensor:  unsigned int - sensor ID
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param pressure:  unsigned int - pressure (in PSI)
+        @param sensor:  unsigned int - sensor ID
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
 
         \details pressure sensor IDs: \n
             0 = RO Pump Inlet \n
@@ -134,9 +134,9 @@
         """
         Constructs and sends the pressure override command
 
-        \param ms:  unsigned int - broadcast interval (in ms)
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param ms:  unsigned int - broadcast interval (in ms)
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
 
         """
 
Index: dialin/dg/reservoirs.py
===================================================================
diff -u -r9d9105c7dc3379c2e14996522291b23a19e7ba46 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/dg/reservoirs.py	(.../reservoirs.py)	(revision 9d9105c7dc3379c2e14996522291b23a19e7ba46)
+++ dialin/dg/reservoirs.py	(.../reservoirs.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -20,9 +20,9 @@
 
 class DGReservoirs:
     """
-    \class DGReservoirs
+    DGReservoirs
 
-    \brief Dialysate Generator (DG) Dialin API sub-class for reservoir related commands.
+    Dialysate Generator (DG) Dialin API sub-class for reservoir related commands.
     """
 
     # Reservoir message IDs
@@ -44,9 +44,9 @@
         """
         DGReservoirs constructor
 
-        \param outer_instance: reference to the DG (outer) class.
+        @param outer_instance: reference to the DG (outer) class.
 
-        \returns HDPressureOcclusion object.
+        @return: HDPressureOcclusion object.
         """
         self.can_interface = can_interface
 
@@ -65,8 +65,8 @@
         Handles published reservoir data messages.  Reservoir data are captured
         for reference.
 
-        \param message:  published reservoir data message
-        \returns none
+        @param message:  published reservoir data message
+        @return: none
         """
 
         res = struct.unpack('i', bytearray(
Index: dialin/dg/ro_pump.py
===================================================================
diff -u -r832c90d58ce012f8c4dbfb3cfaa6fcf631724dbb -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision 832c90d58ce012f8c4dbfb3cfaa6fcf631724dbb)
+++ dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -22,10 +22,9 @@
 
 class DGROPump:
     """
-        \class DGROPump
+    DGROPump
+    Dialysate Generator (DG) Dialin API sub-class for RO pump related commands.
 
-        \brief Dialysate Generator (DG) Dialin API sub-class for RO pump related commands.
-
     """
 
     # RO pump message IDs
@@ -46,7 +45,7 @@
         """
         DGROPump constructor
 
-        \param outer_instance: reference to the DG (outer) class.
+        @param outer_instance: reference to the DG (outer) class.
         """
         self.can_interface = can_interface
 
@@ -65,8 +64,8 @@
         Handles published ro pump data messages.  RO pump data are captured
         for reference.
 
-        \param message:  published RO pump data message
-        \returns none
+        @param message:  published RO pump data message
+        @return: none
         """
 
         tgt = struct.unpack('i', bytearray(
@@ -84,9 +83,9 @@
         """
         Constructs and sends the RO pump set point override command
 
-        \param pressure:  integer - pressure set point (in PSI) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param pressure:  integer - pressure set point (in PSI) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -122,9 +121,9 @@
         """
         Constructs and sends the RO rate override command
 
-        \param flow:  float - flow rate (in L/min) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param flow:  float - flow rate (in L/min) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -160,9 +159,9 @@
         """
         Constructs and sends the RO pump set point override command
 
-        \param ms:  integer - time interval (in ms) to broadcast RO pump data
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param ms:  integer - time interval (in ms) to broadcast RO pump data
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
Index: dialin/dg/valves.py
===================================================================
diff -u -r0ddc890d792da89bcea0237f349d3a9185b411a3 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/dg/valves.py	(.../valves.py)	(revision 0ddc890d792da89bcea0237f349d3a9185b411a3)
+++ dialin/dg/valves.py	(.../valves.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -59,9 +59,9 @@
         """
         DGValves constructor
 
-        \param outer_instance: reference to the DG (outer) class.
+        @param outer_instance: reference to the DG (outer) class.
 
-        \returns DGValvesStates object.
+        @return: DGValvesStates object.
         """
         self.can_interface = can_interface
 
@@ -95,8 +95,8 @@
         """
         Handles published valves states message.
 
-        \param message:  published valves states message
-        \returns none
+        @param message:  published valves states message
+        @return: none
         """
 
         vst = struct.unpack('H', bytearray(message['message'][self.START_POS_VALVES_STATES:self.END_POS_VALVES_STATES]))
@@ -120,10 +120,10 @@
         """
         Constructs and sends the valve state override command
 
-        \param state:  bool - valve state
-        \param valve:  unsigned int - valve ID
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param state:  bool - valve state
+        @param valve:  unsigned int - valve ID
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
 
         \details valve IDs: \n
             0 = Valve Reservoir Fill
@@ -167,9 +167,9 @@
         """
         Constructs and sends the valve state override command
 
-        \param ms:  unsigned int - broadcast interval (in ms)
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param ms:  unsigned int - broadcast interval (in ms)
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
 
         """
 
Index: dialin/hd/alarms.py
===================================================================
diff -u -ra0ed06c29521c6492a25eeb1070f2bc26d9224c1 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/hd/alarms.py	(.../alarms.py)	(revision a0ed06c29521c6492a25eeb1070f2bc26d9224c1)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -69,9 +69,9 @@
         """
         HD_Alarms constructor
 
-        \param outer_instance: reference to the HD (outer) class.
+        @param outer_instance: reference to the HD (outer) class.
 
-        \returns HD_Alarms object.
+        @return: HD_Alarms object.
         """
         self.can_interface = can_interface
 
@@ -105,8 +105,8 @@
         Handles published alarms status messages.  alarms status data are captured
         for reference.
 
-        \param message:  published blood flow data message
-        \returns none
+        @param message:  published blood flow data message
+        @return: none
         """
 
         self.alarms_state = int.from_bytes(bytearray(
@@ -129,8 +129,8 @@
         """
         Handles published HD alarm activation messages.
 
-        \param message:  published HD alarm activation message
-        \returns none
+        @param message:  published HD alarm activation message
+        @return: none
         """
 
         alarm_id = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
@@ -140,8 +140,8 @@
         """
         Handles published HD alarm clear messages.
 
-        \param message:  published HD alarm clear message
-        \returns none
+        @param message:  published HD alarm clear message
+        @return: none
         """
 
         alarm_id = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
@@ -151,10 +151,10 @@
         """
         Constructs and sends the alarm state override command
 
-        \param state:  integer - 1 for alarm active, 0 for alarm inactive
-        \param alarm:  integer - ID of alarm to override
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param state:  integer - 1 for alarm active, 0 for alarm inactive
+        @param alarm:  integer - ID of alarm to override
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -190,10 +190,10 @@
         """
         Constructs and sends the alarm time override command
 
-        \param time_ms:  integer - time (in ms) since alarm was activated
-        \param alarm:  integer - ID of alarm to override
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param time_ms:  integer - time (in ms) since alarm was activated
+        @param alarm:  integer - ID of alarm to override
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -229,9 +229,9 @@
         """
         Constructs and sends the alarm lamp pattern override command.
 
-        \param pattern:  integer - ID of alarm lamp pattern to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param pattern:  integer - ID of alarm lamp pattern to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
 
         \details Patterns: \n
             0 = off \n
@@ -285,7 +285,7 @@
     def getCurrentAlarmsState(self):
         """
         Gets the current alarms state.
-        \returns the current alarms state in text form.
+        @return: the current alarms state in text form.
         """
         result = ""
         if self.alarms_state == self.HD_ALARM_STATE_NONE:
Index: dialin/hd/blood_flow.py
===================================================================
diff -u -r9d9105c7dc3379c2e14996522291b23a19e7ba46 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision 9d9105c7dc3379c2e14996522291b23a19e7ba46)
+++ dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -59,7 +59,7 @@
         """
         HD_BloodFlow constructor
 
-        \param outer_instance: reference to the HD (outer) class.
+        @param outer_instance: reference to the HD (outer) class.
         """
         self.can_interface = can_interface
 
@@ -82,8 +82,8 @@
         Handles published blood flow data messages.  Blood flow data are captured
         for reference.
 
-        \param message:  published blood flow data message
-        \returns none
+        @param message:  published blood flow data message
+        @return: none
         """
 
         # self.target_blood_flow_rate = int.from_bytes(bytearray(
@@ -117,9 +117,9 @@
         """
         Constructs and sends the blood flow set point override command
 
-        \param flow:  integer - flow set point (in mL/min) to override with (negative for reverse direction)
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param flow:  integer - flow set point (in mL/min) to override with (negative for reverse direction)
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -155,9 +155,9 @@
         """
         Constructs and sends the measured blood flow override command
 
-        \param flow:  integer - measured flow (in mL/min) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param flow:  integer - measured flow (in mL/min) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -193,9 +193,9 @@
         Constructs and sends the measured blood pump motor controller speed \n
         override command.
 
-        \param speed:  integer - speed (in RPM) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param speed:  integer - speed (in RPM) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -230,9 +230,9 @@
         """
         Constructs and sends the measured blood pump motor current override command
 
-        \param curr:  float - current (in mA) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param curr:  float - current (in mA) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -268,9 +268,9 @@
         Constructs and sends the measured blood pump motor  speed override \n
         command.
 
-        \param speed:  integer - speed (in RPM) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param speed:  integer - speed (in RPM) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -306,9 +306,9 @@
             Constructs and sends the measured blood pump rotor speed override \n
             command.
 
-            \param speed:  integer - speed (in RPM) to override with
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \returns 1 if successful, zero otherwise
+            @param speed:  integer - speed (in RPM) to override with
+            @param reset:  integer - 1 to reset a previous override, 0 to override
+            @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -343,9 +343,9 @@
         """
         Constructs and sends the measured blood flow broadcast interval override command
 
-        \param ms:  integer - interval (in ms) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param ms:  integer - interval (in ms) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
Index: dialin/hd/buttons.py
===================================================================
diff -u -r05353eded4d42bb6db53eb398486254af20f7cf0 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/hd/buttons.py	(.../buttons.py)	(revision 05353eded4d42bb6db53eb398486254af20f7cf0)
+++ dialin/hd/buttons.py	(.../buttons.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -34,7 +34,7 @@
         """
         HD_Buttons constructor
 
-        \param can_interface: the denali can interface object
+        @param can_interface: the denali can interface object
         """
 
         self.can_interface = can_interface
@@ -44,9 +44,9 @@
         Constructs and sends the Off button override command
         See HD/App/Controllers/Buttons.c
 
-        \param state:  integer - 1 to override off button to "pressed", 0 to "released"
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param state:  integer - 1 to override off button to "pressed", 0 to "released"
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -82,9 +82,9 @@
         Constructs and sends the Stop button override command
         See HD/App/Controllers/Buttons.c
 
-        \param state:  integer - 1 to override stop button to "pressed", 0 to "released"
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param state:  integer - 1 to override stop button to "pressed", 0 to "released"
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
Index: dialin/hd/dialysate_inlet_flow.py
===================================================================
diff -u -r9d9105c7dc3379c2e14996522291b23a19e7ba46 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision 9d9105c7dc3379c2e14996522291b23a19e7ba46)
+++ dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -80,8 +80,8 @@
             Handles published dialysate inlet flow data messages.  Dialysate flow data are captured
             for reference.
 
-            \param message:  published dialysate flow data message
-            \returns none
+            @param message:  published dialysate flow data message
+            @return: none
         """
 
         self.target_dialysate_inlet_flow_rate = int.from_bytes(bytearray(
@@ -111,9 +111,9 @@
         """
             Constructs and sends the dialysate flow set point override command
 
-            \param flow:  integer - flow set point (in mL/min) to override with
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \returns 1 if successful, zero otherwise
+            @param flow:  integer - flow set point (in mL/min) to override with
+            @param reset:  integer - 1 to reset a previous override, 0 to override
+            @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -149,9 +149,9 @@
         """
             Constructs and sends the measured dialysate flow override command
 
-            \param flow:  integer - measured flow (in mL/min) to override with
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \returns 1 if successful, zero otherwise
+            @param flow:  integer - measured flow (in mL/min) to override with
+            @param reset:  integer - 1 to reset a previous override, 0 to override
+            @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -187,9 +187,9 @@
             Constructs and sends the measured dialysate inlet pump motor controller speed \n
             override command.
 
-            \param speed:  integer - speed (in RPM) to override with
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \returns 1 if successful, zero otherwise
+            @param speed:  integer - speed (in RPM) to override with
+            @param reset:  integer - 1 to reset a previous override, 0 to override
+            @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -224,9 +224,9 @@
         """
             Constructs and sends the measured dialysate inlet pump motor current override command
 
-            \param curr:  integer - current (in mA) to override with
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \returns 1 if successful, zero otherwise
+            @param curr:  integer - current (in mA) to override with
+            @param reset:  integer - 1 to reset a previous override, 0 to override
+            @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -262,9 +262,9 @@
             Constructs and sends the measured dialysate inlet pump motor speed override \n
             command.
 
-            \param speed:  integer - speed (in RPM) to override with
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \returns 1 if successful, zero otherwise
+            @param speed:  integer - speed (in RPM) to override with
+            @param reset:  integer - 1 to reset a previous override, 0 to override
+            @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -300,9 +300,9 @@
             Constructs and sends the measured dialysate inlet pump rotor speed override \n
             command.
 
-            \param speed:  integer - speed (in RPM) to override with
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \returns 1 if successful, zero otherwise
+            @param speed:  integer - speed (in RPM) to override with
+            @param reset:  integer - 1 to reset a previous override, 0 to override
+            @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -337,9 +337,9 @@
         """
             Constructs and sends the measured dialysate inlet flow broadcast interval override command
 
-            \param ms:  integer - interval (in ms) to override with
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \returns 1 if successful, zero otherwise
+            @param ms:  integer - interval (in ms) to override with
+            @param reset:  integer - 1 to reset a previous override, 0 to override
+            @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
Index: dialin/hd/dialysate_outlet_flow.py
===================================================================
diff -u -r9d9105c7dc3379c2e14996522291b23a19e7ba46 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision 9d9105c7dc3379c2e14996522291b23a19e7ba46)
+++ dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -81,8 +81,8 @@
             Handles published dialysate outlet flow data messages.  Dialysate flow data are captured
             for reference.
 
-            \param message:  published dialysate outlet flow data message
-            \returns none
+            @param message:  published dialysate outlet flow data message
+            @return: none
         """
 
         refvol = struct.unpack('f', bytearray(
@@ -112,9 +112,9 @@
         """
         Constructs and sends the UF reference volume override command
 
-        \param refvol:  float - reference UF volume (in mL) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param refvol:  float - reference UF volume (in mL) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -150,9 +150,9 @@
         """
         Constructs and sends the measured UF volume override command
 
-        \param measvol:  float - measured UF volume (in mL) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param measvol:  float - measured UF volume (in mL) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -188,9 +188,9 @@
             Constructs and sends the measured dialysate outlet pump motor controller speed \n
             override command.
 
-            \param speed:  float - speed (in RPM) to override with
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \returns 1 if successful, zero otherwise
+            @param speed:  float - speed (in RPM) to override with
+            @param reset:  integer - 1 to reset a previous override, 0 to override
+            @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -225,9 +225,9 @@
         """
         Constructs and sends the measured dialysate outlet pump motor current override command
 
-        \param curr:  float - current (in mA) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param curr:  float - current (in mA) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -263,9 +263,9 @@
         Constructs and sends the measured dialysate outlet pump motor speed override \n
         command.
 
-        \param speed:  float - speed (in RPM) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param speed:  float - speed (in RPM) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -301,9 +301,9 @@
         Constructs and sends the measured dialysate outlet pump rotor speed override \n
         command.
 
-        \param speed:  float - speed (in RPM) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param speed:  float - speed (in RPM) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -338,9 +338,9 @@
         """
         Constructs and sends the measured dialysate outlet flow broadcast interval override command
 
-        \param ms:  integer - interval (in ms) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param ms:  integer - interval (in ms) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -375,10 +375,10 @@
         """
         Constructs and sends the measured load cell weight override command.
 
-        \param weight:  float - weight (in g) to override with
-        \param sensor:  integer - ID of load cell to override
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param weight:  float - weight (in g) to override with
+        @param sensor:  integer - ID of load cell to override
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
 
         \details Load Cells: \n
             0 = reservoir 1 primary \n
@@ -420,11 +420,11 @@
         """
         Constructs and sends the set load cell weights command.
 
-        \param r1p:  float - weight (in g) for reservoir 1 primary load cell
-        \param r1b:  float - weight (in g) for reservoir 1 backup load cell
-        \param r2p:  float - weight (in g) for reservoir 2 primary load cell
-        \param r2b:  float - weight (in g) for reservoir 2 backup load cell
-        \returns 0 - no response will come from HD for this message
+        @param r1p:  float - weight (in g) for reservoir 1 primary load cell
+        @param r1b:  float - weight (in g) for reservoir 1 backup load cell
+        @param r2p:  float - weight (in g) for reservoir 2 primary load cell
+        @param r2b:  float - weight (in g) for reservoir 2 backup load cell
+        @return: 0 - no response will come from HD for this message
         """
 
         r1pb = float_to_bytearray(r1p)
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -r61479ce1965fdcf793913f5e58af92e56c3aea67 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 61479ce1965fdcf793913f5e58af92e56c3aea67)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -66,8 +66,8 @@
         """
         HD constructor using can bus
 
-        \param bus:  can bus, e.g. "can0"
-        \returns HD object provides test/service commands for the HD sub-system.
+        @param bus:  can bus, e.g. "can0"
+        @return: HD object provides test/service commands for the HD sub-system.
         \details For example:
 
             hd_object = HD(can_interface='can0') or
@@ -104,8 +104,8 @@
         Handles published HD operation mode messages.  Current HD operation mode
         is captured for reference.
 
-        \param message:  published HD operation mode broadcast message
-        \returns none
+        @param message:  published HD operation mode broadcast message
+        @return: none
         """
         mode = struct.unpack('i', bytearray(
             message['message'][self.START_POS_HD_OP_MODE:self.END_POS_HD_OP_MODE]))
@@ -117,7 +117,7 @@
         Constructs and sends a login command via CAN bus.  Login required before \n
         other commands can be sent to the HD.
 
-        \returns 1 if logged in, 0 if log in failed
+        @return: 1 if logged in, 0 if log in failed
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -144,9 +144,9 @@
         Constructs and sends the insert HD message command.  Given message will \n
         be inserted into the HD's received message queue for processing.
 
-        \param msg:  byte array - properly formatted HD message to insert
+        @param msg:  byte array - properly formatted HD message to insert
 
-        \returns 1 if successful, zero otherwise
+        @return: 1 if successful, zero otherwise
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
Index: dialin/hd/pressure_occlusion.py
===================================================================
diff -u -r4ec11967a99778fb8b4cb1177d1a049c47df7823 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/hd/pressure_occlusion.py	(.../pressure_occlusion.py)	(revision 4ec11967a99778fb8b4cb1177d1a049c47df7823)
+++ dialin/hd/pressure_occlusion.py	(.../pressure_occlusion.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -52,7 +52,7 @@
         """
         HDPressureOcclusion constructor
 
-        \returns HDPressureOcclusion object.
+        @return: HDPressureOcclusion object.
         """
         self.can_interface = can_interface
 
@@ -73,8 +73,8 @@
         Handles published pressure & occlusion data messages.  Pressure data are captured
         for reference.
 
-        \param message:  published pressure & occlusion data message
-        \returns none
+        @param message:  published pressure & occlusion data message
+        @return: none
         """
 
         art = struct.unpack('f', bytearray(
@@ -98,9 +98,9 @@
         """
         Constructs and sends the measured arterial pressure override command
 
-        \param pres:  float - measured arterial pressure (in mmHg) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param pres:  float - measured arterial pressure (in mmHg) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -135,9 +135,9 @@
         Constructs and sends the measured venous pressure \n
         override command.
 
-        \param pres:  float - venous pressure (in mmHg) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param pres:  float - venous pressure (in mmHg) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -171,9 +171,9 @@
         """
             Constructs and sends the measured blood pump occlusion pressure override command
 
-            \param occl:  float - pressure (in mmHg) to override with
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \returns 1 if successful, zero otherwise
+            @param occl:  float - pressure (in mmHg) to override with
+            @param reset:  integer - 1 to reset a previous override, 0 to override
+            @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -208,9 +208,9 @@
         Constructs and sends the measured dialysate inlet pump occlusion pressure override \n
         command.
 
-        \param occl:  float - pressure (in mmHg) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param occl:  float - pressure (in mmHg) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -245,9 +245,9 @@
         Constructs and sends the measured dialysate outlet pump occlusion pressure override \n
         command.
 
-        \param occl:  float - pressure (in mmHg) to override with
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param occl:  float - pressure (in mmHg) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
@@ -281,9 +281,9 @@
         """
             Constructs and sends the pressure/occlusion broadcast interval override command
 
-            \param ms:  integer - interval (in ms) to override with
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \returns 1 if successful, zero otherwise
+            @param ms:  integer - interval (in ms) to override with
+            @param reset:  integer - 1 to reset a previous override, 0 to override
+            @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
Index: dialin/hd/rtc.py
===================================================================
diff -u -r9d9105c7dc3379c2e14996522291b23a19e7ba46 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/hd/rtc.py	(.../rtc.py)	(revision 9d9105c7dc3379c2e14996522291b23a19e7ba46)
+++ dialin/hd/rtc.py	(.../rtc.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -36,9 +36,9 @@
         """
         HD_BloodFlow constructor
 
-        \param outer_instance: reference to the HD (outer) class.
+        @param outer_instance: reference to the HD (outer) class.
 
-        \returns HD_BloodFlow object.
+        @return: HD_BloodFlow object.
         """
         self.can_interface = can_interface
 
@@ -53,8 +53,8 @@
         """
             Publishes the rtc time in epoch
 
-            \param message:  published rtc epoch message
-            \returns none
+            @param message:  published rtc epoch message
+            @return: none
         """
         epoch = int.from_bytes(bytearray(
             message['message'][self.START_POS_SET_PT:self.END_POS_SET_PT]),
@@ -65,7 +65,7 @@
         """
             Constructs and sends the time and date to be written to rtc
 
-            \returns 1 if successful, zero otherwise
+            @return: 1 if successful, zero otherwise
         """
         sec = bytes([secs])
         mint = bytes([mins])
Index: dialin/hd/treatment.py
===================================================================
diff -u -r9d9105c7dc3379c2e14996522291b23a19e7ba46 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/hd/treatment.py	(.../treatment.py)	(revision 9d9105c7dc3379c2e14996522291b23a19e7ba46)
+++ dialin/hd/treatment.py	(.../treatment.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -73,8 +73,8 @@
         Handles published treatment time data messages.  treatment time data are captured
         for reference.
 
-        \param message:  published treatment time data message
-        \returns none
+        @param message:  published treatment time data message
+        @return: none
         """
 
         tot = struct.unpack('i', bytearray(
@@ -93,8 +93,8 @@
         Handles published treatment state data messages.  treatment state data are captured
         for reference.
 
-        \param message:  published treatment state data message
-        \returns none
+        @param message:  published treatment state data message
+        @return: none
         """
 
         tst = struct.unpack('i', bytearray(
Index: dialin/hd/ui_proxy.py
===================================================================
diff -u -rf1ac0e8ba99d1ddb0138918e408dffc0f5eba3c5 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision f1ac0e8ba99d1ddb0138918e408dffc0f5eba3c5)
+++ dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -112,7 +112,7 @@
         """
         HD_UI constructor
 
-        \param can_interface: the denali can interface object
+        @param can_interface: the denali can interface object
         """
         self.can_interface = can_interface
 
@@ -129,7 +129,7 @@
                                                                   self.MSG_ID_BLOOD_DIALYSATE_FLOW_SETTING_CHANGE_RESPONSE_FROM_HD,
                                                                   self.handler_blood_and_dialysate_change_response)
             self.can_interface.register_receiving_publication_function(channel_id, self.MSG_ID_HD_TREATMENT_PARAMS_RANGES,
-                                                                  self.handler_treatment_param_ranges)
+                                                                  self.handler_treatment_@param_ranges)
             self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, self.MSG_ID_UI_HD_VERSION_RESPONSE,
                                                                   self.handler_hd_version)
 
@@ -165,13 +165,13 @@
         """
         Handler for response from HD regarding its version.
 
-        \param message:  response message from HD regarding valid treatment parameter ranges.\n
+        @param message:  response message from HD regarding valid treatment parameter ranges.\n
             U08  Major \n
             U08  Minor \n
             U08  Micro \n
             U16  Build \n
 
-        \returns None if not successful, the version string if unpacked successfully
+        @return: None if not successful, the version string if unpacked successfully
         """
         major = struct.unpack('B', bytearray(
             message['message'][self.START_POS_MAJOR:self.END_POS_MAJOR]))
@@ -191,15 +191,15 @@
         """
         Handler for response from HD regarding valid treatment parameter ranges.
 
-        \param message:  response message from HD regarding valid treatment parameter ranges.\n
+        @param message:  response message from HD regarding valid treatment parameter ranges.\n
             U32  Minimum treatment duration setting (in min.). \n
             U32  Maximum treatment duration setting (in min.). \n
             U32  Minimum ultrafiltration volume (in mL). \n
             U32  Maximum ultrafiltration volume (in mL). \n
             U32  Minimum dialysate flow rate (in mL/min). \n
             U32  Maximum dialysate flow rate (in mL/min).
 
-        \returns none
+        @return: none
         """
         mintime = struct.unpack('i', bytearray(
             message['message'][self.START_POS_MIN_TREAT_TIME:self.END_POS_MIN_TREAT_TIME]))
@@ -225,13 +225,13 @@
         """
         Handler for response from HD regarding treatment duration change request.
 
-        \param message:  response message from HD regarding treatment duration change.\n
+        @param message:  response message from HD regarding treatment duration change.\n
             BOOL Accepted \n
             U32  Reject reason (if not accepted) \n
             U32  treatment duration (min) \n
             U32  UF volue (mL) \n
 
-        \returns none
+        @return: none
         """
         rsp = struct.unpack('i', bytearray(
             message['message'][self.START_POS_TIME_CHG_RSP_ACCEPTED:self.END_POS_TIME_CHG_RSP_ACCEPTED]))
@@ -251,13 +251,13 @@
         """
         Handler for response from HD regarding blood & dialysate flow rate change request.
 
-        \param message:  response message from HD regarding requested blood & dialysate flow rate settings change.\n
+        @param message:  response message from HD regarding requested blood & dialysate flow rate settings change.\n
             BOOL Accepted \n
             U32  Reject reason (if not accepted) \n
             U32  Blood flow rate (mL/min) \n
             U32  Dialysate flow rate (mL/min) \n
 
-        \returns none
+        @return: none
         """
         rsp = struct.unpack('i', bytearray(
             message['message'][self.START_POS_BLD_DIAL_CHG_RSP_ACCEPTED:self.END_POS_BLD_DIAL_CHG_RSP_ACCEPTED]))
@@ -281,7 +281,7 @@
         """
         Handler for response from HD regarding UF change request.
 
-        \param message:  response message from HD regarding requested ultrafiltration settings change.\n
+        @param message:  response message from HD regarding requested ultrafiltration settings change.\n
             BOOL Accepted \n
             U32  RejectReason (if not accepted)
             F32  UF Volume (mL) - converted to Liters \n
@@ -290,7 +290,7 @@
             F32  UF Rate (mL/min) \n
             F32  UF Rate Change (mL/min)
 
-        \returns none
+        @return: none
         """
         rsp = struct.unpack('i', bytearray(
             message['message'][self.START_POS_UF_CHG_RSP_RESP:self.END_POS_UF_CHG_RSP_RESP]))
@@ -323,7 +323,7 @@
         """
         Constructs and sends the ui check-in message
 
-        \returns 0
+        @return: 0
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -352,9 +352,9 @@
         """
         Constructs and sends a ui UF command message
 
-        \param cmd: 0 for pause, 1 for resume
+        @param cmd: 0 for pause, 1 for resume
 
-        \returns none
+        @return: none
         """
 
         payload = integer_to_bytearray(cmd)
@@ -376,9 +376,9 @@
         """
         Constructs and sends a ui UF change settings command message
 
-        \param vol (float): new ultrafiltration volume setting (in L)
+        @param vol (float): new ultrafiltration volume setting (in L)
 
-        \returns none
+        @return: none
         """
 
         # reset response to this command so we can tell when response is received
@@ -399,10 +399,10 @@
         """
         Constructs and sends a ui UF change settings command message
 
-        \param vol (float): new ultrafiltration volume setting (in L)
-        \param adj (int): 0 for adjust time, 1 for adjust rate
+        @param vol (float): new ultrafiltration volume setting (in L)
+        @param adj (int): 0 for adjust time, 1 for adjust rate
 
-        \returns none
+        @return: none
         """
 
         # reset response to this command so we can tell when response is received
@@ -426,12 +426,12 @@
         """
         Constructs and sends a ui UF change settings confirmed by user message
 
-        \param response (int): 0 for rejected, 1 for confirmed
-        \param vol (float): volume (in L) that was confirmed
-        \param tm (int): treatment time (in min) that was confirmed
-        \param rate (float): ultrafiltration rate (in mL/min) that was confirmed
+        @param response (int): 0 for rejected, 1 for confirmed
+        @param vol (float): volume (in L) that was confirmed
+        @param tm (int): treatment time (in min) that was confirmed
+        @param rate (float): ultrafiltration rate (in mL/min) that was confirmed
 
-        \returns none
+        @return: none
         """
 
         resp = integer_to_bytearray(response)
@@ -453,9 +453,9 @@
         """
             Constructs and sends a ui UF change settings confirmed by user message
 
-            \param timeMin (int): treatment time (in min).
+            @param timeMin (int): treatment time (in min).
 
-            \returns none
+            @return: none
         """
 
         payload = integer_to_bytearray(timeMin)
@@ -474,10 +474,10 @@
         """
         Constructs and sends a ui blood & dialysate flow settings change request by user message
 
-        \param bloodFlow (int): blood flow rate set point (in mL/min).
-        \param dialFlow (int): dialysate flow rate set point (in mL/min).
+        @param bloodFlow (int): blood flow rate set point (in mL/min).
+        @param dialFlow (int): dialysate flow rate set point (in mL/min).
 
-        \returns none
+        @return: none
         """
 
         bld = integer_to_bytearray(bloodFlow)
Index: dialin/hd/watchdog.py
===================================================================
diff -u -r9d9105c7dc3379c2e14996522291b23a19e7ba46 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/hd/watchdog.py	(.../watchdog.py)	(revision 9d9105c7dc3379c2e14996522291b23a19e7ba46)
+++ dialin/hd/watchdog.py	(.../watchdog.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -33,9 +33,9 @@
         """
         HD_Watchdog constructor
 
-        \param outer_instance: reference to the HD (outer) class.
+        @param outer_instance: reference to the HD (outer) class.
 
-        \returns HD_Watchdog object.
+        @return: HD_Watchdog object.
         """
 
         self.can_interface = can_interface
@@ -44,10 +44,10 @@
         """
         Constructs and sends the watchdog task check-in override command
 
-        \param state:  integer - 1 for task checked in, 0 for task not checked in
-        \param task:  integer - ID of task to override
-        \param reset:  integer - 1 to reset a previous override, 0 to override
-        \returns 1 if successful, zero otherwise
+        @param state:  integer - 1 for task checked in, 0 for task not checked in
+        @param task:  integer - ID of task to override
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
Index: dialin/protocols/CAN.py
===================================================================
diff -u -r61479ce1965fdcf793913f5e58af92e56c3aea67 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/protocols/CAN.py	(.../CAN.py)	(revision 61479ce1965fdcf793913f5e58af92e56c3aea67)
+++ dialin/protocols/CAN.py	(.../CAN.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -61,9 +61,9 @@
         """
         Builds a basic message dictionary containing the channel id and message
 
-        \param channel_id: integer with channel id
-        \param message: an array of ints forming the message
-        \return: dictionary with channel_id and message keys
+        @param channel_id: (int) indicates the channel
+        @param message: (list) integers forming the message
+        @return:: dictionary with channel_id and message keys
         """
         if message is None:
             message = []
@@ -72,13 +72,12 @@
     @staticmethod
     def build_message(channel_id=0, message_id=0, payload=None):
         """
-        buildPacket builds a Diality Packet
+        Builds a Denali message
 
-        \param channel_id: is an integer with channel ID
-        \param message_id: is an integer indicating request ID
-        \param payload: list with payload. It does not include length
-
-        \return dictionary with channel_id and 8-byte padded message
+        @param channel_id: (int) indicates the channel
+        @param message_id: (int) indicating the request type
+        @param payload:  (list) contains the payload
+        @return:: dictionary with channel_id and 8-byte padded message
         """
 
         if payload is None:
@@ -128,8 +127,8 @@
         """
         Returns the calculated crc from a message list
 
-        \param message_list: is a list of integer numbers containing the message
-        \return: integer containing a unsigned byte
+        @param message_list: is a list of integer numbers containing the message
+        @return:: integer containing a unsigned byte
         """
         crc = 0
         for byte in message_list:
@@ -143,8 +142,8 @@
         """
         Returns a packet padded with zeros that guarantees that the packet is a multiple of 8 bytes.
 
-        \param message: packet that may or may not be multiple of 8 bytes
-        \return: packet that is 8-byte multiple
+        @param message: packet that may or may not be multiple of 8 bytes
+        @return:: packet that is 8-byte multiple
 
         """
         message_length = len(message)
@@ -164,9 +163,9 @@
         """
         Gets the CRC in message
 
-        \param message: Dialin complete message with CRC
+        @param message: Dialin complete message with CRC
 
-        \return: CRC in message
+        @return:: CRC in message
         """
 
         crc_index = DenaliMessage.PAYLOAD_START_INDEX + DenaliMessage.get_payload_length(message)
@@ -178,7 +177,7 @@
         """
         Verifies message CRC equals calculated message CRC
 
-        \return: TRUE if CRC matches, FALSE otherwise
+        @return:: TRUE if CRC matches, FALSE otherwise
         """
 
         if message is None:
@@ -197,8 +196,8 @@
         """
         Returns request ID from message
 
-        \param message: dictionary with channel_id and message keys
-        \return: integer with channel id
+        @param message: dictionary with channel_id and message keys
+        @return:: integer with channel id
 
         """
 
@@ -209,9 +208,9 @@
         """
         Returns request ID from packet
 
-        \param message: complete Diality Packet
+        @param message: complete Diality Packet
 
-        \return: integer with request ID
+        @return:: integer with request ID
 
         """
         msg_id_array = message['message'][DenaliMessage.MSG_ID_INDEX:
@@ -224,8 +223,8 @@
         """
         Returns payload length from message
 
-        \param message: dictionary with channel_id and message keys
-        \return: a unsigned payload length
+        @param message: dictionary with channel_id and message keys
+        @return:: a unsigned payload length
         """
         return message['message'][DenaliMessage.PAYLOAD_LENGTH_INDEX]
 
@@ -234,8 +233,8 @@
         """
         Returns payload array from message
 
-        \param message: dictionary with channel_id and message keys
-        \return: a payload array if exist
+        @param message: dictionary with channel_id and message keys
+        @return:: a payload array if exist
         """
 
         payload_length = DenaliMessage.get_payload_length(message)
@@ -250,9 +249,9 @@
         """
         Returns the number of packets needed to transmit Denali Message
 
-        \param message: dictionary with channel_id and message keys or raw message
-        \param is_array: True if message is an array and not a dictionary
-        \return: number of packets
+        @param message: dictionary with channel_id and message keys or raw message
+        @param is_array: True if message is an array and not a dictionary
+        @return:: number of packets
         """
         the_message = message if is_array else message['message']
 
@@ -302,10 +301,9 @@
 
         message = obj.push(msg3), return the packet which is the concatenation of msg1, msg2 and msg3
 
-        \param can_message: an 8 byte message needed to build a diality message.
+        @param can_message: an 8 byte message needed to build a diality message.
+        @return: object
 
-        \returns object
-
         """
         self.message = can_message
         self.number_of_can_packets_needed = DenaliMessage.get_total_packets(can_message)
@@ -315,11 +313,11 @@
         """
         push appends the can_message to the current packet.
 
-        \param can_message: 8-byte message
+        @param can_message: 8-byte message
 
-        \param first_packet: True if it is the first packet received
+        @param first_packet: True if it is the first packet received
 
-        \return: None if the packet is not completed, otherwise returns the complete packet
+        @return:: None if the packet is not completed, otherwise returns the complete packet
         """
         if first_packet:
             self.message = can_message
@@ -347,10 +345,9 @@
         """
         DenaliCanMessenger constructor
 
-        \param can_interface - string containing the can interface, e.g., 'can0"
+        @param can_interface - string containing the can interface, e.g., 'can0"
+        @return: DialityCanMessenger object
 
-        \returns DialityCanMessenger object
-
         """
         self.bus = can.interfaces.socketcan.SocketcanBus(channel=can_interface)
         self.listener_buffer = can.BufferedReader()
@@ -511,12 +508,12 @@
 
     def register_receiving_publication_function(self, channel_id, message_id, function):
         """
-        assign a function with packet parameter to an sync request id, e.g.,
+        Assign a function with packet parameter to an sync request id, e.g.,
         def function(packet).
 
-        \param channel_id: can channel number where messages are received
-        \param message_id: Diality request ID in message
-        \param function: function reference
+        @param channel_id: can channel number where messages are received
+        @param message_id: Diality request ID in message
+        @param function: function reference
         """
 
         # if the channel_id exist, we just update the dictionary for the channel_id
@@ -531,10 +528,10 @@
         """
         sends can_packet to channel_id.
 
-        \param built_message: message built using DialinMessage class
-        \param time_out: time it will wait for a response in seconds
+        @param built_message: message built using DialinMessage class
+        @param time_out: time it will wait for a response in seconds
 
-        \returns: Diality Packet, it it times out it returns None
+        @return:: Diality Packet, it it times out it returns None
         """
 
         msg_sent = False
@@ -609,10 +606,10 @@
         Prints a message if its severity is >= the current log level.
         Also logs the message.
 
-        \param message: The message to print and log
-        \param log_level: The logging level, indicates the severity of the message
+        @param message: The message to print and log
+        @param log_level: The logging level, indicates the severity of the message
 
-        \returns: None
+        @return:: None
         """
         if not self.logging_enabled:
             return
Index: dialin/utils/conversions.py
===================================================================
diff -u -r8c39fe1f9affe360ee6a97c5e6243e58a5c27509 -rc6596d42d995bed3789849bd85c83da5a3837fac
--- dialin/utils/conversions.py	(.../conversions.py)	(revision 8c39fe1f9affe360ee6a97c5e6243e58a5c27509)
+++ dialin/utils/conversions.py	(.../conversions.py)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -6,8 +6,8 @@
     """
     Converts an integer value into a byte array (little endian)
 
-    \param val:  integer to convert to byte array
-    \returns byte array
+    @param val:  integer to convert to byte array
+    @return: byte array
     """
     fmt = '%08x'  # integer to hex string formatter
     b = unhexlify(fmt % val)  # convert int to byte array
@@ -19,8 +19,8 @@
     """
     Converts a float value into a byte array (little endian)
 
-    \param val:  float to convert to byte array
-    \returns byte array
+    @param val:  float to convert to byte array
+    @return:: byte array
     """
     b = struct.pack('<f', val)
     return b
Index: docs/Makefile
===================================================================
diff -u
--- docs/Makefile	(revision 0)
+++ docs/Makefile	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+SPHINXPROJ    = Dialin
+SOURCEDIR     = source
+BUILDDIR      = build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file
Index: docs/source/README.rst
===================================================================
diff -u
--- docs/source/README.rst	(revision 0)
+++ docs/source/README.rst	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -0,0 +1,114 @@
+.. image:: images/logo.jpg
+   :target: images/logo.jpg
+   :alt: Diality
+
+The Dialin API supports cross-functional testing of the Denali system.
+It supports the Systems level testing, Software Verification & Validation, and pre-release SW and FW developmental 
+testing by exposing and simulating interaction with the UI, HD, and DG sub-components.
+
+To use this API, it is recommended to install the API directly from a pre-packaged .whl file. 
+Once installed to your local virtual python environment with pip, you can import modules as needed to develop your tests. 
+
+Installation
+==================================
+
+* Assumes your ssh key has already been setup with our internal BitBucket servers
+* Assumes your computer is in the office or that you are using LogMeIn. The VPN has a DNS issue which may break 
+  the installation.
+
+All release versions will eventually be placed on their own separate branch to facilitate 
+backwards compatibility and a fully accessible and testable API version history.
+
+How to install from the master branch, which contains the latest in-development changes (Available!)
+
+.. code-block::
+
+   #!/bin/bash
+
+   virtualenv --python=python3 venv
+   source venv/bin/activate
+   pip3 install git+ssh://git@dvm-linux02:7999/vv/dialin.git
+
+How to install a specific release version (Not yet available)
+
+.. code-block::
+
+   #!/bin/bash
+
+   virtualenv --python=python3 venv
+   source venv/bin/activate
+   branch="0.0.1" # update the branch_name here
+   pip3 install git+ssh://git@dvm-linux02:7999/vv/dialin.git@$branch
+
+Install from a pre-built .whl file:
+==================================
+
+.. code-block::
+
+   #!/bin/bash
+
+   virtualenv --python=python3 venv
+   source venv/bin/activate
+   pip3 install dialin-0.0.1-py3-none-any.whl
+
+Modules
+==================================
+
+
+* See the tests directory for examples of how to use this API
+* Also consult the Dialin API documentation which can be generated using the ``tools/document.sh`` script.
+
+.. code-block::
+
+   from dialin.hd.alarms import HDAlarms
+   from dialin.hd.blood_flow import HDBloodFlow
+   from dialin.hd.buttons import HDButtons
+   from dialin.hd.constants import RESET, NO_RESET
+   from dialin.hd.dialysate_inlet_flow import HDDialysateInletFlow
+   from dialin.hd.dialysate_outlet_flow import HDDialysateOutletFlow
+   from dialin.hd.hemodialysis_device import HD
+   from dialin.hd.pressure_occlusion import HDPressureOcclusion
+   from dialin.hd.rtc import HDRTC
+   from dialin.hd.treatment import HDTreatment
+   from dialin.hd.ui_proxy import HDUIProxy
+   from dialin.hd.watchdog import HDWatchdog
+
+
+   from dialin.dg.dialysate_generator import DG
+
+
+   from dialin.protocols.CAN import (DenaliCanMessenger,
+                                     DenaliMessage,
+                                     DenaliChannels,
+                                     LongDenaliMessageBuilder)
+
+
+   from dialin.utils.conversions import (integer_to_bytearray,
+                                         float_to_bytearray)
+
+Internal API Development Environment
+==================================
+After cloning this repository, inside the repository root directory: 
+
+.. code-block::
+
+   $ cd tools 
+   $ ./setup_environment.sh
+
+Unit Testing
+==================================
+
+All internal tests of the dialin API can be found in the tests directory at the root of
+this git repository:
+
+.. code-block::
+
+   (venv) $ cd tests
+   (venv) $ python3 dialin_unit_test_example.py
+
+Building the Dialin package
+==================================
+
+.. code-block::
+
+   $ ./build.sh
Index: docs/source/conf.py
===================================================================
diff -u
--- docs/source/conf.py	(revision 0)
+++ docs/source/conf.py	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -0,0 +1,171 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Dialin documentation build configuration file, created by
+# sphinx-quickstart on Fri May 29 15:33:59 2020.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+import os
+import sys
+sys.path.insert(0, os.path.abspath('../../'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+        'sphinx.ext.autodoc', 
+        'sphinx_epytext',
+        ]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'Dialin'
+copyright = '2020, Peter Lucia'
+author = 'Peter Lucia'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.1.0'
+# The full version, including alpha/beta/rc tags.
+release = '0.1.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This patterns also effect to html_static_path and html_extra_path
+exclude_patterns = []
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'nature'
+
+# 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
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Custom sidebar templates, must be a dictionary that maps document names
+# to template names.
+#
+# This is required for the alabaster theme
+# refs: http://alabaster.readthedocs.io/en/latest/installation.html#sidebars
+html_sidebars = {
+    '**': [
+        'relations.html',  # needs 'show_related': True theme option to display
+        'searchbox.html'
+    ]
+}
+
+
+# -- Options for HTMLHelp output ------------------------------------------
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'Dialindoc'
+
+
+# -- Options for LaTeX output ---------------------------------------------
+
+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',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'Dialin.tex', 'Dialin Documentation',
+     'Peter Lucia', 'manual'),
+]
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'dialin', 'Dialin Documentation',
+     [author], 1)
+]
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'Dialin', 'Dialin Documentation',
+     author, 'Dialin', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+
+
Index: docs/source/images
===================================================================
diff -u
--- docs/source/images	(revision 0)
+++ docs/source/images	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -0,0 +1 @@
+../../images/
\ No newline at end of file
Index: docs/source/index.rst
===================================================================
diff -u
--- docs/source/index.rst	(revision 0)
+++ docs/source/index.rst	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -0,0 +1,23 @@
+.. Dialin documentation master file, created by
+   sphinx-quickstart on Fri May 29 15:33:59 2020.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
+
+Dialin API Documentation
+==================================
+.. contents::
+.. include:: README.rst
+
+.. toctree::
+   :hidden:
+   index
+
+
Fisheye: Tag c6596d42d995bed3789849bd85c83da5a3837fac refers to a dead (removed) revision in file `document/Doxyfile'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c6596d42d995bed3789849bd85c83da5a3837fac refers to a dead (removed) revision in file `document/py_filter.sh'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: requirements.txt
===================================================================
diff -u -r6ab9b1c14952ed9afe17694c65068a08aa27481e -rc6596d42d995bed3789849bd85c83da5a3837fac
--- requirements.txt	(.../requirements.txt)	(revision 6ab9b1c14952ed9afe17694c65068a08aa27481e)
+++ requirements.txt	(.../requirements.txt)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -1,11 +1,37 @@
 aenum==2.2.3
+alabaster==0.7.12
+Babel==2.8.0
+certifi==2020.4.5.1
+chardet==3.0.4
+commonmark==0.9.1
 cycler==0.10.0
+docutils==0.16
 doxypypy==0.8.8.6
+idna==2.9
+imagesize==1.2.0
+Jinja2==2.11.2
 kiwisolver==1.1.0
+m2r==0.2.1
+MarkupSafe==1.1.1
 matplotlib==3.2.1
+mistune==0.8.4
 numpy==1.18.2
+packaging==20.4
+Pygments==2.6.1
 pyparsing==2.4.6
 python-can==3.3.2
 python-dateutil==2.8.1
+pytz==2020.1
+requests==2.23.0
 six==1.14.0
+snowballstemmer==2.0.0
+Sphinx==3.0.4
+sphinx-epytext==0.0.4
+sphinxcontrib-applehelp==1.0.2
+sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-htmlhelp==1.0.3
+sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-serializinghtml==1.1.4
+urllib3==1.25.9
 wrapt==1.12.0
Index: tools/document.sh
===================================================================
diff -u -r6ab9b1c14952ed9afe17694c65068a08aa27481e -rc6596d42d995bed3789849bd85c83da5a3837fac
--- tools/document.sh	(.../document.sh)	(revision 6ab9b1c14952ed9afe17694c65068a08aa27481e)
+++ tools/document.sh	(.../document.sh)	(revision c6596d42d995bed3789849bd85c83da5a3837fac)
@@ -14,8 +14,31 @@
 #  @brief Generates doxygen documentation
 #
 ############################################################################
+# Assumes you have already run the following setup:
+
+CURR_DIR=$(pwd)
+if [[ "$@" == "*--setup*" ]]; then
+    sudo apt-get install python3-sphinx
+    mkdir -p ../docs/
+    cd ../docs/
+
+    # must be run outside of venv
+    sphinx-quickstart 
+
+    read -p "Press 'Enter' once you have added dialin to the sys path in conf.py..."
+    source ../venv/bin/activate
+    pip3 install sphinx
+    cd $CURR_DIR
+fi
 cd ../
-export PROJECT_DIRECTORY=$(pwd)
-rm -rf document/html
-doxygen document/Doxyfile
-xdg-open document/html/index.html
+sphinx-apidoc -o docs/source dialin
+cd docs/
+if [[ "$@" == "*--clean*" ]]; then
+    make clean
+fi
+if [[ "$@" == "*--readme*" ]]; then
+    m2r ../README.md
+    mv ../README.rst source/
+fi
+make html
+xdg-open build/html/index.html