URL corrections fixes #48

openenergymonitor · Feb 2, 2018 · 56a65ee · 56a65ee
1 parent f9748ef
commit 56a65ee
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 34 deletions.
diff --git a/conf/emonhub.conf b/conf/emonhub.conf
@@ -8,7 +8,7 @@
 ## Does not use MQTT server authentication
 
 ### emonHub configuration file, for info see documentation:
-### http://github.com/openenergymonitor/emonhub/blob/master/configuration.md
+### https://github.com/openenergymonitor/emonhub/blob/emon-pi/conf/emonhub.conf
 #######################################################################
 #######################    emonHub  settings    #######################
 #######################################################################
@@ -82,7 +82,7 @@ loglevel = DEBUG #(default:WARNING)
 
 [nodes]
 
-## See config user guide: http://github.com/openenergymonitor/emonhub/blob/master/configuration.md
+## See config user guide: https://github.com/openenergymonitor/emonhub/blob/emon-pi/conf/emonhub.conf
 
 [[5]]
     nodename = emonpi

diff --git a/conf/emonpi.default.emonhub.conf b/conf/emonpi.default.emonhub.conf
@@ -2,7 +2,7 @@
 #######################      emonhub.conf     #########################
 #######################################################################
 ### emonHub configuration file, for info see documentation:
-### http://github.com/openenergymonitor/emonhub/blob/emon-pi/configuration.md
+### https://github.com/openenergymonitor/emonhub/blob/emon-pi/conf/emonhub.conf
 #######################################################################
 #######################    emonHub  settings    #######################
 #######################################################################
@@ -76,7 +76,7 @@ loglevel = DEBUG
 
 [nodes]
 
-## See config user guide: http://github.com/openenergymonitor/emonhub/blob/master/configuration.md
+## See config user guide: https://github.com/openenergymonitor/emonhub/blob/emon-pi/conf/emonhub.conf
 
 [[5]]
     nodename = emonpi

diff --git a/conf/interfacer_examples/modbus/modbusTCP.emonhub.conf b/conf/interfacer_examples/modbus/modbusTCP.emonhub.conf
@@ -2,7 +2,7 @@
 #######################      emonhub.conf     #########################
 #######################################################################
 ### emonHub configuration file, for info see documentation:
-### http://github.com/openenergymonitor/emonhub/blob/emon-pi/configuration.md
+### https://github.com/openenergymonitor/emonhub/blob/emon-pi/conf/emonhub.conf
 #######################################################################
 #######################    emonHub  settings    #######################
 #######################################################################
@@ -22,8 +22,8 @@ loglevel = INFO
 
 ### This interfacer manages connections to modbustcp clients
 
-[[ModbusTCP]]     
-# this interfacer retrieves register information from modbusTCP clients 
+[[ModbusTCP]]
+# this interfacer retrieves register information from modbusTCP clients
 # retrieve register information from modbus TCP documentation for your inverter.
 # Information here is designed for Fronius Symo 3 phase inverter.
     Type = EmonModbusTcpInterfacer
@@ -35,7 +35,7 @@ loglevel = INFO
 	      rName = Inverter_status,AC_power_watts,AC_LifetimekWh,DayWh,mppt1,mppt2,Vmppt1,Vmppt2,PhVphA,PhVphB,PhVphC
         # List of starting registers for items listed above
 	      register = 40118,40092,40102,502,40285,40305,40284,40304,40086,40088,40090
-        # List of # of registers used for each item 
+        # List of # of registers used for each item
 	      nReg = 1,2,2,4,1,1,1,1,2,2,2
         # Data type for each item above
 	      rType = uint16,float32,float32,uint64,uint16,uint16,uint16,uint16,float32,float32,float32
@@ -45,7 +45,7 @@ loglevel = INFO
         pubchannels = ToEmonCMS,
         # time in seconds between checks, This is in addition to emonhub_interfacer.run() sleep time of .01
         # use this value to set the frequency of data retrieval from modbus client
-        interval = 1   
+        interval = 1
 
 ### This interfacer manages the RFM12Pi/RFM69Pi/emonPi module
 [[RFM2Pi]]
@@ -83,7 +83,7 @@ loglevel = INFO
         node_format_basetopic = emonhub/
 
         # emon/emontx/power1 format - use with Emoncms MQTT input
-        # http://github.com/emoncms/emoncms/blob/master/docs/RaspberryPi/MQTT.md
+        # https://github.com/openenergymonitor/emonhub/blob/emon-pi/conf/emonhub.conf
         nodevar_format_enable = 1
         nodevar_format_basetopic = emon/
 

diff --git a/conf/interfacer_examples/smilices/smilics.emonhub.conf b/conf/interfacer_examples/smilices/smilics.emonhub.conf
@@ -8,7 +8,7 @@
 ## Does not use MQTT server authentication
 
 ### emonHub configuration file, for info see documentation:
-### http://github.com/openenergymonitor/emonhub/blob/master/configuration.md
+### https://github.com/openenergymonitor/emonhub/blob/emon-pi/conf/emonhub.conf
 #######################################################################
 #######################    emonHub  settings    #######################
 #######################################################################
@@ -40,7 +40,7 @@ loglevel = DEBUG #(default:WARNING)
 
 [nodes]
 
-## See config user guide: http://github.com/openenergymonitor/emonhub/blob/master/configuration.md
+## See config user guide: https://github.com/openenergymonitor/emonhub/blob/emon-pi/conf/emonhub.conf
 
 
 [[121111111111]]

diff --git a/conf/interfacer_examples/vedirect/bmv700.vedirect.emonhub.conf b/conf/interfacer_examples/vedirect/bmv700.vedirect.emonhub.conf
@@ -8,7 +8,7 @@
 ## Does not use MQTT server authentication
 
 ### emonHub configuration file, for info see documentation:
-### http://github.com/openenergymonitor/emonhub/blob/master/configuration.md
+### https://github.com/openenergymonitor/emonhub/blob/emon-pi/conf/emonhub.conf
 #######################################################################
 #######################    emonHub  settings    #######################
 #######################################################################
@@ -46,7 +46,7 @@ loglevel = DEBUG #(default:WARNING)
 
 [nodes]
 
-## See config user guide: http://github.com/openenergymonitor/emonhub/blob/master/configuration.md
+## See config user guide: https://github.com/openenergymonitor/emonhub/blob/emon-pi/conf/emonhub.conf
 
 
 [[9]]

diff --git a/conf/old.default.emonhub.conf b/conf/old.default.emonhub.conf
@@ -8,7 +8,7 @@
 ## Does not use MQTT server authentication
 
 ### emonHub configuration file, for info see documentation:
-### http://github.com/openenergymonitor/emonhub/blob/master/configuration.md
+### https://github.com/openenergymonitor/emonhub/blob/emon-pi/conf/emonhub.conf
 #######################################################################
 #######################    emonHub  settings    #######################
 #######################################################################
@@ -81,7 +81,7 @@ loglevel = DEBUG #(default:WARNING)
 
 [nodes]
 
-## See config user guide: http://github.com/openenergymonitor/emonhub/blob/master/configuration.md
+## See config user guide: https://github.com/openenergymonitor/emonhub/blob/emon-pi/conf/emonhub.conf
 
 [[5]]
     nodename = emonpi

diff --git a/configuration.md b/configuration.md
@@ -24,7 +24,7 @@ Nodes holds the decoder configuration for rfm12/69 node data which are sent as b
         #######################      emonhub.conf     #########################
         #######################################################################
         ### emonHub configuration file, for info see documentation:
-        ### http://github.com/openenergymonitor/emonhub/blob/master/configuration.md
+        ### https://github.com/openenergymonitor/emonhub/blob/emon-pi/conf/emonhub.conf
         #######################################################################
         #######################    emonHub  settings    #######################
         #######################################################################
@@ -189,7 +189,7 @@ This time, the API key will be the API key from your account at emoncms.example.
 
 ### d.) Socket Interfacer
 
-The EmonHub socket interfacer is a particularly useful interfacer for inputing data from a range of sources. e.g a script monitoring server status where you wish to post the result to both a local instance of emoncms and a remote instance of emoncms alongside other data from other sources such as rfm node data. 
+The EmonHub socket interfacer is a particularly useful interfacer for inputing data from a range of sources. e.g a script monitoring server status where you wish to post the result to both a local instance of emoncms and a remote instance of emoncms alongside other data from other sources such as rfm node data.
 
 As an example the following python script will post a single line of data values on node 98 to an emonhub instance running locally and listening on port 8080:
 
@@ -387,9 +387,7 @@ The following lists the standard node decoders for recent versions of the EmonPi
 
 If you upload the firmware yourself to any of these nodes and wish to have the data decoded with names, units and scaled correctly these are the decoders for the standard firmwares. The node decoders are also included at the top of each firmware file for reference.
 
-### EmonPi: emonPi_RFM69CW_RF12Demo_DiscreteSampling.ino, v2.1+
-
-Firmware location: [emonPi_RFM69CW_RF12Demo_DiscreteSampling.ino](https://github.com/openenergymonitor/emonpi/blob/master/Atmega328/emonPi_RFM69CW_RF12Demo_DiscreteSampling/emonPi_RFM69CW_RF12Demo_DiscreteSampling.ino)
+### EmonPi:[Firmware location](https://github.com/openenergymonitor/emonpi/)
 
 Copied here for reference:
 
@@ -405,9 +403,7 @@ Copied here for reference:
             units = W,W,W,V,C,C,C,C,C,C,p
 ```
 
-### EmonTx v3, emonTxV3_4_DiscreteSampling.ino, v2.3+
-
-Firmware location: [emonTxV3_4_DiscreteSampling.ino](https://github.com/openenergymonitor/emonTxFirmware/blob/master/emonTxV3/RFM/emonTxV3.4/emonTxV3_4_DiscreteSampling/emonTxV3_4_DiscreteSampling.ino)
+### EmonTx v3: [Firmware location](https://github.com/openenergymonitor/emonTx3)
 
 Node ID when DIP switch1 is off = 8, node ID when DIP switch1 is on is 7
 
@@ -425,7 +421,7 @@ Copied here for reference:
            units =W,W,W,W,V,C,C,C,C,C,C,p
 ```
 
-### EmonTx v3, emonTxV3_4_DiscreteSampling.ino, v1.6+
+### EmonTx v3, emonTxV3_4_DiscreteSampling.ino, v1.6+ [Firmware Location](https://github.com/openenergymonitor/emonTxFirmware)
 
 Can be on either nodeid 10 or 9
 
@@ -439,7 +435,7 @@ Can be on either nodeid 10 or 9
            scales = 1,1,1,1,0.01,0.1,0.1, 0.1,0.1,0.1,0.1,1 #Firmware V1.6
            units =W,W,W,W,V,C,C,C,C,C,C,p
 
-### EmonTx v3, emonTxV3_4_DiscreteSampling.ino, <v1.4
+### EmonTx v3, emonTxV3_4_DiscreteSampling.ino, <v1.4:
 
     [[10]]
         nodename = emonTx_1
@@ -451,9 +447,7 @@ Can be on either nodeid 10 or 9
            scales = 1,1,1,1,0.01,0.1
            units =W,W,W,W,V,C
 
-### EmonTH, emonTH_DHT22_DS18B20_RFM69CW_Pulse.ino, v2.6+
-
-Firmware location: [emonTH_DHT22_DS18B20_RFM69CW_Pulse.ino](https://github.com/openenergymonitor/emonTH/blob/master/emonTH_DHT22_DS18B20_RFM69CW_Pulse/emonTH_DHT22_DS18B20_RFM69CW_Pulse.ino)
+### EmonTH V2: [Firmware location](https://github.com/openenergymonitor/emonTH2/)
 
 Standard nodeid's: 23, 24, 25 & 26 depending on DIP switch positions:
 
@@ -467,9 +461,9 @@ Standard nodeid's: 23, 24, 25 & 26 depending on DIP switch positions:
            scales = 0.1,0.1,0.1,0.1,1
            units = C,C,%,V,p
 
-### EmonTH, emonTH_DHT22_DS18B20_RFM69CW.ino v1.5 -> v1.6.1
+### EmonTH V1, emonTH_DHT22_DS18B20_RFM69CW.ino v1.5 -> v1.6.1
 
-Firmware location: [emonTH_DHT22_DS18B20_RFM69CW.ino](https://github.com/openenergymonitor/emonTH/blob/master/emonTH_DHT22_DS18B20_RFM69CW/emonTH_DHT22_DS18B20_RFM69CW.ino)
+emonTH V1 [Firmware location](https://github.com/openenergymonitor/emonTH)
 
 Standard nodeid's: 19, 20, 21 & 22 depending on DIP switch positions:
 
@@ -483,9 +477,7 @@ Standard nodeid's: 19, 20, 21 & 22 depending on DIP switch positions:
            scales = 0.1,0.1,0.1,0.1
            units = C,C,%,V
 
-### EmonTx Shield
-
-Firmware location: [Shield_CT1234_Voltage.ino](https://github.com/openenergymonitor/emonTxFirmware/blob/master/emonTxShield/Shield_CT1234_Voltage/Shield_CT1234_Voltage.ino)
+### EmonTx Shield [Firmware location]https://github.com/openenergymonitor/emontx-shield)
 
     [[6]]
         nodename = emonTxShield