diff --git a/webstuff/frontend/content/module_sets/set_test.html b/webstuff/frontend/content/module_sets/set_test.html index f942062..46dada0 100644 --- a/webstuff/frontend/content/module_sets/set_test.html +++ b/webstuff/frontend/content/module_sets/set_test.html @@ -1 +1 @@ -{content:addModule:press_1}{content:addModule:hum_1}{content:addModule:hum_4}{content:addModule:rain_3}{content:addModule:temp_1}{content:addModule:temp_4} +{content:addModule:wind_2}{content:addModule:press_1}{content:addModule:hum_1}{content:addModule:hum_4}{content:addModule:rain_3}{content:addModule:temp_1}{content:addModule:temp_4} diff --git a/webstuff/frontend/content/modules/mod_hum.html b/webstuff/frontend/content/modules/mod_hum.html index ebca534..e54e5ef 100644 --- a/webstuff/frontend/content/modules/mod_hum.html +++ b/webstuff/frontend/content/modules/mod_hum.html @@ -9,7 +9,7 @@ Durchschnitt ({content:fill:hum_av_interval} min.):{content:fill:hum_av_value}%  - Tendenz (2 std.):{content:fill:hum_changing}  + Tendenz (2 std.):{content:fill:hum_changing} 

Extrema

diff --git a/webstuff/frontend/content/modules/mod_press.html b/webstuff/frontend/content/modules/mod_press.html index c746576..050034d 100644 --- a/webstuff/frontend/content/modules/mod_press.html +++ b/webstuff/frontend/content/modules/mod_press.html @@ -9,7 +9,7 @@ Durchschnitt ({content:fill:press_av_interval} min.):{content:fill:press_av_value} hPa  - Tendenz (2 std.):{content:fill:press_changing}  + Tendenz (2 std.):{content:fill:press_changing} 

Extrema

diff --git a/webstuff/frontend/content/modules/mod_rain.html b/webstuff/frontend/content/modules/mod_rain.html index 88631e9..0885476 100644 --- a/webstuff/frontend/content/modules/mod_rain.html +++ b/webstuff/frontend/content/modules/mod_rain.html @@ -3,33 +3,33 @@

Aktuelle Werte

- + - + - + - + - +
Letze Stunde:{content:fill:rain_now_hour} l/m2Letze Stunde:{content:fill:rain_now_hour} l/m2
Heute:{content:fill:rain_now_day} l/m2 Heute:{content:fill:rain_now_day} l/m2 
Diesen Monat:{content:fill:rain_now_month} l/m2 Diesen Monat:{content:fill:rain_now_month} l/m2 
Dies Jahr:{content:fill:rain_now_year} l/m2 Dies Jahr:{content:fill:rain_now_year} l/m2 
Seit Messbegin:{content:fill:rain_now_all} l/m2 Seit Messbegin:{content:fill:rain_now_all} l/m2 

Extrema

- + - + - + - +
Regenreichste Stunde:{content:fill:rain_max_hour_val} l/m2{content:fill:rain_max_hour_date}Regenreichste Stunde:{content:fill:rain_max_hour_val} l/m2{content:fill:rain_max_hour_date}
Regenreichster Tag:{content:fill:rain_max_day_val} l/m2{content:fill:rain_max_day_date}Regenreichster Tag:{content:fill:rain_max_day_val} l/m2{content:fill:rain_max_day_date}
Regenreichster Monat:{content:fill:rain_max_month_val} l/m2{content:fill:rain_max_month_date}Regenreichster Monat:{content:fill:rain_max_month_val} l/m2{content:fill:rain_max_month_date}
Regenreichstes Jahr:{content:fill:rain_max_year_val} l/m2{content:fill:rain_max_year_date}Regenreichstes Jahr:{content:fill:rain_max_year_val} l/m2{content:fill:rain_max_year_date}
diff --git a/webstuff/frontend/content/modules/mod_temp.html b/webstuff/frontend/content/modules/mod_temp.html index fda6c76..501a656 100644 --- a/webstuff/frontend/content/modules/mod_temp.html +++ b/webstuff/frontend/content/modules/mod_temp.html @@ -9,7 +9,7 @@ Durchschnitt ({content:fill:temp_av_interval} min.):{content:fill:temp_av_value}°C  - Tendenz (2 std.):{content:fill:temp_changing}  + Tendenz (2 std.):{content:fill:temp_changing} 

Extrema

diff --git a/webstuff/frontend/php_inc/module.inc.php b/webstuff/frontend/php_inc/module.inc.php index dc737f4..014c0e4 100644 --- a/webstuff/frontend/php_inc/module.inc.php +++ b/webstuff/frontend/php_inc/module.inc.php @@ -5,6 +5,7 @@ include_once("php_inc/modules/temp.inc.php"); /* Temp-Klasse */ include_once("php_inc/modules/rain.inc.php"); /* Rain-Klasse */ include_once("php_inc/modules/hum.inc.php"); /* Hum-Klasse */ include_once("php_inc/modules/press.inc.php"); /* Press-Klasse */ +include_once("php_inc/modules/wind.inc.php"); /* Wind-Klasse */ /* Representiert ein Modul */ class Module{ @@ -17,6 +18,8 @@ class Module{ var $tempInstance = NULL; /* Temp-Instanz */ var $rainInstance = NULL; /* Rain-Instanz */ var $humInstance = NULL; /* Hum-Instanz */ + var $windInstance = NULL; /* Wind-Instanz */ + var $pressInstance = NULL; /* Press-Instanz */ /* Konstruktor */ function Module($modName, $sensId, &$parser, &$connection){ @@ -71,6 +74,13 @@ class Module{ return $this->pressInstance; } + /* Instanz der Wind-Klasse holen */ + function &_get_wind(){ + if($this->windInstance == NULL) + $this->windInstance = new Wind($this->sensId, $this->connection); + return $this->windInstance; + } + /* Callback-Funktion, wird ausgeführt wenn {content:fill:xyz} gefunden wird */ function fill($contentId){ $content_split = explode("_", $contentId); /* Modultyp bekommen */