Skip to content

Commit

Permalink
更新 v1.6
Browse files Browse the repository at this point in the history 
## [v1.6] - 2021-8-7
* 1.更新ArtDesign，新的导航箭头设计
* 2.更新lv_drivers，去除坐标超界警告
* 3.去除lv_examples，减少工程体积
* 4.调整模拟器的LV_FS_PC_PATH定义，指定到Software所在目录，方便读取地图
* 5.开机页面重命名: StartUp -> Startup
* 6.更新DP_SysConfig，mapSource -> mapDirPath指定地图目录，添加 WGS84/GCJ02 坐标系统切换，添加arrowTheme导航箭头主题切换
* 7.更新DP_Storage，适配新的MapConv，支持所有地图源缩放level范围自适应
* 8.更新DP_TrackFilter，适配新的MapConv
* 9.HAL添加Backlight_ForceLit()，支持强制点亮屏幕背光
* 10.更新模拟器的HAL_GPS，支持获取GPX点之间的时间差
* 11.更新Config.h，去除旧的Bing地图配置
* 12.更新LiveMap页面，支持修改导航箭头主题
* 13.更新GPX_Parser，添加海拔和时间解析
* 14.重构MapConv，废弃旧的Bing地图存放格式和地图下载器。使用[Crimson/地图下载器](https://gitee.com/CrimsonHu/java_map_download/)下载地图，文件存放格式为`/z/x/y.bin`
* 15.更新DisplayFault，在进入HardFault状态时强制点亮背光
* 16.更新HAL_Power，优化电压显示
  • Loading branch information
@FASTSHIFT
FASTSHIFT committed Aug 7, 2021
1 parent 3950bdf commit 9c7d30e
Show file tree
Hide file tree
Showing 160 changed files with 21,757 additions and 49,296 deletions.
Binary file added ArtDesign/AGENCYB.TTF
View file
Binary file not shown.
Binary file added ArtDesign/SD卡.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ArtDesign/arrow2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ArtDesign/arrow3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4,098 changes: 2,105 additions & 1,993 deletions ArtDesign/导航.ai
View file

Large diffs are not rendered by default.

2,803 changes: 1,386 additions & 1,417 deletions ArtDesign/码表.ai
View file

Large diffs are not rendered by default.

33,349 changes: 16,748 additions & 16,601 deletions Software/X-Track/MDK-ARM/Objects/X-Track.hex
View file

Large diffs are not rendered by default.

963 changes: 349 additions & 614 deletions Software/X-Track/MDK-ARM/proj.uvoptx
View file

Large diffs are not rendered by default.

224 changes: 25 additions & 199 deletions Software/X-Track/MDK-ARM/proj.uvprojx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@
</Files>
</Group>
<Group>
<GroupName>Pages/StartUp</GroupName>
<GroupName>Pages/Startup</GroupName>
<GroupOption>
<CommonProperty>
<UseCPPCompiler>0</UseCPPCompiler>
Expand Down Expand Up @@ -886,34 +886,34 @@
</GroupOption>
<Files>
<File>
<FileName>StartUp.cpp</FileName>
<FileName>Startup.cpp</FileName>
<FileType>8</FileType>
<FilePath>..\USER\App\Pages\StartUp\StartUp.cpp</FilePath>
<FilePath>..\USER\App\Pages\Startup\Startup.cpp</FilePath>
</File>
<File>
<FileName>StartUp.h</FileName>
<FileName>Startup.h</FileName>
<FileType>5</FileType>
<FilePath>..\USER\App\Pages\StartUp\StartUp.h</FilePath>
<FilePath>..\USER\App\Pages\Startup\Startup.h</FilePath>
</File>
<File>
<FileName>StartUpModel.cpp</FileName>
<FileName>StartupModel.cpp</FileName>
<FileType>8</FileType>
<FilePath>..\USER\App\Pages\StartUp\StartUpModel.cpp</FilePath>
<FilePath>..\USER\App\Pages\Startup\StartupModel.cpp</FilePath>
</File>
<File>
<FileName>StartUpModel.h</FileName>
<FileName>StartupModel.h</FileName>
<FileType>5</FileType>
<FilePath>..\USER\App\Pages\StartUp\StartUpModel.h</FilePath>
<FilePath>..\USER\App\Pages\Startup\StartupModel.h</FilePath>
</File>
<File>
<FileName>StartUpView.cpp</FileName>
<FileName>StartupView.cpp</FileName>
<FileType>8</FileType>
<FilePath>..\USER\App\Pages\StartUp\StartUpView.cpp</FilePath>
<FilePath>..\USER\App\Pages\Startup\StartupView.cpp</FilePath>
</File>
<File>
<FileName>StartUpView.h</FileName>
<FileName>StartupView.h</FileName>
<FileType>5</FileType>
<FilePath>..\USER\App\Pages\StartUp\StartUpView.h</FilePath>
<FilePath>..\USER\App\Pages\Startup\StartupView.h</FilePath>
</File>
</Files>
</Group>
Expand Down Expand Up @@ -1451,9 +1451,19 @@
<GroupName>Resource/Image</GroupName>
<Files>
<File>
<FileName>img_src_gps_arrow.c</FileName>
<FileName>img_src_gps_arrow_dark.c</FileName>
<FileType>1</FileType>
<FilePath>..\USER\App\Resource\Image\img_src_gps_arrow.c</FilePath>
<FilePath>..\USER\App\Resource\Image\img_src_gps_arrow_dark.c</FilePath>
</File>
<File>
<FileName>img_src_gps_arrow_default.c</FileName>
<FileType>1</FileType>
<FilePath>..\USER\App\Resource\Image\img_src_gps_arrow_default.c</FilePath>
</File>
<File>
<FileName>img_src_gps_arrow_light.c</FileName>
<FileType>1</FileType>
<FilePath>..\USER\App\Resource\Image\img_src_gps_arrow_light.c</FilePath>
</File>
<File>
<FileName>img_src_gps_pin.c</FileName>
Expand Down Expand Up @@ -1738,36 +1748,6 @@
<FileType>8</FileType>
<FilePath>..\USER\App\Utils\MapConv\MapConv.cpp</FilePath>
</File>
<File>
<FileName>MapConvBase.h</FileName>
<FileType>5</FileType>
<FilePath>..\USER\App\Utils\MapConv\MapConvBase.h</FilePath>
</File>
<File>
<FileName>MapConvBase.cpp</FileName>
<FileType>8</FileType>
<FilePath>..\USER\App\Utils\MapConv\MapConvBase.cpp</FilePath>
</File>
<File>
<FileName>MapConv_Bing.h</FileName>
<FileType>5</FileType>
<FilePath>..\USER\App\Utils\MapConv\MapConv_Bing.h</FilePath>
</File>
<File>
<FileName>MapConv_Bing.cpp</FileName>
<FileType>8</FileType>
<FilePath>..\USER\App\Utils\MapConv\MapConv_Bing.cpp</FilePath>
</File>
<File>
<FileName>MapConv_OSM.h</FileName>
<FileType>5</FileType>
<FilePath>..\USER\App\Utils\MapConv\MapConv_OSM.h</FilePath>
</File>
<File>
<FileName>MapConv_OSM.cpp</FileName>
<FileType>8</FileType>
<FilePath>..\USER\App\Utils\MapConv\MapConv_OSM.cpp</FilePath>
</File>
<File>
<FileName>GPS_Transform.h</FileName>
<FileType>5</FileType>
Expand Down Expand Up @@ -3312,160 +3292,6 @@
</File>
</Files>
</Group>
<Group>
<GroupName>lv_examples</GroupName>
<GroupOption>
<CommonProperty>
<UseCPPCompiler>0</UseCPPCompiler>
<RVCTCodeConst>0</RVCTCodeConst>
<RVCTZI>0</RVCTZI>
<RVCTOtherData>0</RVCTOtherData>
<ModuleSelection>0</ModuleSelection>
<IncludeInBuild>0</IncludeInBuild>
<AlwaysBuild>2</AlwaysBuild>
<GenerateAssemblyFile>2</GenerateAssemblyFile>
<AssembleAssemblyFile>2</AssembleAssemblyFile>
<PublicsOnly>2</PublicsOnly>
<StopOnExitCode>11</StopOnExitCode>
<CustomArgument></CustomArgument>
<IncludeLibraryModules></IncludeLibraryModules>
<ComprImg>1</ComprImg>
</CommonProperty>
<GroupArmAds>
<Cads>
<interw>2</interw>
<Optim>0</Optim>
<oTime>2</oTime>
<SplitLS>2</SplitLS>
<OneElfS>2</OneElfS>
<Strict>2</Strict>
<EnumInt>2</EnumInt>
<PlainCh>2</PlainCh>
<Ropi>2</Ropi>
<Rwpi>2</Rwpi>
<wLevel>1</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<uGnu>2</uGnu>
<useXO>2</useXO>
<v6Lang>0</v6Lang>
<v6LangP>0</v6LangP>
<vShortEn>2</vShortEn>
<vShortWch>2</vShortWch>
<v6Lto>2</v6Lto>
<v6WtE>2</v6WtE>
<v6Rtti>2</v6Rtti>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath></IncludePath>
</VariousControls>
</Cads>
<Aads>
<interw>2</interw>
<Ropi>2</Ropi>
<Rwpi>2</Rwpi>
<thumb>2</thumb>
<SplitLS>2</SplitLS>
<SwStkChk>2</SwStkChk>
<NoWarn>2</NoWarn>
<uSurpInc>2</uSurpInc>
<useXO>2</useXO>
<uClangAs>2</uClangAs>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath></IncludePath>
</VariousControls>
</Aads>
</GroupArmAds>
</GroupOption>
<Files>
<File>
<FileName>lv_demo_conf.h</FileName>
<FileType>5</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lv_demo_conf.h</FilePath>
</File>
<File>
<FileName>lv_demo_benchmark.c</FileName>
<FileType>1</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lv_examples\src\lv_demo_benchmark\lv_demo_benchmark.c</FilePath>
</File>
<File>
<FileName>lv_demo_keypad_encoder.c</FileName>
<FileType>1</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lv_examples\src\lv_demo_keypad_encoder\lv_demo_keypad_encoder.c</FilePath>
</File>
<File>
<FileName>lv_font_montserrat_12_compr_az.c</FileName>
<FileType>1</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lv_examples\src\lv_demo_stress\assets\lv_font_montserrat_12_compr_az.c</FilePath>
</File>
<File>
<FileName>lv_font_montserrat_16_compr_az.c</FileName>
<FileType>1</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lv_examples\src\lv_demo_stress\assets\lv_font_montserrat_16_compr_az.c</FilePath>
</File>
<File>
<FileName>lv_font_montserrat_28_compr_az.c</FileName>
<FileType>1</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lv_examples\src\lv_demo_stress\assets\lv_font_montserrat_28_compr_az.c</FilePath>
</File>
<File>
<FileName>lv_demo_stress.c</FileName>
<FileType>1</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lv_examples\src\lv_demo_stress\lv_demo_stress.c</FilePath>
</File>
<File>
<FileName>img_clothes.c</FileName>
<FileType>1</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lv_examples\src\lv_demo_widgets\assets\img_clothes.c</FilePath>
</File>
<File>
<FileName>img_demo_widgets_avatar.c</FileName>
<FileType>1</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lv_examples\src\lv_demo_widgets\assets\img_demo_widgets_avatar.c</FilePath>
</File>
<File>
<FileName>img_lvgl_logo.c</FileName>
<FileType>1</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lv_examples\src\lv_demo_widgets\assets\img_lvgl_logo.c</FilePath>
</File>
<File>
<FileName>lv_demo_widgets.c</FileName>
<FileType>1</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lv_examples\src\lv_demo_widgets\lv_demo_widgets.c</FilePath>
</File>
<File>
<FileName>img_cogwheel_alpha16.c</FileName>
<FileType>1</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lvgl\examples\assets\img_cogwheel_alpha16.c</FilePath>
</File>
<File>
<FileName>img_cogwheel_argb.c</FileName>
<FileType>1</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lvgl\examples\assets\img_cogwheel_argb.c</FilePath>
</File>
<File>
<FileName>img_cogwheel_chroma_keyed.c</FileName>
<FileType>1</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lvgl\examples\assets\img_cogwheel_chroma_keyed.c</FilePath>
</File>
<File>
<FileName>img_cogwheel_indexed16.c</FileName>
<FileType>1</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lvgl\examples\assets\img_cogwheel_indexed16.c</FilePath>
</File>
<File>
<FileName>img_cogwheel_rgb.c</FileName>
<FileType>1</FileType>
<FilePath>..\Simulator\LVGL.Simulator\lvgl\examples\assets\img_cogwheel_rgb.c</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>lv_port</GroupName>
<Files>
Expand Down
26 changes: 22 additions & 4 deletions Software/X-Track/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
* 9.GPS在未定位成功时，经纬度海拔统一置零
* 10.HAL::Power添加关机事件回调
* 11.CONTROLLER -> PRESENTER
* 12.添加StartUp页面，展示开机动画
* 12.添加Startup页面，展示开机动画
* 13.LiveMap地图页面，在未定位成功时的默认位置为天安门
* 14.StatusBar状态栏，函数AppearAnimStart -> Appear
* 15.解决SystemInfos页面在自动管理Cache时退出页面造成的Crash
Expand Down Expand Up @@ -145,7 +145,7 @@
* 2.调整lvgl内存池，32KB -> 64KB
* 3.HAL_GPS支持读取csv格式的文件，在PC上模拟位置变化
* 4.更新LiveMap页面，支持实时绘制运动轨迹，支持自适应分辨率动态加载地图
* 5.更新StartUp页面，移除默认样式，并在开机动画过程中屏蔽Encoder事件
* 5.更新Startup页面，移除默认样式，并在开机动画过程中屏蔽Encoder事件
* 6.修复SystemInfos页面因为忘记释放style.focus导致的内存泄漏
* 7.优化DataCenter的Account的cache申请失败判断逻辑
* 8.添加lv_allocator，使用lvgl接管std::vector内存管理实现
Expand All @@ -172,7 +172,7 @@

## [v1.1] - 2021-7-7
* 1.支持在GPX中记录海拔和时间，可在GPXSee查看爬升和速度统计
* 2.更新StartUp页面，使用匿名函数回调
* 2.更新Startup页面，使用匿名函数回调
* 3.更新SystemInfos页面，添加Author署名和Build时间，电池状态 State -> Status
* 4.更新lvgl
* 5.更新GPX生成库，添加遗漏的time_成员
Expand All @@ -198,7 +198,7 @@
* 3.更新HAL::GPS模拟，支持航向和速度模拟
* 4.修改HAL::GPS_Info_t的 compass -> course
* 5.使用合入lvgl主线的lv_anim_timeline，使用lv_anim_timeline_wrapper封装动画组
* 6.更新StartUp页面，新的开机动画
* 6.更新Startup页面，新的开机动画
* 7.LV_IMG_CACHE_DEF_SIZE设置为0

## [v1.5] - 2021-8-1
Expand All @@ -218,3 +218,21 @@
* 14.lvgl内存池 64K -> 72K
* 15.WString使用lvgl的内存池
* 16.修复GPX轨迹文件<\ele>丢失问题(可能是内存碎片和heap过小导致WString realloc失败)

## [v1.6] - 2021-8-7
* 1.更新ArtDesign，新的导航箭头设计
* 2.更新lv_drivers，去除坐标超界警告
* 3.去除lv_examples，减少工程体积
* 4.调整模拟器的LV_FS_PC_PATH定义，指定到Software所在目录，方便读取地图
* 5.开机页面重命名: StartUp -> Startup
* 6.更新DP_SysConfig，mapSource -> mapDirPath指定地图目录，添加 WGS84/GCJ02 坐标系统切换，添加arrowTheme导航箭头主题切换
* 7.更新DP_Storage，适配新的MapConv，支持所有地图源缩放level范围自适应
* 8.更新DP_TrackFilter，适配新的MapConv
* 9.HAL添加Backlight_ForceLit()，支持强制点亮屏幕背光
* 10.更新模拟器的HAL_GPS，支持获取GPX点之间的时间差
* 11.更新Config.h，去除旧的Bing地图配置
* 12.更新LiveMap页面，支持修改导航箭头主题
* 13.更新GPX_Parser，添加海拔和时间解析
* 14.重构MapConv，废弃旧的Bing地图存放格式和地图下载器。使用[Crimson/地图下载器](https://gitee.com/CrimsonHu/java_map_download/)下载地图，文件存放格式为`/z/x/y.bin`
* 15.更新DisplayFault，在进入HardFault状态时强制点亮背光
* 16.更新HAL_Power，优化电压显示
44 changes: 0 additions & 44 deletions Software/X-Track/Simulator/LVGL.Simulator/LVGL.Simulator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

#include "lvgl/lvgl.h"
#include "lvgl/examples/lv_examples.h"
#include "lv_examples/lv_demo.h"
#include "lv_drivers/win32drv/win32drv.h"
#include "lv_fs_if/lv_fs_if.h"

Expand Down Expand Up @@ -57,49 +56,6 @@ int main()

App_Init();

/*
* Demos, benchmarks, and tests.
*
* Uncomment any one (and only one) of the functions below to run that
* item.
*/

//lv_example_scroll_2();
//lv_demo_keypad_encoder();
//lv_example_flex_3();
//lv_demo_widgets();
//lv_demo_benchmark();
//lv_demo_music();
//lv_demo_keypad_encoder();
//lv_demo_printer();
//lv_demo_stress();
//lv_ex_get_started_1();
//lv_ex_get_started_2();
//lv_ex_get_started_3();

//lv_ex_style_1();
//lv_ex_style_2();
//lv_ex_style_3();
//lv_ex_style_4();
//lv_ex_style_5();
//lv_ex_style_6();
//lv_ex_style_7();
//lv_ex_style_8();
//lv_ex_style_9();
//lv_ex_style_10();
//lv_ex_style_11();

/*
* There are many examples of individual widgets found under the
* lv_examples/src/lv_ex_widgets directory. Here are a few sample test
* functions. Look in that directory to find all the rest.
*/
//lv_ex_arc_1();
//lv_ex_cpicker_1();
//lv_ex_gauge_1();
//lv_ex_img_1();
//lv_ex_tileview_1();

while (!lv_win32_quit_signal)
{
lv_timer_handler();
Expand Down
Loading

0 comments on commit 9c7d30e

Please sign in to comment.