diff options
| -rw-r--r-- | bsp/lpc5410x/project.uvoptx | 4 | ||||
| -rw-r--r-- | bsp/lpc5410x/project.uvprojx | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/bsp/lpc5410x/project.uvoptx b/bsp/lpc5410x/project.uvoptx index bf8da45188..5eae2f80e8 100644 --- a/bsp/lpc5410x/project.uvoptx +++ b/bsp/lpc5410x/project.uvoptx @@ -167,7 +167,7 @@ <Group> <GroupName>Applications</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -227,7 +227,7 @@ <Group> <GroupName>Drivers</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> diff --git a/bsp/lpc5410x/project.uvprojx b/bsp/lpc5410x/project.uvprojx index a33a383a9b..6a1efb31c9 100644 --- a/bsp/lpc5410x/project.uvprojx +++ b/bsp/lpc5410x/project.uvprojx @@ -365,11 +365,7 @@ <MiscControls></MiscControls> <Define>CORE_M4</Define> <Undefine></Undefine> -<<<<<<< HEAD <IncludePath>.;..\..\components\drivers\include;..\..\components\finsh;..\..\include;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;Libraries\CMSIS\Include;Libraries\lpc_chip\chip_5410x;Libraries\lpc_chip\chip_5410x\config;Libraries\lpc_chip\chip_common;applications;drivers</IncludePath> -======= - <IncludePath>applications;.;drivers;Libraries\CMSIS\Include;Libraries\lpc_chip\chip_common;Libraries\lpc_chip\chip_5410x;Libraries\lpc_chip\chip_5410x\config;..\..\include;..\..\libcpu\arm\cortex-m4;..\..\libcpu\arm\common;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh</IncludePath> ->>>>>>> f68b03f089805f585e6f634b0db80e377344c21d </VariousControls> </Cads> <Aads> |