Restore settings

.github/workflows/build.yaml

@@ -17,21 +17,21 @@ jobs:
       matrix:
         environments:
           # - d1-mini-esp8266_ili9341
-          - '-e arduitouch-esp32_ili9341'
+          - 'arduitouch-esp32_ili9341'
-          - '-e d1-mini-esp32_ili9341'
+          - 'd1-mini-esp32_ili9341'
-          - '-e esp32-one_st7796'
+          - 'esp32-one_st7796'
-          - '-e esp32-touchdown'
+          - 'esp32-touchdown'
-          - '-e freetouchdeck'
+          - 'freetouchdeck -e freetouchdeck_8MB'
-          - '-e huzzah32-featherwing-24'
+          - 'huzzah32-featherwing-24'
-          - '-e huzzah32-featherwing-35'
+          - 'huzzah32-featherwing-35'
-          - '-e lanbon_l8'
+          - 'lanbon_l8'
-          - '-e lolin-d32-pro_ili9341'
+          - 'lolin-d32-pro_ili9341'
-          - '-e m5stack-core2'
+          - 'm5stack-core2'
-          - '-e makerfabs-tft35-cap'
+          - 'makerfabs-tft35-cap'
-          - '-e ttgo-t7-v1.5_ili9341'
+          - 'ttgo-t7-v1.5_ili9341'
-          - '-e wt32-sc01'
+          - 'wt32-sc01'
-          - '-e yeacreate-nscreen32'
+          - 'yeacreate-nscreen32'
-          - '-e linux_sdl_64bits'
+          - 'linux_sdl_64bits'
 
     steps:
       - uses: actions/checkout@v2
@@ -73,7 +73,7 @@ jobs:
         run: |
           cat platformio_override.ini
       - name: Run PlatformIO
-        run: pio run ${{ matrix.environments }}
+        run: pio run -e ${{ matrix.environments }}
       - name: Upload output file
         uses: actions/upload-artifact@v2
         with:

include/lv_conf_v7.h

@@ -357,10 +357,10 @@ typedef void* lv_indev_drv_user_data_t;            /*Type of user data in the in
 #define HASP_FONT_2 robotocondensed_regular_24_latin1  /* 5% Width */
 #endif
 #ifndef HASP_FONT_3
-#define HASP_FONT_3 robotocondensed_regular_16_latin1  /* 10% Width */
+#define HASP_FONT_3 robotocondensed_regular_32_latin1  /* 10% Width */
 #endif
 #ifndef HASP_FONT_4
-#define HASP_FONT_4 robotocondensed_regular_16_latin1  /* 10% Height */
+#define HASP_FONT_4 robotocondensed_regular_48_latin1  /* 10% Height */
 #endif
 
 #ifndef ROBOTOCONDENSED_REGULAR_16_LATIN1
@@ -370,10 +370,10 @@ typedef void* lv_indev_drv_user_data_t;            /*Type of user data in the in
 #define ROBOTOCONDENSED_REGULAR_24_LATIN1 1
 #endif
 #ifndef ROBOTOCONDENSED_REGULAR_32_LATIN1
-#define ROBOTOCONDENSED_REGULAR_32_LATIN1 0
+#define ROBOTOCONDENSED_REGULAR_32_LATIN1 1
 #endif
 #ifndef ROBOTOCONDENSED_REGULAR_48_LATIN1
-#define ROBOTOCONDENSED_REGULAR_48_LATIN1 0
+#define ROBOTOCONDENSED_REGULAR_48_LATIN1 1
 #endif
 
 #ifndef HASP_FONT_SIZE_1

src/hasp/hasp.cpp

@@ -535,7 +535,7 @@ void haspSetup(void)
     haspFonts[6] = hasp_font_load("L:/RobotoCondensedRegular.bin");
 
     lv_ft_info_t info;
-    info.name   = "L:/mdi.ttf";
+    info.name   = "L:/arial.ttf";
     info.weight = 48;
     info.style  = FT_FONT_STYLE_NORMAL;
     lv_ft_font_init(&info);

user_setups/esp32/freetouchdeck.ini

@@ -4,8 +4,7 @@
 ;               - xpt2046 touch controller          ;
 ;***************************************************;
 
-[env:freetouchdeck]
+[freetouchdeck]
-extends = esp32_8mb
 board = esp32dev
 
 build_flags =
@@ -49,3 +48,9 @@ lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
 ;endregion
+
+[env:freetouchdeck]
+extends = freetouchdeck, esp32_4mb
+
+[env:freetouchdeck_8MB]
+extends = freetouchdeck, esp32_8mb

user_setups/esp32/wt32-sc01.ini

@@ -5,8 +5,7 @@
 ;               - FT6336U touch controller          ;
 ;***************************************************;
 
-[env:wt32-sc01]
+[wt32-sc01]
-extends = esp32_4mb
 board = esp32dev
 
 build_flags =
@@ -46,3 +45,9 @@ lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
 ;endregion
+
+[env:wt32-sc01]
+extends = wt32-sc01, esp32_4mb
+
+[env:wt32-sc01_16MB]
+extends = wt32-sc01, esp32_16mb