old mode 100644

new mode 100755

@@ -51,9 +51,10 @@ class ina260:

         # Initialize INA260 sensor.  See the data sheet for meaning of

         # each bit.  The following bytes are written to the configuration

         # register

-        #     byte 1: 01100000

+        #     byte 1: 11100000

         #     byte 2: 00100111

-        initData = [0x60, 0x27]

+        initData = [0b11100000, 0b00100111]

+        #initData = [0x60, 0x27]

         self.bus.write_i2c_block_data(self.sensorAddr, CONFIG_REG, initData)

     ## end def

@@ -69,6 +70,15 @@ class ina260:

         return (mfcidB1, mfcidB2, configB1, configB2)

     ## end def

+    def getCurrentReg(self):

+        # Read current register and return raw binary data for test and

+        # debug.

+        data = self.bus.read_i2c_block_data(self.sensorAddr, CUR_REG, 2)

+        dataB1 = format(data[0], "08b")

+        dataB2 = format(data[1], "08b")

+        return (dataB1, dataB2)

+    ## end def

+

     def getCurrent(self):

         # Get the current data from the sensor.

         # INA260 returns the data in two bytes formatted as follows

@@ -86,15 +96,24 @@ class ina260:

         bdata = data[0] << 8 | data[1]

         # Convert from two's complement to integer.

         # If d15 is 1, the the number is a negative two's complement

-        # number.  The absolute value is 2^15 - 1 minus the value

+        # number.  The absolute value is 2^16 - 1 minus the value

         # of d14-d0 taken as a positive number.

         if bdata > 0x7FFF:

-            bdata = -(0xFFFF - bdata) # 0xFFFF is 2^15 - 1

+            bdata = -(0xFFFF - bdata) # 0xFFFF is 2^16 - 1

         # Convert integer data to mAmps.

         mAmps = bdata * 1.25  # LSB is 1.25 mA

         return mAmps

     ## end def

+    def getVoltageReg(self):

+        # Read voltage register and return raw binary data for test

+        # and debug.

+        data = self.bus.read_i2c_block_data(self.sensorAddr, VOLT_REG, 2)

+        dataB1 = format(data[0], "08b")

+        dataB2 = format(data[1], "08b")

+        return (dataB1, dataB2)

+    ## end def

+

     def getVoltage(self):

         # Get the voltage data from the sensor.

         # INA260 returns the data in two bytes formatted as follows

@@ -138,7 +157,9 @@ def test():

     print "manufacturer ID: %s %s\nconfiguration register: %s %s\n" % data

     # Print out sensor values.

     while True:

+        print "current register: %s %s" % pwr1.getCurrentReg()

         print "%6.2f mA" % pwr1.getCurrent()

+        print "volt register: %s %s" % pwr1.getVoltageReg()

         print "%6.2f V" % pwr1.getVoltage()

         print "%6.2f mW\n" % pwr1.getPower()

         time.sleep(2)

old mode 100644

new mode 100755

@@ -77,6 +77,8 @@ _CHART_UPDATE_INTERVAL = 600

 _CHART_WIDTH = 600

 # standard chart height in pixels

 _CHART_HEIGHT = 150

+# chart average line color

+_AVERAGE_LINE_COLOR = '#006600'

    ### GLOBAL VARIABLES ###

@@ -105,7 +107,7 @@ def getTimeStamp():

     Returns: string containing the time stamp

     """

     return time.strftime( "%m/%d/%Y %T", time.localtime() )

-##end def

+## end def

 def getEpochSeconds(sTime):

     """Convert the time stamp supplied in the weather data string

@@ -122,7 +124,7 @@ def getEpochSeconds(sTime):

         return None

     tSeconds = int(time.mktime(t_sTime))

     return tSeconds

-##end def

+## end def

 def terminateAgentProcess(signal, frame):

     """Send a message to log when the agent process gets killed

@@ -138,7 +140,7 @@ def terminateAgentProcess(signal, frame):

     print '%s terminating npw agent process' % \

               (getTimeStamp())

     sys.exit(0)

-##end def

+## end def

   ###  PUBLIC METHODS  ###

@@ -161,7 +163,7 @@ def getSensorData(dData):

         return False

     return True

-##end def

+## end def

 def updateDatabase(dData):

     """

@@ -193,7 +195,7 @@ def updateDatabase(dData):

         return False

     return True

-##end def

+## end def

 def writeOutputDataFile(dData):

     """Write node data items to the output data file, formatted as 

@@ -236,7 +238,8 @@ def writeOutputDataFile(dData):

 ## end def

 def createGraph(fileName, dataItem, gLabel, gTitle, gStart,

-                lower, upper, addTrend, autoScale):

+                lower, upper, trendLine, scaleFactor=1, autoScale=True, 

+                alertLine=""):

     """Uses rrdtool to create a graph of specified node data item.

        Parameters:

            fileName - name of file containing the graph

@@ -246,12 +249,17 @@ def createGraph(fileName, dataItem, gLabel, gTitle, gStart,

            gStart - beginning time of the graphed data

            lower - lower bound for graph ordinate #NOT USED

            upper - upper bound for graph ordinate #NOT USED

-           addTrend - 0, show only graph data

-                      1, show only a trend line

-                      2, show a trend line and the graph data

+           trendLine 

+                0, show only graph data

+                1, show only a trend line

+                2, show a trend line and the graph data

+           scaleFactor - amount to pre-scale the data before charting

+                the data [default=1]

            autoScale - if True, then use vertical axis auto scaling

-               (lower and upper parameters are ignored), otherwise use

-               lower and upper parameters to set vertical axis scale

+                (lower and upper parameters must be zero)

+           alertLine - value for which to print a critical

+                low voltage alert line on the chart. If not provided

+                alert line will not be printed.

        Returns: True if successful, False otherwise

     """

     gPath = _CHARTS_DIRECTORY + fileName + ".png"

@@ -277,16 +285,21 @@ def createGraph(fileName, dataItem, gLabel, gTitle, gStart,

     # Show the data, or a moving average trend line over

     # the data, or both.

-    strCmd += "DEF:dSeries=%s:%s:LAST " % (_RRD_FILE, dataItem)

-    if addTrend == 0:

+    strCmd += "DEF:rSeries=%s:%s:LAST " % (_RRD_FILE, dataItem)

+    strCmd += "CDEF:dSeries=rSeries,%s,/ " % (scaleFactor)

+

+    if trendLine == 0:

         strCmd += "LINE1:dSeries#0400ff "

-    elif addTrend == 1:

-        strCmd += "CDEF:smoothed=dSeries,%s,TREND LINE2:smoothed#000000 " \

-                  % trendWindow[gStart]

-    elif addTrend == 2:

+    elif trendLine == 1:

+        strCmd += "CDEF:smoothed=dSeries,%s,TREND LINE2:smoothed%s " \

+                  % (trendWindow[gStart], _AVERAGE_LINE_COLOR)

+    elif trendLine == 2:

         strCmd += "LINE1:dSeries#0400ff "

-        strCmd += "CDEF:smoothed=dSeries,%s,TREND LINE2:smoothed#000000 " \

-                  % trendWindow[gStart]

+        strCmd += "CDEF:smoothed=dSeries,%s,TREND LINE2:smoothed%s " \

+                  % (trendWindow[gStart], _AVERAGE_LINE_COLOR)

+

+    if alertLine != "":

+        strCmd += "HRULE:%s#FF0000:Critical\ Low\ Voltage " % (alertLine)

     if verboseDebug:

         print "%s" % strCmd # DEBUG

@@ -304,60 +317,68 @@ def createGraph(fileName, dataItem, gLabel, gTitle, gStart,

         print "rrdtool graph: %s\n" % result,

     return True

-##end def

+## end def

 def generateGraphs():

     """Generate graphs for display in html documents.

        Parameters: none

        Returns: nothing

     """

-    autoScale = False

     # 24 hour stock charts

-    createGraph('24hr_current', 'CUR', 'mA', 

-                'Current\ -\ Last\ 24\ Hours', 'end-1day', 0, 0, 0, autoScale)

-    createGraph('24hr_voltage', 'VOLT', 'V', 

-                'Voltage\ -\ Last\ 24\ Hours', 'end-1day', 0, 0, 0, autoScale)

-    createGraph('24hr_power', 'PWR', 'mW', 

-                'Power\ -\ Last\ 24\ Hours', 'end-1day', 0, 0, 0, autoScale)

+    createGraph('24hr_current', 'CUR', 'Amps',

+                'Current\ -\ Last\ 24\ Hours', 'end-1day', \

+                0, 0, 2, 1000)

+    createGraph('24hr_voltage', 'VOLT', 'Volts',

+                'Voltage\ -\ Last\ 24\ Hours', 'end-1day', \

+                9, 15, 0, 1, True, 11)

+    createGraph('24hr_power', 'PWR', 'Watts', 

+                'Power\ -\ Last\ 24\ Hours', 'end-1day', \

+                0, 0, 2, 1000)

     createGraph('24hr_battemp', 'BTMP', 'deg\ F', 

                 'Battery\ Temperature\ -\ Last\ 24\ Hours', 'end-1day', \

-                 0, 0, 0, autoScale)

+                0, 0, 0)

     createGraph('24hr_ambtemp', 'ATMP', 'deg\ F', 

                 'Ambient\ Temperature\ -\ Last\ 24\ Hours', 'end-1day', \

-                 0, 0, 0, autoScale)

+                0, 0, 0)

     # 4 week stock charts

-    createGraph('4wk_current', 'CUR', 'mA', 

-                'Current\ -\ Last\ 4\ Weeks', 'end-4weeks', 0, 0, 0, autoScale)

-    createGraph('4wk_voltage', 'VOLT', 'V', 

-                'Voltage\ -\ Last\ 4\ Weeks', 'end-4weeks', 0, 0, 0, autoScale)

-    createGraph('4wk_power', 'PWR', 'mW', 

-                'Power\ -\ Last\ 4\ Weeks', 'end-4weeks', 0, 0, 0, autoScale)

+    createGraph('4wk_current', 'CUR', 'Amps',

+                'Current\ -\ Last\ 4\ Weeks', 'end-4weeks', \

+                0, 0, 2, 1000)

+    createGraph('4wk_voltage', 'VOLT', 'Volts',

+                'Voltage\ -\ Last\ 4\ Weeks', 'end-4weeks', \

+                9, 15, 0, 1, True, 11)

+    createGraph('4wk_power', 'PWR', 'Watts', 

+                'Power\ -\ Last\ 4\ Weeks', 'end-4weeks', \

+                0, 0, 2, 1000)

     createGraph('4wk_battemp', 'BTMP', 'deg\ F', 

                 'Battery\ Temperature\ -\ Last\ 4\ Weeks', 'end-4weeks', \

-                 0, 0, 2, autoScale)

+                0, 0, 2)

     createGraph('4wk_ambtemp', 'ATMP', 'deg\ F', 

                 'Ambient\ Temperature\ -\ Last\ 4\ Weeks', 'end-4weeks', \

-                 0, 0, 0, autoScale)

+                0, 0, 2)

     # 12 month stock charts

-    createGraph('12m_current', 'CUR', 'mA', 

-                'Current\ -\ Past\ Year', 'end-12months', 0, 0, 0, autoScale)

-    createGraph('12m_voltage', 'VOLT', 'V', 

-                'Voltage\ -\ Past\ Year', 'end-12months', 0, 0, 0, autoScale)

-    createGraph('12m_power', 'PWR', 'mW', 

-                'Power\ -\ Past\ Year', 'end-12months', 0, 0, 0, autoScale)

+    createGraph('12m_current', 'CUR', 'Amps',

+                'Current\ -\ Past\ Year', 'end-12months', \

+                0, 0, 2, 1000)

+    createGraph('12m_voltage', 'VOLT', 'Volts',

+                'Voltage\ -\ Past\ Year', 'end-12months', \

+                9, 15, 0, 1, True, 11)

+    createGraph('12m_power', 'PWR', 'Watts', 

+                'Power\ -\ Past\ Year', 'end-12months', \

+                0, 0, 2, 1000)

     createGraph('12m_battemp', 'BTMP', 'deg\ F', 

                 'Battery\ Temperature\ -\ Past\ Year', 'end-12months', \

-                 0, 0, 0, autoScale)

+                0, 0, 2)

     createGraph('12m_ambtemp', 'ATMP', 'deg\ F', 

                 'Ambient\ Temperature\ -\ Past\ Year', 'end-12months', \

-                 0, 0, 0, autoScale)

-##end def

+                0, 0, 2)

+## end def

 def getCLarguments():

     """Get command line arguments.  There are three possible arguments

@@ -437,6 +458,7 @@ def main():

             # If get data successful, write data to data files.

             if result:

                 result = writeOutputDataFile(dData)

+                pass

             # At the rrdtool database update interval, update the database.

             if currentTime - lastDatabaseUpdateTime > \

@@ -445,13 +467,14 @@ def main():

                 ## Update the round robin database with the parsed data.

                 if result:

                     updateDatabase(dData)

+                    pass

         # At the chart generation interval, generate charts.

         if currentTime - lastChartUpdateTime > chartUpdateInterval:

             lastChartUpdateTime = currentTime

             p = multiprocessing.Process(target=generateGraphs, args=())

             p.start()

-

+            

         # Relinquish processing back to the operating system until

         # the next update interval.

old mode 100644

new mode 100755

@@ -66,6 +66,15 @@ class tmp102:

         return (configB1, configB2)

     ## end def

+    def getTempReg(self):

+        # Read temperature register and return raw binary data for test

+        # and debug.

+        data = self.bus.read_i2c_block_data(self.sensorAddr, TEMP_REG, 2)

+        dataB1 = format(data[0], "08b")

+        dataB2 = format(data[1], "08b")

+        return (dataB1, dataB2)

+    ## end def

+

     # Gets the temperature in binary format and converts to degrees

     # Celsius.

     def getTempC(self):

@@ -110,14 +119,17 @@ def testclass():

     # Print out sensor values.

     bAl = False

     while True:

+        regdata = ts1.getTempReg()

         tempC = ts1.getTempC()

         tempF = ts1.getTempF()

         if bAl:

             bAl = False

-            print "\033[42;30m%6.2f%sC  %6.2f%sF\033[m" % \

+            print "\033[42;30mTemperature Reg: %s %s\033[m" % regdata

+            print "\033[42;30m%6.2f%sC  %6.2f%s                 \033[m" % \

                   (tempC, DEGSYM, tempF, DEGSYM)

         else:

             bAl = True

+            print "Temperature Reg: %s %s" % regdata

             print "%6.2f%sC  %6.2f%sF" % \

                   (tempC, DEGSYM, tempF, DEGSYM)

         time.sleep(2)

@@ -36,6 +36,11 @@ p {

     text-align: left;

     padding: 10px;

 }

+#alert {

+    font: bold 22px arial, sans-serif;

+    color: red;

+    /*border: 1px solid black;*/

+}

 .rowContainer {

     display: table;

     width: 100%;

@@ -60,7 +65,7 @@ p {

 }

 .chartContainer {

     padding: 2px;

-    /*border: 1px solid black;*/

+    border: 1px solid black;

 }

 img.chart {

     width: 100%;

@@ -114,6 +119,11 @@ temperatures.

 <text id="time"></text>

 </div>

+<div id="alert">

+<text id="alertmsg" style="opacity: 0;">

+Warning: Low Battery Voltage</text>

+</div>

+

 <div class="rowContainer">

 <div class="currentDataCell">

@@ -122,10 +132,10 @@ Current:<br>

 Voltage:<br>

 Power:

 </div>

-<div class="dataItems" style="width: 30%;">

+<div class="dataItems" style="width: 40%;">

 <text id="current"></text> mA<br>

 <text id="voltage"></text> V<br>

-<text id="power"></text> mW

+<text id="power"></text> W

 </div>

 </div>

@@ -215,10 +225,12 @@ Status:

 </div>

 <script>

+"use strict";

 /* Global constants */

-var sensorDataUrl = "dynamic/powerData.js";

+var SENSOR_DATA_URL = "dynamic/powerData.js";

+var CRITICAL_VOLTAGE = 11.0;

 /* Global DOM objects */

@@ -238,7 +250,8 @@ var power_t = document.getElementById("power");

 var battemp_t = document.getElementById("battemp");    

 var ambtemp_t = document.getElementById("ambtemp");    

 var status_t = document.getElementById("status");

-var period_t = document.getElementById("period");    

+var period_t = document.getElementById("period");

+var alertmsg_t = document.getElementById("alertmsg");   

 /* Global objects */

@@ -247,6 +260,7 @@ var httpRequest = new XMLHttpRequest();

 /* Global variables */

 var graphPeriod;

+var objBlink;

 function main() {

     // Register call back function to process client http requests

@@ -270,7 +284,7 @@ function main() {

 }

 function getSensorData() {

-    httpRequest.open("GET", sensorDataUrl, true);

+    httpRequest.open("GET", SENSOR_DATA_URL, true);

     httpRequest.timeout = 3000;

     httpRequest.send();

 }

@@ -303,17 +317,27 @@ function getSensorGraphs() {

 }

 function displayData(dataItem) {

+    var voltage, current, power, ambtemp, battemp, powerWatts

+

+    voltage = Number(dataItem.voltage);

+    current = Number(dataItem.current);

+    power = Number(dataItem.power)/1000.0;

+    battemp = Number(dataItem.battemp);

+    ambtemp = Number(dataItem.ambtemp);

+

+    if (voltage < CRITICAL_VOLTAGE) {

+        displayAlert();

+    } else {

+        clearAlert();

+    }

+

     displayTime(dataItem);

-    current_t.innerHTML = 

-        (Number(dataItem.current).toFixed(2)).toString();

-    voltage_t.innerHTML = 

-        (Number(dataItem.voltage).toFixed(2)).toString();

-    power_t.innerHTML = 

-        (Number(dataItem.power).toFixed(2)).toString();

-    battemp_t.innerHTML = 

-        (Number(dataItem.battemp).toFixed(2)).toString();

-    ambtemp_t.innerHTML = 

-        (Number(dataItem.ambtemp).toFixed(2)).toString();

+    current_t.innerHTML = current.toFixed(2).toString(); 

+    voltage_t.innerHTML = voltage.toFixed(2).toString();

+    power_t.innerHTML = power.toFixed(2).toString();

+    battemp_t.innerHTML = battemp.toFixed(2).toString();

+    ambtemp_t.innerHTML = ambtemp.toFixed(2).toString();

+

     period_t.innerHTML = dataItem.period / 60;

     status_t.innerHTML = "online";

     status_t.style.color = "green";

@@ -331,6 +355,20 @@ function displayOfflineStatus() {

     status_t.style.color = "red";

 }

+function displayAlert() {

+    if (typeof objBlink == "undefined") {

+    objBlink = setInterval(function() {

+            alertmsg_t.style.opacity = 

+                (alertmsg_t.style.opacity == 0 ? 1 : 0);

+    }, 1000);

+    }

+}

+

+function clearAlert() {

+    clearInterval(objBlink);

+    alertmsg_t.style.opacity = 0;

+}

+

 function displayTime(dataItem) {

     var date, time, hourminute;

     var localDateObj, localTimeZone, timeZoneShift;