Mallette DMG / Mbed 2 deprecated Mallette_DMG_V14

THEME AND FONT

Dependencies:   TS_DISCO_F746NG mbed LCD_DISCO_F746NG BSP_DISCO_F746NG lvgl_RB FastPWM millis

Files at this revision

API Documentation at this revision

Revision 5:cab3e2179cbf, committed 2020-01-29

Comitter:
kisvegabor
Date:
Wed Jan 29 06:48:41 2020 +0000
Parent:
4:6a3d12663549
Commit message:
declare custom fonts

Changed in this revision

lv_conf.h Show annotated file Show diff for this revision Revisions of this file
lvgl.lib Show annotated file Show diff for this revision Revisions of this file
lvgl_RB.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
my_theme.c Show annotated file Show diff for this revision Revisions of this file
my_theme.h Show annotated file Show diff for this revision Revisions of this file 
diff -r 6a3d12663549 -r cab3e2179cbf lv_conf.h
--- a/lv_conf.h	Sun Jan 26 16:19:54 2020 +0000
+++ b/lv_conf.h	Wed Jan 29 06:48:41 2020 +0000
@@ -270,8 +270,8 @@
  * #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(my_font_1) \
  *                                LV_FONT_DECLARE(my_font_2)
  */
-#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(RB_LV_FONT_ROBOTO_16) //GABOR
-
+#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(RB_lv_font_roboto_16) \ 
+                               LV_FONT_DECLARE(RB_lv_font_roboto_12) 
 
 /*Always set a default font from the built-in fonts*/
 #define LV_FONT_DEFAULT        &lv_font_roboto_16

diff -r 6a3d12663549 -r cab3e2179cbf lvgl.lib
--- a/lvgl.lib	Sun Jan 26 16:19:54 2020 +0000
+++ b/lvgl.lib	Wed Jan 29 06:48:41 2020 +0000
@@ -1,1 +1,1 @@
-https://github.com/littlevgl/lvgl.git/#51928059d2dda465ab76ee66cf37b9d2edb9f64e
+https://github.com/littlevgl/lvgl.git/#10b9c9b2f5344e7b2f5cc00a19ed86ed56ae9866

diff -r 6a3d12663549 -r cab3e2179cbf lvgl_RB.lib
--- a/lvgl_RB.lib	Sun Jan 26 16:19:54 2020 +0000
+++ b/lvgl_RB.lib	Wed Jan 29 06:48:41 2020 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/users/becanromain/code/lvgl_RB/#e82c05b4b6f9
+https://os.mbed.com/teams/Malette-DMG/code/lvgl_RB/#b9747da54267

diff -r 6a3d12663549 -r cab3e2179cbf main.cpp
--- a/main.cpp	Sun Jan 26 16:19:54 2020 +0000
+++ b/main.cpp	Wed Jan 29 06:48:41 2020 +0000
@@ -335,7 +335,7 @@
     //INITIALISATION MULTILANGUE
     lv_i18n_init(lv_i18n_language_pack);
     lv_i18n_set_locale("fr");
-    lv_i18n_set_locale("en-GB");
+    //lv_i18n_set_locale("en-GB");
 
     initialisation();
     AFFBandeauHaut(0);
@@ -519,7 +519,7 @@
 void initialisation(void)
 {
     //CHARGEMENT DU THEME
-    th_act = lv_theme_rb_init(0, NULL); //Gabor: When i change something in my Theme nothing's happen. Can you see in /lvgl_RB/lv_theme_rb.c
+    th_act = lv_theme_rb_init(0, &RB_lv_font_roboto_12); //Gabor: When i change something in my Theme nothing's happen. Can you see in /lvgl_RB/lv_theme_rb.c
   //    th_act = lv_theme_night_init(0, NULL);
     lv_theme_set_current(th_act);
 

diff -r 6a3d12663549 -r cab3e2179cbf my_theme.c

diff -r 6a3d12663549 -r cab3e2179cbf my_theme.h