- lcd4linux: sync with horsti58

package/lcd4linux/files-skel/etc/lcd4linux.conf

@@ -466,6 +466,42 @@ Widget ICON_WEATHER1 {
 	reload		1
 	scale		300
 }
+Widget ICON_WEATHER2 {
+	class		'Image'
+	file		file::exist(FWEATHER) == 0 ? ICONS . 'mode/weather_off.png' : ICONS . 'mode/weather_on.png'
+	update		10000
+	reload		1
+	scale		200
+}
+
+Widget S1_WIND {
+	class		'Image'
+	file		file::exist(FWEATHER) == 0 ? '' : (VAR1=file::readline(W . 'wind', 1); VAR2=substr(VAR1, strstr(VAR1, '|') + 1); W_ICON . (VAR2 < 22.5 ? 'N' : (VAR2 < 67.5 ? 'NO' : (VAR2 < 112.5 ? 'O' : (VAR2 < 157.5 ? 'SO' : (VAR2 < 202.5 ? 'S' : (VAR2 < 247.5 ? 'SW' : (VAR2 < 292.5 ? 'W' : (VAR2 > 292 ? 'NW' : 'Variable')))))))) . '.png')
+	update		4000
+	reload		1
+	align		'L'
+	scale		20
+}
+
+Widget S_WIND {
+	class		'Image'
+	file		file::exist(FWEATHER) == 0 ? '' :  (VAR0=file::readline(W . 'wind', 1); VAR1=substr(VAR0, strstr(VAR0, '|') + 1); VAR2=substr(VAR1, strstr(VAR1,'|') + 1); W_ICON . VAR2 . '.png')
+	update		4000
+	reload		1
+	align		'L'
+}
+
+Widget SS_WIND {
+	class		'Truetype'
+	font		file::readline('/tmp/lcd/font', 1)
+	fcolor		'EEEEEE'
+	width		90
+	height		35
+	align		'L'
+	expression	file::exist(FWEATHER) == 0 ? '' : round(substr(file::readline(W . 'wind', 1), 0, strstr(file::readline(W . 'wind', 1), '|'))). ' km/h'
+	update		10000
+	reload		1
+}
 
 Widget WEATHER_CITY1 {
 	class		'Truetype'
@@ -484,6 +520,7 @@ Widget WEATHERICON_CURRENT {
 	file		file::exist(FWEATHER) == 0 ? ICONS . 'blank.png' : file::readline('/tmp/lcd/weather_icon', 1)
 	update		10000
 	reload		1
+	scale		100
 }
 
 Widget WEATHERICON_LATER {
@@ -491,6 +528,7 @@ Widget WEATHERICON_LATER {
 	file		file::exist(FWEATHER) == 0 ? ICONS . 'blank.png' : file::readline('/tmp/lcd/weather_icon', strftime('%H', time()) < 16 ? 2 : 3)
 	update		10000
 	reload		1
+	scale		100
 }
 
 Widget TEMPERATURE_CURRENT {
@@ -506,9 +544,9 @@ Widget TEMPERATURE_CURRENT1 {
 	class		'Truetype'
 	font		file::readline('/tmp/lcd/font', 1)
 	fcolor		'EEEEEE'
-	width		100
-	height		50
-	align		'L'
+	width		64
+	height		35
+	align		'C'
 	expression	file::exist(FWEATHER) == 0 ? '' : file::readline('/tmp/lcd/weather_temp', 1)
 	update		10000
 	reload		1
@@ -527,9 +565,9 @@ Widget TEMPERATURE_LATER1 {
 	class		'Truetype'
 	font		file::readline('/tmp/lcd/font', 1)
 	fcolor		'EEEEEE'
-	width		100
-	height		50
-	align		'R'
+	width		64
+	height		35
+	align		'C'
 	expression	file::exist(FWEATHER) == 0 ? '' : (TEMP=file::readline('/tmp/lcd/weather_temp', strftime('%H', time()) < 16 ? 2 : 3); substr(TEMP, (strstr(TEMP, '|') + 1)))
 	update		10000
 	reload		1
@@ -1601,7 +1639,7 @@ Widget RES1024x600 {
 
 Widget S_HOUR1_ {
 	class		'image'
-	file		ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%H', time()), 0, 1) . '.png'
+	file		ICONS . 'clock/digital_white_129px/' . substr(strftime('%H', time()), 0, 1) . '.png'
 	update		10000
 	reload		1
 	scale		50
@@ -1609,7 +1647,7 @@ Widget S_HOUR1_ {
 
 Widget S_HOUR_1 {
 	class		'image'
-	file		ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%H', time()), 1) . '.png'
+	file		ICONS . 'clock/digital_white_129px/' . substr(strftime('%H', time()), 1) . '.png'
 	update		10000
 	reload		1
 	scale		50
@@ -1617,14 +1655,14 @@ Widget S_HOUR_1 {
 
 Widget S_DP {
 	class		'Image'
-	file		ICONS . 'clock/digital_weiss_129px/dp.png'
+	file		ICONS . 'clock/digital_white_129px/dp.png'
 	update		0
 	scale		50
 }
 
 Widget S_MIN1_ {
 	class		'image'
-	file		ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%M', time()), 0, 1) . '.png'
+	file		ICONS . 'clock/digital_white_129px/' . substr(strftime('%M', time()), 0, 1) . '.png'
 	update		10000
 	reload		1
 	scale		50
@@ -1632,7 +1670,7 @@ Widget S_MIN1_ {
 
 Widget S_MIN_1 {
 	class		'image'
-	file		ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%M', time()), 1) . '.png'
+	file		ICONS . 'clock/digital_white_129px/' . substr(strftime('%M', time()), 1) . '.png'
 	update		10000
 	reload		1
 	scale		50
@@ -1640,7 +1678,7 @@ Widget S_MIN_1 {
 
 Widget S_STANDBY_HOUR1_ {
 	class		'image'
-	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%H', time()), 0, 1) . '.png'
+	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_white_129px/' . substr(strftime('%H', time()), 0, 1) . '.png'
 	update		10000
 	reload		1
 	scale		130
@@ -1648,7 +1686,7 @@ Widget S_STANDBY_HOUR1_ {
 
 Widget S_STANDBY_HOUR_1 {
 	class		'image'
-	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%H', time()), 1) . '.png'
+	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_white_129px/' . substr(strftime('%H', time()), 1) . '.png'
 	update		10000
 	reload		1
 	scale		130
@@ -1656,14 +1694,14 @@ Widget S_STANDBY_HOUR_1 {
 
 Widget S_STANDBY_DP {
 	class		'Image'
-	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_weiss_129px/dp.png'
+	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_white_129px/dp.png'
 	update		0
 	scale		130
 }
 
 Widget S_STANDBY_MIN1_ {
 	class		'image'
-	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%M', time()), 0, 1) . '.png'
+	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_white_129px/' . substr(strftime('%M', time()), 0, 1) . '.png'
 	update		10000
 	reload		1
 	scale		130
@@ -1671,7 +1709,7 @@ Widget S_STANDBY_MIN1_ {
 
 Widget S_STANDBY_MIN_1 {
 	class		'image'
-	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%M', time()), 1) . '.png'
+	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_white_129px/' . substr(strftime('%M', time()), 1) . '.png'
 	update		10000
 	reload		1
 	scale		130
@@ -1712,12 +1750,12 @@ Layout Samsung800x600_standard {
 		X1.Y1		'S800x600_BG1'
 	}
 	Layer 1 {
-		X17.Y220	'S_TIMER'
-		X17.Y345	'S_REC'
-		X17.Y435	'S_TS'
-		X17.Y505	'S_ECM'
-		X17.Y585	'S_CI'
-		X17.Y670	'S_CAMD'
+		X17.Y200	'S_TIMER'
+		X17.Y325	'S_REC'
+		X17.Y415	'S_TS'
+		X17.Y475	'S_CI'
+		X17.Y560	'S_CAMD'
+		X17.Y710	'S_ECM'
 		X70.Y10		'S_LOGO'
 		X222.Y435	'S_VFORMAT'
 		X222.Y485	'S_ASPECTRATIO'
@@ -1729,17 +1767,19 @@ Layout Samsung800x600_standard {
 		X260.Y165	'S_TTF-EPG-NOW'
 		X320.Y165	'S_TTF-EPG-NEXT'
 		X320.Y20	'S_END'
-		X480.Y315	'ICON_WEATHER1'
-		X500.Y230	'WEATHERICON_CURRENT'
-		X500.Y530	'WEATHERICON_LATER'
-		X510.Y300	'TEMPERATURE_CURRENT1'
-		X510.Y420	'TEMPERATURE_LATER1'
-		X500.Y20	'S_HOUR1_'
+		X480.Y310	'ICON_WEATHER1'
+		X490.Y250	'WEATHERICON_CURRENT'
+		X560.Y250	'TEMPERATURE_CURRENT1'
+		X505.Y325	'S_WIND'
+		X530.Y415	'SS_WIND'
+		X490.Y530	'WEATHERICON_LATER'
+		X560.Y530	'TEMPERATURE_LATER1'
+		X500.Y15	'S_HOUR1_'
 		X500.Y65	'S_HOUR_1'
-		X500.Y108	'S_DP'
-		X500.Y125	'S_MIN1_'
-		X500.Y170	'S_MIN_1'
-		X510.Y610	'S_DURATION'
+		X500.Y115	'S_DP'
+		X500.Y130	'S_MIN1_'
+		X500.Y180	'S_MIN_1'
+		X510.Y615	'S_DURATION'
 		X580.Y5		'HST'
 		X580.Y700	'RES800x600'
 	}
@@ -1757,27 +1797,29 @@ Layout Samsung800x480_standard {
 		X1.Y1		'S800x480_BG1'
 	}
 	Layer 1 {
-		X10.Y220	'S_TIMER'
-		X10.Y345	'S_REC'
-		X10.Y435	'S_TS'
-		X10.Y505	'S_ECM'
-		X10.Y585	'S_CI'
-		X10.Y670	'S_CAMD'
+		X10.Y200	'S_TIMER'
+		X12.Y325	'S_REC'
+		X10.Y415	'S_TS'
+		X10.Y475	'S_CI'
+		X10.Y560	'S_CAMD'
+		X10.Y710	'S_ECM'
 		X40.Y10		'S_LOGO'
 		X205.Y20	'S_START'
 		X205.Y165	'S_TTF-EPG-NOW'
 		X260.Y165	'S_TTF-EPG-NEXT'
 		X260.Y20	'S_END'
-		X380.Y315	'ICON_WEATHER1'
-		X400.Y230	'WEATHERICON_CURRENT'
-		X400.Y530	'WEATHERICON_LATER'
-		X410.Y300	'TEMPERATURE_CURRENT1'
-		X410.Y420	'TEMPERATURE_LATER1'
-		X400.Y20	'S_HOUR1_'
+		X380.Y340	'ICON_WEATHER2'
+		X380.Y240	'WEATHERICON_CURRENT'
+		X445.Y240	'TEMPERATURE_CURRENT1'
+		X398.Y355	'S_WIND'
+		X425.Y445	'SS_WIND'
+		X380.Y560	'WEATHERICON_LATER'
+		X445.Y560	'TEMPERATURE_LATER1'
+		X400.Y15	'S_HOUR1_'
 		X400.Y65	'S_HOUR_1'
-		X400.Y108	'S_DP'
-		X400.Y125	'S_MIN1_'
-		X400.Y170	'S_MIN_1'
+		X400.Y115	'S_DP'
+		X400.Y130	'S_MIN1_'
+		X400.Y180	'S_MIN_1'
 		X410.Y630	'S_DURATION'
 		X460.Y5		'HST'
 		X460.Y700	'RES800x480'
@@ -1796,33 +1838,35 @@ Layout Samsung1024x600_standard {
 		X1.Y1		'S1024x600_BG1'
 	}
 	Layer 1 {
-		X13.Y220	'S_TIMER'
-		X13.Y345	'S_REC'
-		X13.Y435	'S_TS'
-		X13.Y505	'S_ECM'
-		X13.Y585	'S_CI'
-		X13.Y670	'S_CAMD'
+		X13.Y330	'S_TIMER'
+		X13.Y475	'S_REC'
+		X13.Y585	'S_TS'
+		X13.Y665	'S_CI'
+		X13.Y770	'S_CAMD'
+		X13.Y930	'S_ECM'
 		X60.Y10		'S_LOGO1'
-		X222.Y435	'S_VFORMAT'
-		X222.Y485	'S_ASPECTRATIO'
-		X222.Y550	'S_DOLBY'
-		X222.Y600	'S_TXT'
-		X222.Y650	'S_TUNERTXT'
-		X222.Y755	'S_TUNER'
+		X222.Y645	'S_VFORMAT'
+		X222.Y695	'S_ASPECTRATIO'
+		X222.Y760	'S_DOLBY'
+		X222.Y810	'S_TXT'
+		X222.Y860	'S_TUNERTXT'
+		X222.Y965	'S_TUNER'
 		X260.Y20	'S_START'
 		X260.Y190	'S_TTF-EPG-NOW1'
 		X320.Y190	'S_TTF-EPG-NEXT1'
 		X320.Y20	'S_END'
-		X480.Y415	'ICON_WEATHER1'
-		X500.Y230	'WEATHERICON_CURRENT'
-		X500.Y730	'WEATHERICON_LATER'
-		X510.Y300	'TEMPERATURE_CURRENT1'
-		X510.Y620	'TEMPERATURE_LATER1'
-		X500.Y20	'S_HOUR1_'
+		X480.Y410	'ICON_WEATHER1'
+		X490.Y300	'WEATHERICON_CURRENT'
+		X560.Y300	'TEMPERATURE_CURRENT1'
+		X505.Y425	'S_WIND'
+		X530.Y515	'SS_WIND'
+		X490.Y680	'WEATHERICON_LATER'
+		X560.Y680	'TEMPERATURE_LATER1'
+		X500.Y15	'S_HOUR1_'
 		X500.Y65	'S_HOUR_1'
-		X500.Y108	'S_DP'
-		X500.Y125	'S_MIN1_'
-		X500.Y170	'S_MIN_1'
+		X500.Y115	'S_DP'
+		X500.Y130	'S_MIN1_'
+		X500.Y180	'S_MIN_1'
 		X510.Y830	'S_DURATION'
 		X580.Y5		'HST'
 		X580.Y924	'RES1024x600'
@@ -1841,12 +1885,12 @@ Layout Samsung800x600_radio {
 		X1.Y1		'S800x600_BG1'
 	}
 	Layer 1 {
-		X17.Y220	'S_TIMER'
-		X17.Y345	'S_REC'
-		X17.Y435	'S_TS'
-		X17.Y505	'S_ECM'
-		X17.Y585	'S_CI'
-		X17.Y670	'S_CAMD'
+		X17.Y200	'S_TIMER'
+		X17.Y325	'S_REC'
+		X17.Y415	'S_TS'
+		X17.Y475	'S_CI'
+		X17.Y560	'S_CAMD'
+		X17.Y710	'S_ECM'
 		X70.Y10		'S_LOGO'
 		X222.Y435	'S_VFORMAT'
 		X222.Y485	'S_ASPECTRATIO'
@@ -1858,11 +1902,18 @@ Layout Samsung800x600_radio {
 		X260.Y165	'S_TTF-EPG-NOW'
 		X320.Y165	'S_TTF-EPG-NEXT'
 		X320.Y20	'S_END'
-		X480.Y125	'S_HOUR1_'
-		X480.Y190	'S_HOUR_1'
-		X480.Y254	'S_DP'
-		X480.Y286	'S_MIN1_'
-		X480.Y351	'S_MIN_1'
+		X480.Y310	'ICON_WEATHER1'
+		X490.Y250	'WEATHERICON_CURRENT'
+		X560.Y250	'TEMPERATURE_CURRENT1'
+		X505.Y325	'S_WIND'
+		X530.Y415	'SS_WIND'
+		X490.Y530	'WEATHERICON_LATER'
+		X560.Y530	'TEMPERATURE_LATER1'
+		X500.Y15	'S_HOUR1_'
+		X500.Y65	'S_HOUR_1'
+		X500.Y115	'S_DP'
+		X500.Y130	'S_MIN1_'
+		X500.Y180	'S_MIN_1'
 		X520.Y610	'S_DURATION'
 		X580.Y5		'HST'
 		X580.Y700	'RES800x600'
@@ -1881,12 +1932,12 @@ Layout Samsung800x480_radio {
 		X1.Y1		'S800x480_BG1'
 	}
 	Layer 1 {
-		X10.Y220	'S_TIMER'
-		X10.Y345	'S_REC'
-		X10.Y435	'S_TS'
-		X10.Y505	'S_ECM'
-		X10.Y585	'S_CI'
-		X10.Y670	'S_CAMD'
+		X17.Y200	'S_TIMER'
+		X17.Y325	'S_REC'
+		X17.Y415	'S_TS'
+		X17.Y475	'S_CI'
+		X17.Y560	'S_CAMD'
+		X17.Y710	'S_ECM'
 		X40.Y10		'S_LOGO'
 		X205.Y20	'S_START'
 		X205.Y165	'S_TTF-EPG-NOW'
@@ -1915,28 +1966,35 @@ Layout Samsung1024x600_radio {
 		X1.Y1		'S1024x600_BG1'
 	}
 	Layer 1 {
-		X13.Y220	'S_TIMER'
-		X13.Y345	'S_REC'
-		X13.Y435	'S_TS'
-		X13.Y505	'S_ECM'
-		X13.Y585	'S_CI'
-		X13.Y670	'S_CAMD'
+		X13.Y330	'S_TIMER'
+		X13.Y475	'S_REC'
+		X13.Y585	'S_TS'
+		X13.Y665	'S_CI'
+		X13.Y770	'S_CAMD'
+		X13.Y930	'S_ECM'
 		X60.Y10		'S_LOGO1'
-		X222.Y435	'S_VFORMAT'
-		X222.Y485	'S_ASPECTRATIO'
-		X222.Y550	'S_DOLBY'
-		X222.Y600	'S_TXT'
-		X222.Y650	'S_TUNERTXT'
-		X222.Y755	'S_TUNER'
+		X222.Y635	'S_VFORMAT'
+		X222.Y685	'S_ASPECTRATIO'
+		X222.Y750	'S_DOLBY'
+		X222.Y800	'S_TXT'
+		X222.Y850	'S_TUNERTXT'
+		X222.Y955	'S_TUNER'
 		X260.Y20	'S_START'
 		X260.Y190	'S_TTF-EPG-NOW1'
 		X320.Y190	'S_TTF-EPG-NEXT1'
 		X320.Y20	'S_END'
-		X480.Y130	'S_HOUR1_'
-		X480.Y195	'S_HOUR_1'
-		X480.Y260	'S_DP'
-		X480.Y293	'S_MIN1_'
-		X480.Y358	'S_MIN_1'
+		X480.Y410	'ICON_WEATHER1'
+		X490.Y300	'WEATHERICON_CURRENT'
+		X560.Y300	'TEMPERATURE_CURRENT1'
+		X505.Y425	'S_WIND'
+		X530.Y515	'SS_WIND'
+		X490.Y680	'WEATHERICON_LATER'
+		X560.Y680	'TEMPERATURE_LATER1'
+		X500.Y15	'S_HOUR1_'
+		X500.Y65	'S_HOUR_1'
+		X500.Y115	'S_DP'
+		X500.Y130	'S_MIN1_'
+		X500.Y180	'S_MIN_1'
 		X520.Y830	'S_DURATION'
 		X580.Y5		'HST'
 		X580.Y924	'RES1024x600'
@@ -2069,22 +2127,24 @@ Layout Samsung800x600_standby {
 		X1.Y1		'S800x600_STB1'
 	}
 	layer 1 {
-		X17.Y220	'S_TIMER'
-		X17.Y345	'S_REC'
-		X17.Y435	'S_TS'
-		X17.Y505	'S_ECM'
-		X17.Y585	'S_CI'
-		X17.Y670	'S_CAMD'
+		X17.Y200	'S_TIMER'
+		X17.Y325	'S_REC'
+		X17.Y415	'S_TS'
+		X17.Y475	'S_CI'
+		X17.Y560	'S_CAMD'
+		X17.Y710	'S_ECM'
 		X70.Y0		'TAGDATUM-TTF'
-		X160.Y123	'S_STANDBY_HOUR1_'
-		X160.Y244	'S_STANDBY_HOUR_1'
-		X160.Y365	'S_STANDBY_DP'
-		X160.Y427	'S_STANDBY_MIN1_'
-		X160.Y548	'S_STANDBY_MIN_1'
-		X450.Y310	'ICON_WEATHER1'
+		X160.Y120	'S_STANDBY_HOUR1_'
+		X160.Y250	'S_STANDBY_HOUR_1'
+		X160.Y372	'S_STANDBY_DP'
+		X160.Y410	'S_STANDBY_MIN1_'
+		X160.Y540	'S_STANDBY_MIN_1'
+		X400.Y310	'ICON_WEATHER1'
+		X505.Y325	'S_WIND'
+		X530.Y415	'SS_WIND'
 		X500.Y050	'WEATHERICON_CURRENT'
 		X500.Y700	'WEATHERICON_LATER'
-		X510.Y250	'WEATHER_CITY1'
+		X430.Y250	'WEATHER_CITY1'
 		X510.Y140	'TEMPERATURE_CURRENT1'
 		X510.Y590	'TEMPERATURE_LATER1'
 		X580.Y5		'HST_STB'
@@ -2100,24 +2160,25 @@ Layout Samsung800x480_standby {
 		X1.Y1		'S800x480_STB1'
 	}
 	layer 1 {
-		X10.Y220	'S_TIMER'
-		X10.Y345	'S_REC'
-		X10.Y435	'S_TS'
-		X10.Y505	'S_ECM'
-		X10.Y585	'S_CI'
-		X10.Y670	'S_CAMD'
+		X10.Y200	'S_TIMER'
+		X10.Y325	'S_REC'
+		X10.Y415	'S_TS'
+		X10.Y475	'S_CI'
+		X10.Y560	'S_CAMD'
+		X10.Y710	'S_ECM'
 		X70.Y0		'TAGDATUM-TTF'
 		X160.Y123	'S_STANDBY_HOUR1_'
 		X160.Y244	'S_STANDBY_HOUR_1'
-		X160.Y365	'S_STANDBY_DP'
+		X160.Y376	'S_STANDBY_DP'
 		X160.Y427	'S_STANDBY_MIN1_'
 		X160.Y548	'S_STANDBY_MIN_1'
-		X380.Y310	'ICON_WEATHER1'
-		X400.Y050	'WEATHERICON_CURRENT'
-		X400.Y700	'WEATHERICON_LATER'
-		X410.Y250	'WEATHER_CITY1'
-		X410.Y140	'TEMPERATURE_CURRENT1'
-		X410.Y590	'TEMPERATURE_LATER1'
+		X395.Y110	'WEATHER_CITY1'
+		X385.Y410	'S_WIND'
+		X410.Y510	'SS_WIND'
+		X395.Y040	'WEATHERICON_CURRENT'
+		X405.Y110	'TEMPERATURE_CURRENT1'
+		X395.Y710	'WEATHERICON_LATER'
+		X405.Y630	'TEMPERATURE_LATER1'
 		X460.Y5		'HST_STB'
 		X460.Y700	'RES800x480'
 	}
@@ -2131,22 +2192,24 @@ Layout Samsung1024x600_standby {
 		X1.Y1		'S1024x600_STB1'
 	}
 	layer 1 {
-		X10.Y220	'S_TIMER'
-		X10.Y345	'S_REC'
-		X10.Y435	'S_TS'
-		X10.Y505	'S_ECM'
-		X10.Y585	'S_CI'
-		X10.Y670	'S_CAMD'
+		X13.Y330	'S_TIMER'
+		X13.Y475	'S_REC'
+		X13.Y585	'S_TS'
+		X13.Y665	'S_CI'
+		X13.Y770	'S_CAMD'
+		X13.Y930	'S_ECM'
 		X70.Y12		'TAGDATUM-TTF1'
 		X160.Y230	'S_STANDBY_HOUR1_'
 		X160.Y354	'S_STANDBY_HOUR_1'
-		X160.Y475	'S_STANDBY_DP'
+		X160.Y490	'S_STANDBY_DP'
 		X160.Y538	'S_STANDBY_MIN1_'
 		X160.Y661	'S_STANDBY_MIN_1'
-		X450.Y410	'ICON_WEATHER1'
+		X400.Y410	'ICON_WEATHER1'
+		X505.Y425	'S_WIND'
+		X530.Y515	'SS_WIND'
 		X500.Y050	'WEATHERICON_CURRENT'
 		X500.Y900	'WEATHERICON_LATER'
-		X510.Y350	'WEATHER_CITY1'
+		X430.Y350	'WEATHER_CITY1'
 		X510.Y140	'TEMPERATURE_CURRENT1'
 		X510.Y790	'TEMPERATURE_LATER1'
 		X580.Y5		'HST_STB'
@@ -2160,6 +2223,8 @@ Layout Samsung1024x600_standby {
 # --- General Settings ------------------------------------------------------ #
 
 Variables {
+	W		'/tmp/lcd/weather_'
+	W_ICON		'/share/lcd/icons/wind/'
 	ICONS		'/share/lcd/icons/'
 	SYSICONS	'/share/tuxbox/neutrino/icons/'
 	FWEATHER	'/var/etc/.lcd-weather'