diff --git a/.gitignore b/.gitignore index b5ffed0..73a1806 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ _private 3.Software/LvglSimulator/vs2019_proj/.vs 3.Software/LvglSimulator/vs2019_proj/x64/Debug 3.Software/LvglSimulator/vs2019_proj/x64/Release +3.Software/ImageToHolo/.idea +3.Software/ImageToHolo/convertor/__pycache__ diff --git a/3.Software/ImageToHolo/.idea/.gitignore b/3.Software/ImageToHolo/.idea/.gitignore deleted file mode 100644 index 209ee77..0000000 --- a/3.Software/ImageToHolo/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Datasource local storage ignored files -/../../../../../../:\Users\Pengzhihui\Desktop\ImageToHolo\.idea/dataSources/ -/dataSources.local.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/3.Software/ImageToHolo/.idea/ImageToHolo.iml b/3.Software/ImageToHolo/.idea/ImageToHolo.iml deleted file mode 100644 index d0876a7..0000000 --- a/3.Software/ImageToHolo/.idea/ImageToHolo.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/3.Software/ImageToHolo/.idea/deployment.xml b/3.Software/ImageToHolo/.idea/deployment.xml deleted file mode 100644 index b7f5b64..0000000 --- a/3.Software/ImageToHolo/.idea/deployment.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3.Software/ImageToHolo/.idea/encodings.xml b/3.Software/ImageToHolo/.idea/encodings.xml deleted file mode 100644 index 15a15b2..0000000 --- a/3.Software/ImageToHolo/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/3.Software/ImageToHolo/.idea/inspectionProfiles/profiles_settings.xml b/3.Software/ImageToHolo/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2d..0000000 --- a/3.Software/ImageToHolo/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/3.Software/ImageToHolo/.idea/misc.xml b/3.Software/ImageToHolo/.idea/misc.xml deleted file mode 100644 index a2e120d..0000000 --- a/3.Software/ImageToHolo/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/3.Software/ImageToHolo/.idea/modules.xml b/3.Software/ImageToHolo/.idea/modules.xml deleted file mode 100644 index 3b4a9d1..0000000 --- a/3.Software/ImageToHolo/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/3.Software/LvglSimulator/vs2019_proj/lvgl_similator.cpp b/3.Software/LvglSimulator/vs2019_proj/lvgl_similator.cpp index a8d385b..129014d 100644 --- a/3.Software/LvglSimulator/vs2019_proj/lvgl_similator.cpp +++ b/3.Software/LvglSimulator/vs2019_proj/lvgl_similator.cpp @@ -61,7 +61,7 @@ int main(int argc, char** argv) //lv_demo_widgets(); //lv_demo_benchmark(); - //lv_demo_keypad_encoder(); + lv_demo_keypad_encoder(); //lv_demo_printer(); //lv_demo_stress(); //lv_ex_get_started_1(); @@ -91,9 +91,9 @@ int main(int argc, char** argv) //lv_ex_img_1(); //lv_ex_tileview_1(); - lv_holo_cubic_gui(); + //lv_holo_cubic_gui(); - lv_scr_load_anim(scr_2, LV_SCR_LOAD_ANIM_OVER_BOTTOM, 300, 5000, false); + //lv_scr_load_anim(scr_2, LV_SCR_LOAD_ANIM_OVER_BOTTOM, 300, 5000, false); while (1)