diff --git a/miosix_np_2/nbproject/configurations.xml b/miosix_np_2/nbproject/configurations.xml
index 875f82acadd98b270154f23c8ec546da97d9d4d4..586748ee8021eb47d9fcc0d89e8ab5e3c019a6e6 100644
--- a/miosix_np_2/nbproject/configurations.xml
+++ b/miosix_np_2/nbproject/configurations.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="90">
+<configurationDescriptor version="95">
<logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
<df root=".." name="0">
<df name="miosix">
@@ -1763,8 +1763,6 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
@@ -2376,8 +2374,6 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
@@ -2991,8 +2987,6 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
@@ -3456,8 +3450,6 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
@@ -4072,8 +4064,6 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
@@ -4690,8 +4680,6 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
@@ -5317,8 +5305,6 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
@@ -5943,8 +5929,6 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
@@ -6569,8 +6553,6 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
@@ -7034,8 +7016,6 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
@@ -7514,8 +7494,6 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
@@ -8141,8 +8119,6 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
@@ -8621,8 +8597,6 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
@@ -9283,22 +9257,16 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/arch/common/drivers/serial_stm32.cpp"
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/delays.cpp"
ex="false"
@@ -9338,29 +9306,21 @@
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp.cpp"
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/core/stage_1_boot.cpp"
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/interfaces-impl/bsp.cpp"
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/interfaces-impl/bsp_impl.h"
ex="false"
@@ -9376,15 +9336,11 @@
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/filesystem/devfs/devfs.cpp"
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/filesystem/file.cpp" ex="false" tool="1" flavor2="9">
<ccTool>
@@ -9498,8 +9454,6 @@
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/kernel/stage_2_boot.cpp" ex="false" tool="1" flavor2="9">
<ccTool>
@@ -9786,22 +9740,16 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/arch/common/drivers/serial_stm32.cpp"
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/delays.cpp"
ex="false"
@@ -9841,15 +9789,11 @@
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/arch/cortexM3_stm32/stm32f100cb_tempsensor/interfaces-impl/bsp.cpp"
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/arch/cortexM3_stm32/stm32f100cb_tempsensor/interfaces-impl/bsp_impl.h"
ex="false"
@@ -9860,29 +9804,21 @@
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp.cpp"
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/filesystem/console/console_device.cpp"
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/filesystem/devfs/devfs.cpp"
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/filesystem/file.cpp" ex="false" tool="1" flavor2="9">
<ccTool>
@@ -9996,8 +9932,6 @@
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/kernel/stage_2_boot.cpp" ex="false" tool="1" flavor2="9">
<ccTool>
@@ -10288,15 +10222,11 @@
ex="false"
tool="0"
flavor2="2">
- <cTool>
- </cTool>
</item>
<item path="../miosix/arch/common/core/interrupts_cortexMx.cpp"
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/arch/common/drivers/sd_stm32f2_f4.cpp"
ex="false"
@@ -10403,8 +10333,6 @@
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/arch/cortexM4_stm32f4/stm32f429zi_oledboard2/interfaces-impl/arch_registers_impl.h"
ex="false"
@@ -10415,8 +10343,6 @@
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/arch/cortexM4_stm32f4/stm32f429zi_oledboard2/interfaces-impl/bsp_impl.h"
ex="false"
@@ -10432,15 +10358,11 @@
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/arch/cortexM4_stm32f4/stm32f429zi_stm32f4discovery/interfaces-impl/bsp.cpp"
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/config/arch/cortexM4_stm32f4/stm32f429zi_oledboard2/board_settings.h"
ex="false"
@@ -10451,15 +10373,11 @@
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/filesystem/devfs/devfs.cpp"
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/filesystem/fat32/ccsbcs.cpp"
ex="false"
@@ -10595,8 +10513,6 @@
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/filesystem/stringpart.cpp"
ex="false"
@@ -10669,8 +10585,6 @@
ex="false"
tool="1"
flavor2="9">
- <ccTool>
- </ccTool>
</item>
<item path="../miosix/kernel/stage_2_boot.cpp" ex="false" tool="1" flavor2="9">
<ccTool>
diff --git a/miosix_np_2/nbproject/private/configurations.xml b/miosix_np_2/nbproject/private/configurations.xml
index d78a6cbdca86f16bc9fe6a94a11b87132de8cb69..db89e4513d55bd3271fff7e22bff253907f5b0c1 100644
--- a/miosix_np_2/nbproject/private/configurations.xml
+++ b/miosix_np_2/nbproject/private/configurations.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="90">
+<configurationDescriptor version="95">
<logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
<df root=".." name="0">
<df name="miosix">
@@ -31,6 +31,65 @@
<df name="common">
<df name="CMSIS">
<df name="Device">
+ <df name="SiliconLabs">
+ <df name="EFM32GG">
+ <df name="Include">
+ <in>efm32gg332f1024.h</in>
+ <in>efm32gg_acmp.h</in>
+ <in>efm32gg_adc.h</in>
+ <in>efm32gg_aes.h</in>
+ <in>efm32gg_af_pins.h</in>
+ <in>efm32gg_af_ports.h</in>
+ <in>efm32gg_burtc.h</in>
+ <in>efm32gg_burtc_ret.h</in>
+ <in>efm32gg_calibrate.h</in>
+ <in>efm32gg_cmu.h</in>
+ <in>efm32gg_dac.h</in>
+ <in>efm32gg_devinfo.h</in>
+ <in>efm32gg_dma.h</in>
+ <in>efm32gg_dma_ch.h</in>
+ <in>efm32gg_dma_descriptor.h</in>
+ <in>efm32gg_dmactrl.h</in>
+ <in>efm32gg_dmareq.h</in>
+ <in>efm32gg_ebi.h</in>
+ <in>efm32gg_emu.h</in>
+ <in>efm32gg_etm.h</in>
+ <in>efm32gg_gpio.h</in>
+ <in>efm32gg_gpio_p.h</in>
+ <in>efm32gg_i2c.h</in>
+ <in>efm32gg_lcd.h</in>
+ <in>efm32gg_lesense.h</in>
+ <in>efm32gg_lesense_buf.h</in>
+ <in>efm32gg_lesense_ch.h</in>
+ <in>efm32gg_lesense_st.h</in>
+ <in>efm32gg_letimer.h</in>
+ <in>efm32gg_leuart.h</in>
+ <in>efm32gg_msc.h</in>
+ <in>efm32gg_pcnt.h</in>
+ <in>efm32gg_prs.h</in>
+ <in>efm32gg_prs_ch.h</in>
+ <in>efm32gg_prs_signals.h</in>
+ <in>efm32gg_rmu.h</in>
+ <in>efm32gg_romtable.h</in>
+ <in>efm32gg_rtc.h</in>
+ <in>efm32gg_timer.h</in>
+ <in>efm32gg_timer_cc.h</in>
+ <in>efm32gg_uart.h</in>
+ <in>efm32gg_usart.h</in>
+ <in>efm32gg_usb.h</in>
+ <in>efm32gg_usb_diep.h</in>
+ <in>efm32gg_usb_doep.h</in>
+ <in>efm32gg_usb_hc.h</in>
+ <in>efm32gg_vcmp.h</in>
+ <in>efm32gg_wdog.h</in>
+ <in>em_device.h</in>
+ <in>system_efm32gg.h</in>
+ </df>
+ <df name="Source">
+ <in>system_efm32gg.c</in>
+ </df>
+ </df>
+ </df>
<df name="ST">
<df name="STM32F10x">
<df name="Include">
@@ -126,6 +185,10 @@
</df>
</df>
<df name="core">
+ <in>atomic_ops_impl_arm7.h</in>
+ <in>atomic_ops_impl_cortexMx.h</in>
+ <in>endianness_impl_arm7.h</in>
+ <in>endianness_impl_cortexMx.h</in>
<in>interrupts.h</in>
<in>interrupts_arm7.cpp</in>
<in>interrupts_arm7.h</in>
@@ -142,6 +205,8 @@
<in>sd_stm32f2_f4.cpp</in>
<in>sd_stm32f2_f4.h</in>
<in>serial.h</in>
+ <in>serial_efm32.cpp</in>
+ <in>serial_efm32.h</in>
<in>serial_lpc2000.cpp</in>
<in>serial_lpc2000.h</in>
<in>serial_stm32.cpp</in>
@@ -154,6 +219,29 @@
<in>stm32f2_f4_i2c.h</in>
</df>
</df>
+ <df name="cortexM3_efm32gg">
+ <df name="common">
+ <df name="interfaces-impl">
+ <in>arch_registers_impl.h</in>
+ <in>delays.cpp</in>
+ <in>gpio_impl.cpp</in>
+ <in>gpio_impl.h</in>
+ <in>portability.cpp</in>
+ <in>portability_impl.h</in>
+ </df>
+ <in>arch_settings.h</in>
+ </df>
+ <df name="efm32gg332f1024_polinode">
+ <df name="core">
+ <in>stage_1_boot.cpp</in>
+ </df>
+ <df name="interfaces-impl">
+ <in>bsp.cpp</in>
+ <in>bsp_impl.h</in>
+ <in>hwmapping.h</in>
+ </df>
+ </df>
+ </df>
<df name="cortexM3_stm32">
<df name="common">
<df name="interfaces-impl">
@@ -384,6 +472,11 @@
<in>board_settings.h</in>
</df>
</df>
+ <df name="cortexM3_efm32gg">
+ <df name="efm32gg332f1024_polinode">
+ <in>board_settings.h</in>
+ </df>
+ </df>
<df name="cortexM3_stm32">
<df name="stm32f100cb_tempsensor">
<in>board_settings.h</in>
@@ -534,6 +627,8 @@
<in>stage_2_boot.h</in>
<in>sync.cpp</in>
<in>sync.h</in>
+ <in>timeconversion.cpp</in>
+ <in>timeconversion.h</in>
</df>
<df name="stdlib_integration">
<in>libc_integration.cpp</in>
diff --git a/miosix_np_2/nbproject/project.xml b/miosix_np_2/nbproject/project.xml
index 7797e8e30075e53368c182e20e99e885df7f9822..605d4d3f0ee24e9a6c18890fd95ea4099c1483dc 100644
--- a/miosix_np_2/nbproject/project.xml
+++ b/miosix_np_2/nbproject/project.xml
@@ -7,7 +7,7 @@
<make-project-type>0</make-project-type>
<c-extensions>c</c-extensions>
<cpp-extensions>cpp</cpp-extensions>
- <header-extensions>h</header-extensions>
+ <header-extensions>h,hpp</header-extensions>
<sourceEncoding>UTF-8</sourceEncoding>
<make-dep-projects/>
<sourceRootList>