Merge branch 'v2-on-ui' into task/meas-snap
# Conflicts: # scripts/id_registry.json
This commit is contained in:
@@ -937,6 +937,11 @@
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\App\fs\vol_lock.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>vol_idle_sync.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\App\fs\vol_idle_sync.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>time_sync.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
@@ -1032,6 +1037,11 @@
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\App\algo\freq.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>ui_data_feed.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\App\app\ui_data_feed.c</FilePath>
|
||||
</File>
|
||||
</Files>
|
||||
</Group>
|
||||
<Group>
|
||||
@@ -3541,6 +3551,16 @@
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\Drivers\BSP\UI\ui_style.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>ui_data.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\Drivers\BSP\UI\ui_data.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>ui_w_soe.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\Drivers\BSP\UI\ui_w_soe.c</FilePath>
|
||||
</File>
|
||||
</Files>
|
||||
</Group>
|
||||
<Group>
|
||||
|
||||
Reference in New Issue
Block a user