diff --git a/miosix_np_2/nbproject/configurations.xml b/miosix_np_2/nbproject/configurations.xml index 39084b9013a071155ed4f90f2bb5bc540d0f598c..910a14cb8a4abe8335572b1015c33549ba929698 100644 --- a/miosix_np_2/nbproject/configurations.xml +++ b/miosix_np_2/nbproject/configurations.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<configurationDescriptor version="89"> +<configurationDescriptor version="90"> <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT"> - <df root=".." name="miosix_np_2"> + <df root=".." name="0"> <df name="miosix"> <df name="arch"> <df name="arm7_lpc2000"> @@ -415,7 +415,6 @@ <in>miosix.h</in> </df> <in>main.cpp</in> - <in>main_processes.cpp</in> </df> <logicalFolder name="ExternalFiles" displayName="Important Files" @@ -432,7 +431,6 @@ <confs> <conf name="Default" type="0"> <toolsSet> - <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode> <compilerSet>ARM_MIOSIX_EABI|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> <rebuildPropChanged>false</rebuildPropChanged> @@ -1541,7 +1539,6 @@ </conf> <conf name="lpc2138_miosix_board" type="0"> <toolsSet> - <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode> <compilerSet>ARM_MIOSIX_EABI|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> <rebuildPropChanged>false</rebuildPropChanged> @@ -2646,7 +2643,6 @@ </conf> <conf name="stm32f103ze_stm3210e-eval" type="0"> <toolsSet> - <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode> <compilerSet>ARM_MIOSIX_EABI|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> <rebuildPropChanged>false</rebuildPropChanged> @@ -2697,8 +2693,6 @@ </makefileType> <item path="../main.cpp" ex="false" tool="1" flavor2="0"> </item> - <item path="../main_processes.cpp" ex="false" tool="1" flavor2="0"> - </item> <item path="../miosix/arch/arm7_lpc2000/common/arch_settings.h" ex="false" tool="3" @@ -3794,7 +3788,6 @@ </conf> <conf name="stm32f103ve_mp3v2" type="0"> <toolsSet> - <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode> <compilerSet>ARM_MIOSIX_EABI|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> <rebuildPropChanged>false</rebuildPropChanged> @@ -4901,7 +4894,6 @@ </conf> <conf name="stm32f100rb_stm32vldiscovery" type="0"> <toolsSet> - <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode> <compilerSet>ARM_MIOSIX_EABI|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> <rebuildPropChanged>false</rebuildPropChanged> @@ -6008,7 +6000,6 @@ </conf> <conf name="stm32f103ve_strive_mini" type="0"> <toolsSet> - <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode> <compilerSet>ARM_MIOSIX_EABI|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> <rebuildPropChanged>false</rebuildPropChanged> @@ -7115,7 +7106,6 @@ </conf> <conf name="stm32f103ze_redbull_v2" type="0"> <toolsSet> - <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode> <compilerSet>ARM_MIOSIX_EABI|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> <rebuildPropChanged>false</rebuildPropChanged> @@ -8222,7 +8212,6 @@ </conf> <conf name="stm32f407vg_stm32f4discovery" type="0"> <toolsSet> - <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode> <compilerSet>ARM_MIOSIX_EABI|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> <rebuildPropChanged>false</rebuildPropChanged> @@ -9327,7 +9316,6 @@ </conf> <conf name="stm32f207ig_stm3220g-eval" type="0"> <toolsSet> - <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode> <compilerSet>ARM_MIOSIX_EABI|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> <rebuildPropChanged>false</rebuildPropChanged> @@ -10432,7 +10420,6 @@ </conf> <conf name="stm32f207zg_ethboard_v2" type="0"> <toolsSet> - <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode> <compilerSet>ARM_MIOSIX_EABI|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> <rebuildPropChanged>false</rebuildPropChanged> @@ -11537,7 +11524,6 @@ </conf> <conf name="stm32f207ze_als_camboard" type="0"> <toolsSet> - <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode> <compilerSet>ARM_MIOSIX_EABI|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> <rebuildPropChanged>false</rebuildPropChanged> @@ -12642,7 +12628,6 @@ </conf> <conf name="stm32l151c8_als_mainboard" type="0"> <toolsSet> - <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode> <compilerSet>ARM_MIOSIX_EABI|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> <rebuildPropChanged>false</rebuildPropChanged> @@ -13747,7 +13732,6 @@ </conf> <conf name="stm32f407vg_bitsboard" type="0"> <toolsSet> - <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode> <compilerSet>ARM_MIOSIX_EABI|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> <rebuildPropChanged>false</rebuildPropChanged> @@ -14852,7 +14836,6 @@ </conf> <conf name="stm32f205rg_sony-newman" type="0"> <toolsSet> - <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode> <compilerSet>ARM_MIOSIX_EABI|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> <rebuildPropChanged>false</rebuildPropChanged> diff --git a/miosix_np_2/nbproject/private/configurations.xml b/miosix_np_2/nbproject/private/configurations.xml index 8f9a726dbc00d5814d9d85bc30d206159af49289..a936bd2fa3a5942219521a6a3dbc31fe0a82d23a 100644 --- a/miosix_np_2/nbproject/private/configurations.xml +++ b/miosix_np_2/nbproject/private/configurations.xml @@ -1,18 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<configurationDescriptor version="89"> +<configurationDescriptor version="90"> <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT"> - <df root=".." name="miosix_np_2"> - <df name="app_template"> - <in>crt0.s</in> - <in>main.c</in> - <in>prog3.h</in> - </df> - <df name="app_template_withlibs"> - <in>crt0.s</in> - <in>main.c</in> - <in>prog3.h</in> - <in>syscallfuffa.c</in> - </df> + <df root=".." name="0"> <df name="miosix"> <df name="arch"> <df name="arm7_lpc2000"> @@ -447,7 +436,6 @@ <df name="miosix_np_2"> </df> <in>main.cpp</in> - <in>main_processes.cpp</in> </df> </logicalFolder> <projectmakefile>miosix_np_2-Makefile.mk</projectmakefile> diff --git a/miosix_np_2/nbproject/private/private.xml b/miosix_np_2/nbproject/private/private.xml index 534894798cd51d5736c70d8a2a49194b4d22e8d5..9e5653dedb352ed62af9dc5a5c6c3c7896814e32 100644 --- a/miosix_np_2/nbproject/private/private.xml +++ b/miosix_np_2/nbproject/private/private.xml @@ -9,4 +9,9 @@ </data> <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/> <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> + <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> + <group> + <file>file:/media/truecrypt1/Projects/ARM/miosix/miosix-kernel/main.cpp</file> + </group> + </open-files> </project-private> diff --git a/miosix_np_2/nbproject/project.xml b/miosix_np_2/nbproject/project.xml index cceeaa734612ff2133256cd138dcde9204e0f074..bcab0fc769dd93d6b4dafb44a9f48f8e171a0782 100644 --- a/miosix_np_2/nbproject/project.xml +++ b/miosix_np_2/nbproject/project.xml @@ -71,6 +71,9 @@ <type>0</type> </confElem> </confList> + <formatting> + <project-formatting-style>false</project-formatting-style> + </formatting> </data> </configuration> </project>