Updated to pubScribe and added hypothetical DAC example.

Author: BrucesHobbies

mcp4725.py

@@ -41,7 +41,7 @@
 
 
 RASPBERRY PI I2C PINS to DAC (2-wires plus power and ground):
-  RPI 40-pin           MCP4275 DAC in 6-pin SOT-23-6
+  RPI 40-pin           MCP4725 DAC in 6-pin SOT-23-6
                      = Pin 1 Vout
                      = Pin 2 Vss (ground reference)
                      = Pin 3 Vdd (2.7V - 5.5V)
@@ -69,21 +69,17 @@
 import smbus    # I2C support
 
 
-class mcp4275 :
+class mcp4725 :
     def __init__(self) :
         self.OUTPUT_MAX = 4095    # 2^12-1 counts
 
         # I2C address is not 0x62 or 0x63 per the data sheet, but 0x60
         self.i2c_address = 0x60
         print("mcp4275 i2c address: " + hex(self.i2c_address))
 
-        # initialize bus
-        i2c_ch = 1                     # i2c channel
-        self.bus=smbus.SMBus(i2c_ch)   # Initialize I2C (SMBus)
-
 
     def __del__(self) :
-        self.bus.close()
+        return
 
 
     def writeDAC(self, value):
@@ -117,6 +113,34 @@ def writeDAC(self, value):
 
         return
 
+    def alg(self, data):
+        print("Alg data: ", data)
+
+        #
+        # Insert algorithm here...
+        # Hypothetical example. Not tested.
+        #
+
+        fanMin = 0.5
+        fanMax = 0.9
+        radonMin = 40
+        RadonMax = 150
+        SF = (fanMax - fanMin) / (radonMax - radonMin)
+
+        fanValue = fanMin + (data[0] - radonMin) * SF
+
+        if fanValue > fanMax :
+            fanValue = fanMax
+        elif fanValue < fanMin :
+            fanValue = fanMin
+
+        print("FanValue: ", fanValue)
+
+        self.writeDAC(fanValue)
+
+        return
+
+
 # end class
 
 
@@ -125,7 +149,11 @@ def writeDAC(self, value):
     print("Press CTRL+C to exit...")
 
     try:
-        dac = mcp4275()
+        dac = mcp4725()
+
+        # initialize bus
+        i2c_ch = 1                    # i2c channel
+        dac.bus=smbus.SMBus(i2c_ch)   # Initialize I2C (SMBus)
 
         while True:
             print("Enter value (0.0 - 1.0): ")
@@ -134,3 +162,5 @@ def writeDAC(self, value):
 
     except KeyboardInterrupt:
         print(" Keyboard interrupt caught, exiting.")
+
+    dac.bus.close()

radonMasterPlot.py

@@ -9,6 +9,8 @@
 REVISION HISTORY
   DATE        AUTHOR          CHANGES
   yyyy/mm/dd  --------------- -------------------------------------
+  2021/03/01  BrucesHobbies   Revised default log file names
+  2021/03/05  BrucesHobbies   Updated for pubScribe
 
 
 OVERVIEW:
@@ -53,107 +55,108 @@
 #
 # Read in a comma seperated variable file. Assumes a header row exists.
 #   Time series with time in seconds in first column.
+#   Ignore text string with date/time from second column
+#   data is columns [2:]
 #
 def importCsv(filename) :
     print("Reading " + filename)
 
     with open(filename, 'r') as csvfile :
-        data = list(csv.reader(csvfile))
+        csvData = list(csv.reader(csvfile))
 
-    header = data[0]
-    print(header)
+    hdr = csvData[0]
+    print(hdr)
 
-    a = np.array(data[1:], dtype=np.float)
+    tStamp = []
+    for row in csvData[1:] :
+        tStamp.append(float(row[0]))
 
-    print("Elements: ", a.size)
-    print("Rows    : ", len(a[:,0]))
-    print("Cols    : ", len(a[0,:]))
+    data = {name : [] for name in hdr[2:]}
+    # print(data)
+
+    for row in csvData[1:] :
+        for idx in range(2,len(hdr)) :
+            n = float(row[idx])
+            if n == -99 :
+                n = np.nan
+            data[hdr[idx]].append(n)
+
+    return hdr[2:], tStamp, data
 
-    return header, a
 
 #
-# Plot Short-Term and Long-Term radon levels
-#   thresholds(y_value,"label")
+# Plot single or multiple variables {"key":[]} on common subplot
 #
-def plotRadon(thresholds) :
+def plotMultiVar(tStamp, data, title) :
+
+    t = [datetime.datetime.fromtimestamp(ts) for ts in tStamp]
+
     fig = plt.figure()
     ax1 = fig.add_subplot(1, 1, 1)
 
-    ax1.plot(t, a[:,1], 'b', label='ST')
-    ax1.plot(t, a[:,2], 'r', label='LT')
-    # ax1.plot(t, a[:,1], 'b', marker='d', label='ST')
-    # ax1.plot(t, a[:,2], 'r', marker='d', label='LT')
+    for item in data :
+        # print(item)
+        ax1.plot(t, data[item], label=item)
+        # ax1.plot(t, data[item], marker='d', label=item)
 
-    for item in thresholds :
-        ax1.plot([t[0], t[len(t)-1]], [item[0], item[0]], item[1])
+    ax1.set_title(title)
 
-    ax1.set_title("Radon")
-    ax1.set_xlabel('Time')
-    ax1.set_ylabel(header[1][9:])
-    ax1.legend(loc='upper right', shadow=True)
+    if len(data) > 1 :
+        ax1.legend(loc='upper right', shadow=True)
+    else :
+        ax1.set_ylabel(item)
 
     ax1.grid(which='both')
+
     plt.gcf().autofmt_xdate()    # slant labels
     dateFmt = mdates.DateFormatter('%Y-%m-%d %H:%M')
     plt.gca().xaxis.set_major_formatter(dateFmt)
 
-    plt.show(block=False)
 
 #
-# Plot VOC, CO2, Temperature, Relative, Humidity, and air pressure
+# Plot single variable {"item":[]}
 #
-def plotSingle(var, ylabel, title) :
+def plotSingleVar(tStamp, data, title, item) :
+
+    t = [datetime.datetime.fromtimestamp(ts) for ts in tStamp]
+
     fig = plt.figure()
     ax1 = fig.add_subplot(1, 1, 1)
 
-    ax1.plot(t, var)
-    # ax1.plot(t, var, marker='d')
+    ax1.plot(t, data[item], label=item)
+    # ax1.plot(t, data[item], marker='d', label=item)
 
     ax1.set_title(title)
-    ax1.set_xlabel('Time')
-    ax1.set_ylabel(ylabel)
-    
+    ax1.set_ylabel(item)
+
     ax1.grid(which='both')
+
     plt.gcf().autofmt_xdate()    # slant labels
     dateFmt = mdates.DateFormatter('%Y-%m-%d %H:%M')
     plt.gca().xaxis.set_major_formatter(dateFmt)
 
-    plt.show(block=False)
 
 #
 # Plot two files
 #
 if __name__ == "__main__" :
 
-    # --- Radon Short-term and Long-term ---
-    #  (time in column 0, data in columns 1 - 2)
-    # filename = "radonLogFile.csv"
-    filename = "waveLogFile.csv"
-    header, a = importCsv(filename)
-
-    tstamp = []
-    for item in a[:,0] :
-        tstamp.append(item)
-    t = [datetime.datetime.fromtimestamp(ts) for ts in tstamp]
-
-    plotRadon([(1.3, 'g--'),(2.7, 'y--'),(4.0, 'r--')])
-
-    # Plot remaining data from WavePlus (columns 4 - 8)
-    for col in range(3, len(header)-1) :
-        plotSingle(a[:,col],header[col],header[col])
+    # --- WavePlus data ---
+    #  (time in column 0, data in columns 2:)
+    filename = "RadonMaster_WavePlus.csv"
+    header, tStamp, data = importCsv(filename)
 
+    for item in data :
+        plotSingleVar(tStamp, data, filename[:-4], item)
 
     # --- Mitigation fan pressure ---
-    filename = "radonMaster.csv"
-    header, a = importCsv(filename)
-
-    tstamp = []
-    for item in a[:,0] :
-        tstamp.append(item)
-    t = [datetime.datetime.fromtimestamp(ts) for ts in tstamp]
+    filename = "RadonMaster_PresSensor.csv"
+    header, tStamp, data = importCsv(filename)
 
-    plotSingle(a[:,1],'Inches W.C.','Mitigation Fan Vacuum')
+    plotMultiVar(tStamp, data, 'Mitigation Fan Vacuum')
 
     # Pause to close plots
+    plt.show(False)    # Blocks, user must close plot window
+    print("")
     input("Press [enter] key to close plots...")
     print("Done...")

wave.py

@@ -58,6 +58,15 @@
 
 import pubScribe
 
+MCP4725_ENABLED = 0
+
+if MCP4725_ENABLED :
+    import mcp4725
+    dac = mcp4725.mcp4725()
+    # initialize bus
+    # i2c_ch = 1                    # i2c channel
+    # dac.bus=smbus.SMBus(i2c_ch)   # Initialize I2C (SMBus)
+
 
 SerialNumber = 0
 
@@ -66,7 +75,6 @@
 MODE='terminal'
 
 LOGGING_ENABLED = 1
-# wpLogFilename   = "waveLogFile.csv"
 
 #
 # find_wave and read_waveplus both require bluepy, SerialNumber==0 indicates bluepy lib or wave not found
@@ -285,11 +293,6 @@ def writeHeaders() :
         # print(hdrRow[5:])
         print(hdrRow)
 
-    """
-    if LOGGING_ENABLED and not os.path.isfile(wpLogFilename) :
-        # If csv log file does not exist, write header
-        write2Csv(hdrRow)
-    """
 
 
 #
@@ -327,19 +330,17 @@ def readAirthings() :
 
         if LOGGING_ENABLED :
             data = [radon_st_avg, radon_lt_avg, VOC_lvl, CO2_lvl, temperature, humidity, pressure]
-            """
-                rowStr = str(round(time.time())) + ","
-                for item in data :
-                    rowStr = rowStr + str(item) + ","
-                write2Csv(rowStr[:-1])
-            """
             topic = "RadonMaster/WavePlus"
             pubScribe.pubRecord(pubScribe.CSV_FILE, topic, data, hdrRow)
 
             results = formatLocalTime() + " " + str(sensor2StringUnits(sensors))
 
             alert, s = checkAlerts(radon_st_avg, VOC_lvl, CO2_lvl, temperature, humidity)
 
+        if MCP4725_ENABLED :
+            dac.alg(data)
+
+
     except :
         print("Exception!!!")
         waveplus.disconnect()