The big .gplot rename

git-svn-id: https://svn.fhem.de/fhem/trunk@976 2b470e98-0d58-463d-a4d8-8e2adae1ed80

fhem/CHANGED

@@ -1,9 +1,10 @@
 - CVS
   - bugfix:  applying smallscreen attributes to firefox/opera
   - feature: CUL_TX added (thanks to Peterp)
-  - feature: TCM120 / EnOcean parser added
+  - feature: TCM120/TCM310 + EnOcean parser added
   - feature: eventMap enhanced
   - bugfix:  enabled logging for 59_Weather.pm (Boris)
+  - feature: .gplot files renamed from type to content
 
 - 2011-07-08 (5.1)
   - feature: smallscreen optimizations for iPhone

fhem/FHEM/98_autocreate.pm

@@ -12,9 +12,9 @@ use warnings;
 
 my %flogpar = (
   "CUL_EM.*"
-      => { GPLOT => "cul_em:Power,", FILTER => "%NAME:CNT.*" },
+      => { GPLOT => "power8:Power,", FILTER => "%NAME:CNT.*" },
   "CUL_WS.*"
-      => { GPLOT => "hms:Temp/Hum,",  FILTER => "%NAME:T:.*" },
+      => { GPLOT => "temp4hum6:Temp/Hum,",  FILTER => "%NAME:T:.*" },
   "CUL_FHTTK.*"
       => { GPLOT => "fht80tf:Window,", FILTER => "%NAME" },
   "FHT.*"
@@ -22,28 +22,28 @@ my %flogpar = (
   "HMS100TFK_.*"
       => { GPLOT => "fht80tf:Contact,", FILTER => "%NAME" },
   "HMS100T_.*"
-      => { GPLOT => "hms:Temp/Hum,", FILTER => "%NAME:T:.*" },
+      => { GPLOT => "temp4hum6:Temp/Hum,", FILTER => "%NAME:T:.*" },
   "KS300.*"
-      => { GPLOT => "ks300:Temp/Rain,ks300_2:Wind/Hum,",
+      => { GPLOT => "temp4rain10:Temp/Rain,hum6wind8:Wind/Hum,",
            FILTER => "%NAME:T:.*" },
 
   # Oregon sensors: 
   # * temperature
   "(THR128|THWR288A|THN132N).*"
-      => { GPLOT => "oregon_hms_t:Temp,",  FILTER => "%NAME" },
+      => { GPLOT => "temp4:Temp,",  FILTER => "%NAME" },
   # * temperature, humidity
   "(THGR228N|THGR810|THGR918|THGR328N|RTGR328N|WTGR800_T).*"
-      => { GPLOT => "oregon_hms:Temp/Hum,",  FILTER => "%NAME" },
+      => { GPLOT => "temp4hum4:Temp/Hum,",  FILTER => "%NAME" },
   # * temperature, humidity, pressure
   "(BTHR918N|BTHR918|BTHR918N).*"
-      => { GPLOT => "oregon_temp_press:Temp/Press,oregon_hms:Temp/Hum,",
+      => { GPLOT => "rain4press4:Temp/Press,temp4hum4:Temp/Hum,",
            FILTER => "%NAME" },
   # * anenometer
   "(WGR800|WGR918|WTGR800_A).*"
-      => { GPLOT => "oregon_wind:WindDir/WindSpeed,",  FILTER => "%NAME" },
+      => { GPLOT => "wind4windDir4:WindDir/WindSpeed,",  FILTER => "%NAME" },
   # * Oregon sensors: Rain gauge
   "(PCR800|RGR918).*"
-      => { GPLOT => "oregon_rain:RainRate",  FILTER => "%NAME" },
+      => { GPLOT => "rain4:RainRate",  FILTER => "%NAME" },
 
   # X10 sensors received by RFXCOM
   "RFXX10SEC.*"
@@ -51,19 +51,19 @@ my %flogpar = (
 
   # USB-WDE1
   "USBWX_[0-8]"
-      => { GPLOT => "hms:Temp/Hum,",  FILTER => "%NAME" },
+      => { GPLOT => "temp4hum6:Temp/Hum,",  FILTER => "%NAME" },
   "USBWX_ks300"
-      => { GPLOT => "hms:Temp/Hum,ks300:Temp/Rain,ks300_2:Wind/Hum,",
+      => { GPLOT => "temp4hum6:Temp/Hum,temp4rain10:Temp/Rain,hum6wind8:Wind/Hum,",
            FILTER => "%NAME:T:.*" },
 
   # HomeMatic
   "CUL_HM_THSensor.*"
-      => { GPLOT => "hms:Temp/Hum,", FILTER => "%NAME:T:.*" },
+      => { GPLOT => "temp4hum6:Temp/Hum,", FILTER => "%NAME:T:.*" },
   "CUL_HM_KS550.*"
-      => { GPLOT => "ks300:Temp/Rain,ks300_2:Wind/Hum,",
+      => { GPLOT => "temp4rain10:Temp/Rain,hum6wind8:Wind/Hum,",
            FILTER => "%NAME:T:.*" },
   "CUL_HM_HM-CC-TC.*"
-      => { GPLOT => "hms:Temp/Hum,", FILTER => "%NAME:T:.*" },
+      => { GPLOT => "temp4hum6:Temp/Hum,", FILTER => "%NAME:T:.*" },
 
   # Lacrosse TX
   "CUL_TX.*"

fhem/docs/HOWTO.html

@@ -256,9 +256,9 @@
       Note that the .gplot files are also used if you use SVG output and
       not the gnuplot backend!<br>
       Examples:<pre>
-        attr em1000log logtype cul_em:Power,text
+        attr em1000log logtype power8:Power,text
         attr fs20_log logtype fs20:Plot,text
-        attr hms100th_log logtype hms:Plot,text
+        attr hms100th_log logtype temp4hum6:Plot,text
       </pre>
 
       When displaying the plot, you can convert it into a "weblink" device,

fhem/docs/commandref.html

@@ -6859,14 +6859,14 @@ Readings and STATE of temperature/humidity sensors are compatible with the CUL_W
                <code>define fhtlog1 FileLog fht1:.*(temp|actuator).* /var/log/fht1-%Y-%U.log</code>
 
           </li>
-           <li>ks300<br>
+           <li>temp4rain10<br>
                Plots the temperature and rain (per hour and per day) of a
                ks300. The corresponding filelog definitions (for the KS300
                device named ks300) looks like:<br>
                define FileLog ks300log ks300:.*H:.*
                /var/log/ks300-%Y-%U.log
           </li>
-           <li>ks300_2<br>
+           <li>hum6wind8<br>
                Plots the humidity and wind values of a
                ks300. The corresponding filelog definition is the same as
                above, both programs evaluate the same log.
@@ -6877,7 +6877,7 @@ Readings and STATE of temperature/humidity sensors are compatible with the CUL_W
           </li>
         </ul>
         Example:<br>
-           attr ks300log1 logtype ks300_1:Temp/Rain,ks300_2:Hum/Wind,text:Raw-data
+           attr ks300log1 logtype temp4rain10:Temp/Rain,hum6wind8:Hum/Wind,text:Raw-data
     </li><br>
 
 

fhem/examples/04_log

@@ -26,7 +26,7 @@ attr wzlog logtype fht:Temp
 # ks300 log
 define kslog  FileLog /var/log/wz-%Y-%U.log ks1:.*H:.*
 define avglog FileLog /var/log/avg.log ks1:.*avg.*
-attr kslog logtype ks300:Temp/Hum,ks300_2:Rain/Wind
+attr kslog logtype temp4rain10:Temp/Rain,hum6wind8:Hum/Wind
 
 ##############################
 # Alternative log method. It does the same, but it is somewhat slower as it

fhem/webfrontend/pgm2/oregon_hms.gplot

@@ -1,40 +0,0 @@
-#
-# Display the measured temperature and the humidity of Oregon sensors.
-#
-# FileLog definition: 
-# define <filelogname> FileLog /var/log/fhem/<devname>-%Y.log <devname>
-# Filelog example:
-# define FileLog_THR128_08 FileLog /var/log/fhem/THR128_08-%Y.log THR128_08
-#
-# Logfile record example:
-#2010-08-10_17:59:46 THGR810_b1 temperature: 21.6
-#2010-08-10_17:59:46 THGR810_b1 humidity: 66
-
-
-# Attribute 'small' is useful for gnuplot/-scroll only,
-# if plotsize is less than 800,400
-#set terminal png transparent small size <SIZE> crop
-
-set terminal png transparent size <SIZE> crop
-
-set output '<OUT>.png'
-set xdata time
-set timefmt "%Y-%m-%d_%H:%M:%S"
-set xlabel " "
-set ytics nomirror
-set y2tics
-#set ytics
-set title '<L1>'
-set grid xtics y2tics
-
-set y2label "Temperature in C"
-set ylabel "Humidity (%)"
-
-#FileLog 4:temperature:0:
-#FileLog 4:humidity:0:
-
-plot \
-  "< awk $3=="temperature:" {print $1, $4}' <IN>"\
-     using 1:2 axes x1y2 title 'Measured temperature' with lines lw 2,\
-  "< awk $3=="humidity:" {print $1, $4}' <IN>"\
-     using 1:2 axes x1y1 title 'Humidity (%)' with lines lw 1\

fhem/webfrontend/pgm2/temp4.gplot

@@ -26,8 +26,8 @@ set grid xtics y2tics
 
 set y2label "Temperature in C"
 
-#FileLog 4:temperature:0:
+#FileLog 4:T\x3a:|temperature:0:
 
 plot \
-  "< awk $3=="temperature:" {print $1, $4}' <IN>"\
+  "< egrep 'T:|temperature:' <IN>"\
-     using 1:2 axes x1y2 title 'Measured temperature' with lines lw 2,\
+     using 1:4 axes x1y2 title 'Measured temperature' with lines lw 2,\

fhem/webfrontend/pgm2/temp4hum4.gplot

@@ -17,11 +17,11 @@ set grid xtics y2tics
 set y2label "Temperature in C"
 set ylabel "Humidity (%)"
 
-#FileLog 4:T\x3a:10:
+#FileLog 4:T\x3a|temperature:10:
-#FileLog 4:H\x3a:50:
+#FileLog 4:H\x3a|humidity:50:
 
 plot \
-  "< awk '/T:/ {print $1, $4}' <IN>"\
+  "< egrep 'T:|temperature' <IN>"\
-     using 1:2 axes x1y2 title 'Measured temperature' with lines lw 2,\
+         using 1:4 axes x1y2 title 'Measured temperature' with lines lw 2,\
-  "< awk '/H:/ {print $1, $4}' <IN>"\
+  "< egrep 'H:|temperature' <IN>"\
-     using 1:2 axes x1y1 title 'Humidity (%)' with lines lw 1\
+        using 1:4 axes x1y1 title 'Humidity (%)' with lines lw 1\