Willamette Valley Mesh - Git Server
Browse code

sync 2018-07-27

fractalxaos authored on 07/27/2018 19:27:41
Showing 6 changed files
Arduino/Radmon.ino
History View file @ 18691b9
... ... 
@@ -68,7 +68,7 @@
68 68 
        - simplified serial data output
69 69 
    * v16 released 16 Sep 2017 by J L Owrey
70 70 
        - added capability of rebooting via network http request,
71 
-         i.e., "http://{device IP address}/reset"
71 
+         i.e.,    "http://{device_IP_address}/reset"
72 72 
 */
73 73
74 74 
 /***  PREPROCESSOR DEFINES  ***/
bin/createRadmonRrd.py
History View file @ 18691b9
... ... 
@@ -9,7 +9,7 @@
9 9 
 # database to generate graphic charts for display in the weather station
10 10 
 # web page.
11 11 
 #
12 
-# Copyright 2014 Jeff Owrey
12 
+# Copyright 2018 Jeff Owrey
13 13 
 #    This program is free software: you can redistribute it and/or modify
14 14 
 #    it under the terms of the GNU General Public License as published by
15 15 
 #    the Free Software Foundation, either version 3 of the License, or
bin/radmonAgent.py
History View file @ 18691b9
... ... 
@@ -15,7 +15,7 @@
15 15 
 #     - write the processed weather data to a JSON file for use by html
16 16 
 #       documents
17 17 
 #
18 
-# Copyright 2015 Jeff Owrey
18 
+# Copyright 2018 Jeff Owrey
19 19 
 #    This program is free software: you can redistribute it and/or modify
20 20 
 #    it under the terms of the GNU General Public License as published by
21 21 
 #    the Free Software Foundation, either version 3 of the License, or
... ... 
@@ -52,9 +52,9 @@ _USER = os.environ['USER']
52 52 
    ### DEFAULT RADIATION MONITOR URL ###
53 53
54 54 
 # ip address of radiation monitoring device
55 
-_DEFAULT_RADIATION_MONITOR_URL = "{your radiation device url}"
55 
+_DEFAULT_RADIATION_MONITOR_URL = "{your radiation monitor url}"
56 56 
 # url if this is a mirror server
57 
-_PRIMARY_SERVER_URL = "{your primary server radiation data url}"
57 
+_PRIMARY_SERVER_URL = "{your primary server url}"
58 58
59 59 
     ### FILE AND FOLDER LOCATIONS ###
60 60
bin/stoprad
History View file @ 18691b9
... ... 
@@ -10,15 +10,6 @@ PROCESS_ID="$(ps x | awk '/[r]admonAgent.py/{print $1}')"
10 10 
 if [ -n "$PROCESS_ID" ]; then
11 11 
   printf "killing radmon agent [%s]\n" $PROCESS_ID
12 12 
   kill $PROCESS_ID
13 
-
14 
-  # Remove input data file to alert mirror servers
15 
-  if [ -e $RADMON_INPUT_DATA_FILE ]; then
16 
-    rm $RADMON_INPUT_DATA_FILE
17 
-  fi
18 
-  # Remove output data file to alert web clients
19 
-  if [ -e $RADMON_OUTPUT_DATA_FILE ]; then
20 
-    rm $RADMON_OUTPUT_DATA_FILE
21 
-  fi
22 13 
 else
23 14 
   echo radmon agent not running
24 15 
 fi
html/index.html
History View file @ 18691b9
... ... 
@@ -2,5 +2,6 @@
2 2 
 <html>
3 3 
 <head>
4 4 
   <meta http-equiv="refresh" content="0; url=./radmon.html">
5 
+  <!--<meta http-equiv="refresh" content="0; url=https://github.com/fractalxaos/radmon">-->
5 6 
 </head>
6 7 
 </html>
html/radmon.html
History View file @ 18691b9
... ... 
@@ -28,8 +28,9 @@ h4 {
28 28 
 }
29 29 
 .currentDataCell {
30 30 
     width: 50%;
31 
+    padding: 10px;
31 32 
     font: bold 20px arial, sans-serif;
32 
-    text-align: center;
33 
+    text-align: middle;
33 34 
     display: table-cell;
34 35 
     vertical-align: middle;
35 36 
 }
... ... 
@@ -38,7 +39,7 @@ h4 {
38 39 
     text-align: left;
39 40 
     line-height: 130%;
40 41 
     display: inline-block;
41 
-    vertical-align: top;
42 
+    vertical-align: middle;
42 43 
 }
43 44 
 .chartContainer {
44 45 
     padding: 2px;
... ... 
@@ -209,7 +210,7 @@ function main() {
209 210 
 }
210 211
211 212 
 function getRadmonData() {
212 
-    httpRequest.open("POST", radmonDataUrl, true);
213 
+    httpRequest.open("GET", radmonDataUrl, true);
213 214 
     httpRequest.send();
214 215 
 }
215 216