Merge pull request #64 from destroyedlolo/DRMCairo

Drm cairo
destroyedlolo · Jun 10, 2023 · d2d4347 · d2d4347
2 parents acec6e7 + 324675b
commit d2d4347
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/SeleniteDRMCairo/HDB/70_Meteo.lua b/SeleniteDRMCairo/HDB/70_Meteo.lua
@@ -98,6 +98,7 @@ local function meteo()
 		timeout = 87000,
 		align = ALIGN_CENTER,
 		suffix = '°C',
+		ndecimal=2,
 		sample_text = '-88.88°C',
 		gradient = GRD_TEMPERATURE
 	} )
@@ -116,6 +117,7 @@ local function meteo()
 
 	local srf_maxtemp = FieldBlink( srf_Gfx, animTimer, 2, 2, fonts.sdigit, COL_DIGIT, {
 		align = ALIGN_RIGHT,
+		ndecimal=2,
 		sample_text = '-88.88',
 		bgcolor = COL_TRANSPARENT,
 		included = true,
@@ -124,6 +126,7 @@ local function meteo()
 
 	local srf_mintemp = FieldBlink( srf_Gfx, animTimer, 2, 285-fonts.sdigit.size, fonts.sdigit, COL_DIGIT, {
 		align = ALIGN_RIGHT,
+		ndecimal=2,
 		sample_text = '-88.88',
 		bgcolor = COL_TRANSPARENT,
 		included = true,

diff --git a/SeleniteDRMCairo/HDB/75_SousSol.lua b/SeleniteDRMCairo/HDB/75_SousSol.lua
@@ -215,6 +215,7 @@ local function soussol()
 		font=fonts.smdigit, 
 		width = WINSIZE.w - 837,
 		timeout = 310,
+		align = ALIGN_RIGHT,
 		icon=true 
 	})
 
@@ -225,6 +226,7 @@ local function soussol()
 		gradient = GRD_CONNECTION,
 		sample_text = "888888mS",
 		suffix = "mS",
+		align = ALIGN_RIGHT,
 		icon=MQTTImg
 	})
 
@@ -235,6 +237,7 @@ local function soussol()
 		gradient = GRD_CONNECTION,
 		sample_text = "888888mS",
 		suffix = "mS",
+		align = ALIGN_RIGHT,
 		icon=WiFiImg
 	})
 
@@ -246,6 +249,7 @@ local function soussol()
 		gradient = GRD_BAT5V,
 		sample_text = "8888mV",
 		suffix = "mV",
+		align = ALIGN_RIGHT,
 		icon=BatteryImg
 	})
 

diff --git a/SeleniteDRMCairo/HDB/80_RDC.lua b/SeleniteDRMCairo/HDB/80_RDC.lua
@@ -77,7 +77,7 @@ local function rdc()
 		}
 	)
 
-	local srf_JourFerie = FieldBlink( self, animTimer, 820, 580, fonts.digit, COL_DIGIT, {
+	local srf_JourFerie = FieldBlink( self, animTimer, 750, 580, fonts.digit, COL_DIGIT, {
 		align = ALIGN_CENTER, 
 		sample_text = "Victoire des allies",
 		ownsurface=true,
@@ -88,7 +88,7 @@ local function rdc()
 --		debug = 'JourFerieSN'
 	})
 
-	local srf_DateFerie = FieldBlink( self, animTimer, 760, 625, fonts.mdigit, COL_ORANGE, {
+	local srf_DateFerie = FieldBlink( self, animTimer, 710, 625, fonts.mdigit, COL_ORANGE, {
 		align = ALIGN_CENTER, 
 		sample_text = "Vendredi 30 Septembre 2022",
 		ownsurface=true,
@@ -102,7 +102,7 @@ local function rdc()
 		[15] = COL_GREEN,
 	} )
 
-	local srf_FerieCompteur = FieldBlink( self, animTimer, 1050, 540, fonts.mdigit, COL_ORANGE, {
+	local srf_FerieCompteur = FieldBlink( self, animTimer, 1040, 540, fonts.mdigit, COL_ORANGE, {
 		align = ALIGN_CENTER, 
 		sample_text = "99 jours",
 		ownsurface=true,