update lvgl and VS files

ataweg · Jul 14, 2024 · 860f845 · 860f845
1 parent 31977e0
commit 860f845
Show file tree

Hide file tree

Showing 11 changed files with 3,750 additions and 19 deletions.
diff --git a/LVGL_Simulator.prj b/LVGL_Simulator.prj
@@ -0,0 +1,18 @@
+[Project ID]
+Signature=UE Proj: v.1
+[Project Information]
+Use Relative Directory=1
+Relative to Project File=1
+Include Sub Directories=1
+Project Tagfile=
+Project Wordfile=
+Project TpFile=
+Filter=
+Create Tagfile=0
+[Files]
+0=.\LvglPlatform\lvgl\examples\
+1=.\LvglPlatform\lvgl\src\
+2=awe-readme.txt
+3=LvglWindowsDesktopApplication\LvglWindowsDesktopApplication.cpp
+4=LvglWindowsSimulator\LvglWindowsSimulator.cpp
+5=LvglWindowsSimulator\lv_conf.h
diff --git a/LvglPlatform/LVGL_Simulator.sln b/LvglPlatform/LVGL_Simulator.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34607.119
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LVGL_Simulator", "LVGL_Simulator.vcxproj", "{1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Debug|x64.ActiveCfg = Debug|x64
+		{1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Debug|x64.Build.0 = Debug|x64
+		{1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Debug|x86.ActiveCfg = Debug|Win32
+		{1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Debug|x86.Build.0 = Debug|Win32
+		{1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Release|x64.ActiveCfg = Release|x64
+		{1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Release|x64.Build.0 = Release|x64
+		{1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Release|x86.ActiveCfg = Release|Win32
+		{1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D1E6F1F4-F30B-412C-A4D8-8B40D9BA076A}
+	EndGlobalSection
+EndGlobal
diff --git a/LvglPlatform/LVGL_Simulator.vcxproj b/LvglPlatform/LVGL_Simulator.vcxproj
diff --git a/LvglPlatform/LVGL_Simulator.vcxproj.filters b/LvglPlatform/LVGL_Simulator.vcxproj.filters
diff --git a/LvglPlatform/lvgl b/LvglPlatform/lvgl
diff --git a/LvglWindows/LvglWindowsStatic.vcxproj b/LvglWindows/LvglWindowsStatic.vcxproj
@@ -1543,6 +1543,9 @@
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\index.rst" />
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\lv_example_keyboard_1.c" />
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\lv_example_keyboard_2.c" />
+    <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\lv_example_keyboard_3.c" />
+    <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\font_montserrat_ger_14.c" />
+    <none Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\font_montserrat_ger_16.c" />
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\label\index.rst" />
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\label\lv_example_label_1.c" />
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\label\lv_example_label_2.c" />

diff --git a/LvglWindows/LvglWindowsStatic.vcxproj.filters b/LvglWindows/LvglWindowsStatic.vcxproj.filters
@@ -5515,6 +5515,14 @@
     </None>
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\lv_example_keyboard_2.c">
       <Filter>lvgl\examples\widgets\keyboard</Filter>
+    <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\lv_example_keyboard_3.c">
+      <Filter>lvgl\examples\widgets\keyboard</Filter>
+    </None>
+    <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\font_montserrat_ger_14.c">
+      <Filter>lvgl\examples\widgets\keyboard</Filter>
+    </None>
+    <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\font_montserrat_ger_16.c">
+      <Filter>lvgl\examples\widgets\keyboard</Filter>
     </None>
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\label\index.rst">
       <Filter>lvgl\examples\widgets\label</Filter>

diff --git a/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj b/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj
@@ -15,6 +15,7 @@
     <MileProjectProductName>LVGL</MileProjectProductName>
     <MileProjectVersion>9.0.0.0</MileProjectVersion>
     <MileProjectVersionTag Condition="false">Alpha 1</MileProjectVersionTag>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />
@@ -943,8 +944,6 @@
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\win\index.rst" />
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\idf_component.yml" />
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\Kconfig" />
-    <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\library.json" />
-    <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\library.properties" />
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\LICENCE.txt" />
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\lvgl.mk" />
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\lvgl.pc.in" />
@@ -2081,8 +2080,6 @@
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\tests\src\test_libs\rnd_unicodes\rnd_unicodes\CMakeLists.txt" />
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\tests\src\test_libs\rnd_unicodes\rnd_unicodes\LICENSE" />
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\tests\src\test_libs\rnd_unicodes\rnd_unicodes\README.md" />
-    <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\tests\src\test_libs\rnd_unicodes\rnd_unicodes\src\library.c" />
-    <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\tests\src\test_libs\rnd_unicodes\rnd_unicodes\src\library.h" />
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\tests\test_images\pngs\test.png" />
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\tests\test_images\stride_align1\LZ4\test_A1.bin" />
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\tests\test_images\stride_align1\LZ4\test_A1_LZ4_align1.c" />
@@ -2541,6 +2538,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\image\lv_example_image_4.c" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\lv_example_keyboard_1.c" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\lv_example_keyboard_2.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\lv_example_keyboard_3.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\font_montserrat_ger_14.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\font_montserrat_ger_16.c" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\label\lv_example_label_1.c" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\label\lv_example_label_2.c" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\label\lv_example_label_3.c" />

diff --git a/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj.filters b/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj.filters
@@ -2719,12 +2719,6 @@
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\Kconfig">
       <Filter>lvgl</Filter>
     </None>
-    <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\library.json">
-      <Filter>lvgl</Filter>
-    </None>
-    <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\library.properties">
-      <Filter>lvgl</Filter>
-    </None>
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\LICENCE.txt">
       <Filter>lvgl</Filter>
     </None>
@@ -6133,12 +6127,6 @@
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\tests\src\test_libs\rnd_unicodes\rnd_unicodes\README.md">
       <Filter>lvgl\tests\src\test_libs\rnd_unicodes\rnd_unicodes</Filter>
     </None>
-    <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\tests\src\test_libs\rnd_unicodes\rnd_unicodes\src\library.c">
-      <Filter>lvgl\tests\src\test_libs\rnd_unicodes\rnd_unicodes\src</Filter>
-    </None>
-    <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\tests\src\test_libs\rnd_unicodes\rnd_unicodes\src\library.h">
-      <Filter>lvgl\tests\src\test_libs\rnd_unicodes\rnd_unicodes\src</Filter>
-    </None>
     <None Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\tests\test_images\pngs\test.png">
       <Filter>lvgl\tests\test_images\pngs</Filter>
     </None>
@@ -7720,7 +7708,6 @@
       <UniqueIdentifier>{f514f744-494a-43ef-bac4-c1aa3033587c}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <Manifest Include="LvglWindowsDesktopApplication.manifest" />
   </ItemGroup>
@@ -8550,7 +8537,18 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\lv_example_keyboard_2.c">
       <Filter>lvgl\examples\widgets\keyboard</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\label\lv_example_label_1.c">
+   <ItemGroup>
+    <ClCompile Include="(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\lv_example_keyboard_3.c">
+      <Filter>lvgl\examples\widgets\keyboard</Filter>
+    </ClCompile>
+  </ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\font_montserrat_ger_14.c">
+      <Filter>lvgl\examples\widgets\keyboard</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\font_montserrat_ger_16.c">
+      <Filter>lvgl\examples\widgets\keyboard</Filter>
+    </ClCompile>
+   <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\label\lv_example_label_1.c">
       <Filter>lvgl\examples\widgets\label</Filter>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\label\lv_example_label_2.c">

diff --git a/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj b/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj
@@ -708,6 +708,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\image\lv_example_image_4.c" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\lv_example_keyboard_1.c" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\lv_example_keyboard_2.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\lv_example_keyboard_3.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\font_montserrat_ger_14.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\font_montserrat_ger_16.c" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\label\lv_example_label_1.c" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\label\lv_example_label_2.c" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\label\lv_example_label_3.c" />

diff --git a/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj.filters b/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj.filters
@@ -1996,6 +1996,15 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\lv_example_keyboard_2.c">
       <Filter>lvgl\examples\widgets\keyboard</Filter>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\lv_example_keyboard_3.c">
+      <Filter>lvgl\examples\widgets\keyboard</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\font_montserrat_ger_14.c">
+      <Filter>lvgl\examples\widgets\keyboard</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\keyboard\font_montserrat_ger_16.c">
+      <Filter>lvgl\examples\widgets\keyboard</Filter>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\examples\widgets\label\lv_example_label_1.c">
       <Filter>lvgl\examples\widgets\label</Filter>
     </ClCompile>
+5 −0		Kconfig
+10 −4		demos/benchmark/assets/img_benchmark_cogwheel_alpha256.c
+10 −4		demos/benchmark/assets/img_benchmark_cogwheel_argb.c
+10 −4		demos/benchmark/assets/img_benchmark_cogwheel_indexed16.c
+10 −4		demos/benchmark/assets/img_benchmark_cogwheel_rgb.c
+10 −4		demos/transform/assets/img_transform_avatar_15.c
+10 −4		demos/widgets/assets/img_clothes.c
+10 −4		demos/widgets/assets/img_demo_widgets_avatar.c
+10 −4		demos/widgets/assets/img_lvgl_logo.c
+4 −0		docs/integration/driver/windows.rst
+8 −5		docs/libs/tiny_ttf.rst
+1 −1		env_support/rt-thread/squareline/SConscript
+2 −0		examples/widgets/keyboard/font_montserrat_ger_14.c
+2 −0		examples/widgets/keyboard/font_montserrat_ger_16.c
+1 −1		examples/widgets/keyboard/index.rst
+2 −0		examples/widgets/keyboard/lv_example_keyboard_3.c
+1 −1		examples/widgets/lv_example_widgets.h
+1 −0		lv_conf_template.h
+1 −1		scripts/gen_json/gen_json.py
+0 −4		src/core/lv_global.h
+8 −7		src/core/lv_refr.c
+2 −2		src/drivers/display/lcd/lv_lcd_generic_mipi.c
+3 −1		src/drivers/sdl/lv_sdl_window.c
+45 −11		src/drivers/windows/lv_windows_context.c
+13 −2		src/drivers/windows/lv_windows_context.h
+1 −15		src/drivers/windows/lv_windows_input.c
+92 −20		src/libs/barcode/lv_barcode.c
+8 −0		src/libs/barcode/lv_barcode.h
+15 −8		src/libs/gif/lv_gif.c
+1 −1		src/libs/gif/lv_gif.h
+19 −9		src/libs/qrcode/lv_qrcode.c
+187 −69		src/libs/tiny_ttf/lv_tiny_ttf.c
+4 −6		src/libs/tiny_ttf/lv_tiny_ttf.h
+40 −0		src/libs/tiny_ttf/stb_truetype_htcw.h
+7 −0		src/lv_conf_internal.h
+0 −8		src/lv_init.c
+1 −1		src/misc/lv_array.c
+4 −1		src/misc/lv_array.h
+1 −1		src/others/ime/lv_ime_pinyin.c
+15 −4		src/others/vg_lite_tvg/vg_lite_tvg.cpp
+1 −0		tests/CMakeLists.txt
+ −		tests/ref_imgs/libs/barcode_tiled_1.png
+ −		tests/ref_imgs/libs/barcode_tiled_2.png
+ −		tests/ref_imgs_vg_lite/libs/barcode_1.png
+ −		tests/ref_imgs_vg_lite/libs/barcode_2.png
+ −		tests/ref_imgs_vg_lite/libs/barcode_tiled_1.png
+ −		tests/ref_imgs_vg_lite/libs/barcode_tiled_2.png
+20 −10		tests/src/test_cases/libs/test_barcode.c
+2 −2		tests/src/test_cases/test_array.c