deleted file mode 100755

@@ -1,89 +0,0 @@

-#!/usr/bin/python -u

-## The -u option above turns off block buffering of python output. This assures

-## that each error message gets individually printed to the log file.

-#

-# Module: createArednsigRrd.py

-#

-# Description: Creates a rrdtool database for use by the weather agent to

-# store the data from the weather station.  The agent uses the data in the

-# database to generate graphic charts for display in the weather station

-# web page.

-#

-# Copyright 2020 Jeff Owrey

-#    This program is free software: you can redistribute it and/or modify

-#    it under the terms of the GNU General Public License as published by

-#    the Free Software Foundation, either version 3 of the License, or

-#    (at your option) any later version.

-#

-#    This program is distributed in the hope that it will be useful,

-#    but WITHOUT ANY WARRANTY; without even the implied warranty of

-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-#    GNU General Public License for more details.

-#

-#    You should have received a copy of the GNU General Public License

-#    along with this program.  If not, see http://www.gnu.org/license.

-#

-# Revision History

-#   * v10 released 11 Jan 2020 by J L Owrey

-#

-import os

-import time

-import subprocess

-

-    ### DEFINE FILE LOCATIONS ###

-

-_USER = os.environ['USER']

-# the file that stores the data

-_RRD_FILE = "/home/%s/database/arednsigData.rrd" % _USER

-_RRD_SIZE_IN_DAYS = 370 # days

-_1YR_RRA_STEPS_PER_DAY = 96

-_DATABASE_UPDATE_INTERVAL = 60

-

-def createRrdFile():

-    """Create the rrd file if it does not exist.

-       Parameters: none

-       Returns: True, if successful

-    """

-

-    if os.path.exists(_RRD_FILE):

-        print "aredn node database already exists"

-        return True

-

-     ## Calculate database size

- 

-    heartBeat = 2 * _DATABASE_UPDATE_INTERVAL

-    rra1yrNumPDP =  int(round(86400 / (_1YR_RRA_STEPS_PER_DAY * \

-                    _DATABASE_UPDATE_INTERVAL)))

-    rrd24hrNumRows = int(round(86400 / _DATABASE_UPDATE_INTERVAL))

-    rrd1yearNumRows = _1YR_RRA_STEPS_PER_DAY * _RRD_SIZE_IN_DAYS

-       

-    strFmt = ("rrdtool create %s --start now-1day --step %s "

-              "DS:S:GAUGE:%s:U:U DS:N:GAUGE:%s:U:U DS:SNR:GAUGE:%s:U:U "

-              "DS:RX_MCS:GAUGE:%s:U:U DS:TX_MCS:GAUGE:%s:U:U "

-              "DS:RX_RATE:GAUGE:%s:U:U DS:TX_RATE:GAUGE:%s:U:U "

-              "RRA:LAST:0.5:1:%s RRA:LAST:0.5:%s:%s")

-

-    strCmd = strFmt % (_RRD_FILE, _DATABASE_UPDATE_INTERVAL, \

-                heartBeat, heartBeat, heartBeat, heartBeat,  \

-                heartBeat,  heartBeat, heartBeat,            \

-                rrd24hrNumRows, rra1yrNumPDP, rrd1yearNumRows)

-

-    print "creating aredn node database...\n\n%s\n" % strCmd

-

-    # Spawn a sub-shell and run the command

-    try:

-        subprocess.check_output(strCmd, stderr=subprocess.STDOUT, \

-                                shell=True)

-    except subprocess.CalledProcessError, exError:

-        print "rrdtool create failed: %s" % (exError.output)

-        return False

-    return True

-##end def

-

-def main():

-    createRrdFile()

-## end def

-

-if __name__ == '__main__':

-    main()

-        

deleted file mode 100755

@@ -1,16 +0,0 @@

-#!/bin/sh

-#

-# Create a directory in the temporary file system for arednsig dynamic

-# data.  Set ownership and permissions to allow the Apache www-data user

-# read and write access to this folder.

-mkdir /tmp/arednsig

-sudo chown :www-data /tmp/arednsig

-chmod g+w /tmp/arednsig

-

-# Uncomment the following line if you choose to mount the dynamic

-# folder to the folder created above.

-#sudo mount --bind /tmp/arednsig  /home/pi/public_html/arednsig/dynamic

-

-# Start arednsig agent

-(sleep 5; /home/pi/bin/ardstart;) &

-

deleted file mode 100644

Binary files a/arednsig/aredn_fw_3_20_3_0/doc/arednsig_320_installation.odt and /dev/null differ

similarity index 100%

rename from arednsig/aredn_fw_3_20_3_0/doc/arednsig_320_installation.pdf

rename to arednsig/arednsig_320_installation.pdf

similarity index 100%

rename from arednsig/aredn_fw_3_20_3_0/bin/ardstart

rename to arednsig/bin/ardstart

similarity index 100%

rename from arednsig/aredn_fw_3_20_3_0/bin/ardstop

rename to arednsig/bin/ardstop

similarity index 99%

rename from arednsig/aredn_fw_3_20_3_0/bin/arednsigAgent.py

rename to arednsig/bin/arednsigAgent.py

@@ -70,9 +70,9 @@ _RRD_FILE = "/home/%s/database/arednsigData.rrd" % _USER

     ### GLOBAL CONSTANTS ###

-# interval in seconds between data requests to the aredn node

+# AREDN node data request interval in seconds

 _DEFAULT_DATA_REQUEST_INTERVAL = 60

-# chart update interval in minutes

+# chart update interval in seconds

 _CHART_UPDATE_INTERVAL = 600

 # number seconds to wait for a response to HTTP request

similarity index 96%

rename from arednsig/aredn_fw_3_20_3_0/html/arednsig.html

rename to arednsig/html/arednsig.html

@@ -4,7 +4,7 @@

 -->

 <html>

 <head>

-<title>Node Signal</title>

+<title>AREDN Node - Signal Status</title>

 <meta charset="UTF-8">

 <meta name="viewport" content="width=device-width, initial-scale=1.0">

 <style>

@@ -98,7 +98,7 @@ span.selectorElement {

 <div class="mainContainer">

 <h2><a href="https://github.com/fractalxaos/ham/tree/master/arednsig" 

   style="text-decoration:none" target="_new">

-KA7JLO AREDN<sup>&#174;</sup> Node Signal</a></h2>

+AREDN<sup>&#174;</sup> Node Signal</a></h2>

 <h3>Last Updated</h3>

 <div class="datetime">

 <span id="date"></span>

@@ -110,7 +110,7 @@ KA7JLO AREDN<sup>&#174;</sup> Node Signal</a></h2>

 <div class="currentDataCell">

 <div class="dataItems" style="text-align: center;">

 Status: <span id="status"></span><br>

-Data updates every: <span id="period"></span> minutes

+Charts update every: <span id="period"></span> minutes

 </div>

 </div>

@@ -283,9 +283,9 @@ function displayData(dataItem) {

     statusElmt.style.color = "green";

     chartRefreshRate = dataItem.period;

-    periodElmt.innerHTML = chartRefreshRate;

-    setInterval(getNodeData, 60000 * chartRefreshRate);

-    setInterval(getNodeCharts, 60000 * chartRefreshRate);

+    periodElmt.innerHTML = chartRefreshRate / 60;

+    setInterval(getNodeData, 1000 * chartRefreshRate);

+    setInterval(getNodeCharts, 1000 * chartRefreshRate);

 }

 function displayOfflineStatus() {

similarity index 100%

rename from arednsig/aredn_fw_3_20_3_0/html/arednsig.php

rename to arednsig/html/arednsig.php

similarity index 54%

rename from arednsig/aredn_fw_3_20_3_0/html/index.html

rename to arednsig/html/index.html

@@ -2,6 +2,5 @@

 <html>

 <head>

   <meta http-equiv="refresh" content="0; url=./arednsig.html">

-  <!--<meta http-equiv="refresh" content="0; url=https://github.com/fractalxaos/radmon">-->

 </head>

 </html>

new file mode 100644

Binary files /dev/null and b/arednsig/html/static/UnderConstruction.gif differ

similarity index 100%

rename from arednsig/aredn_fw_3_20_3_0/html/static/chalk.jpg

rename to arednsig/html/static/chalk.jpg