diff --git a/README.md b/README.md index 4e3440b..16e9f22 100644 --- a/README.md +++ b/README.md @@ -29,9 +29,11 @@ EasyFlash是一款开源的轻量级嵌入式Flash存储器库，主要为MCU(Mi |\easyflash\src\ef_utils.c |EasyFlash常用小工具，例如：CRC32| |\easyflash\src\easyflash.c |目前只包含EasyFlash初始化方法| |\easyflash\port\ef_port.c |不同平台下的EasyFlash移植接口及配置参数| -|\demo\stm32f10x\non_os |stm32f10x裸机的demo| -|\demo\stm32f10x\rtt |stm32f10x基于[RT-Thread](http://www.rt-thread.org/)的demo| -|\demo\stm32f4xx |stm32f4xx基于[RT-Thread](http://www.rt-thread.org/)的demo| +|\demo\env\stm32f10x\non_os |stm32f10x裸机的Env demo| +|\demo\env\stm32f10x\rtt |stm32f10x基于[RT-Thread](http://www.rt-thread.org/)的Env demo| +|\demo\env\stm32f4xx |stm32f4xx基于[RT-Thread](http://www.rt-thread.org/)的Env demo| +|\demo\iap\ymodem+rtt.c |使用[RT-Thread](http://www.rt-thread.org/)+[Ymodem](https://github.com/RT-Thread/rt-thread/tree/master/components/utilities/ymodem)的IAP Demo| +|\demo\log\easylogger.c |基于[EasyLogger](https://github.com/armink/EasyLogger)的Log Demo| ### 1.2、资源占用 @@ -44,7 +46,7 @@ Demo平台：STM32F103RET6 + RT-Thread 1.2.2 + Env(2K bytes) ### 1.3、支持平台 -目前已移植硬件平台有 `stm32f10x`与 `stm32f4xx` 系列的片内Flash，这个也是笔者产品使用的平台。其余平台的移植难度不大，在项目的设计之初就有考虑针对所有平台的适配性问题（64位除外），所以对所有移植接口都有做预留。移植只需修改 `\easyflash\port\flash_port.c` 一个文件，实现里面的擦、写、读及打印功能即可。 +目前已移植硬件平台有 `stm32f10x`与 `stm32f4xx` 系列的片内Flash，这个也是笔者产品使用的平台。其余平台的移植难度不大，在项目的设计之初就有考虑针对所有平台的适配性问题（64位除外），所以对所有移植接口都有做预留。移植只需修改 `\easyflash\port\ef_port.c` 一个文件，实现里面的擦、写、读及打印功能即可。 欢迎大家 **star and pull request**([Github](https://github.com/armink/EasyFlash)|[OSChina](http://git.oschina.net/armink/EasyFlash)|[Coding](https://coding.net/u/armink/p/EasyFlash/git)) 。开源软件的成功离不开所有人的努力，也希望该项目能够帮助大家降低开发周期，让产品更早的获得成功。 @@ -110,10 +112,11 @@ It's very suitable for small without a file system products. The developer can e |\easyflash\src\ef_utils.c |EasyFlash utils. For example CRC32.| |\easyflash\src\easyflash.c |Currently contains EasyFlash initialization function only. | |\easyflash\port\ef_port.c |EasyFlash portable interface and configuration for different platforms.| -|\demo\stm32f10x\non_os |stm32f10x non-os demo.| -|\demo\stm32f10x\rtt |stm32f10x demo base on [RT-Thread](http://www.rt-thread.org/).| -|\demo\stm32f4xx |stm32f4xx demo base on [RT-Thread](http://www.rt-thread.org/).| - +|\demo\env\stm32f10x\non_os |stm32f10x non-os demo.| +|\demo\env\stm32f10x\rtt |stm32f10x demo base on [RT-Thread](http://www.rt-thread.org/).| +|\demo\env\stm32f4xx |stm32f4xx demo base on [RT-Thread](http://www.rt-thread.org/).| +|\demo\iap\ymodem+rtt.c |Using [RT-Thread](http://www.rt-thread.org/)+[Ymodem](https://github.com/RT-Thread/rt-thread/tree/master/components/utilities/ymodem) IAP Demo| +|\demo\log\easylogger.c |base on [EasyLogger](https://github.com/armink/EasyLogger) Log Demo| ### 1.2 Resource consumption ``` @@ -125,7 +128,7 @@ Actual : ROM: 6K bytes RAM: 2.6K bytes ### 1.3 Supported platforms -Hardware platform has been ported `stm32f10x` and `stm32f4xx` series of on-chip Flash. This is my product platform. Remaining platform porting difficulty is little. The porting just modify `\easyflash\port\flash_port.c` file. Implement erase, write, read, print feature. +Hardware platform has been ported `stm32f10x` and `stm32f4xx` series of on-chip Flash. This is my product platform. Remaining platform porting difficulty is little. The porting just modify `\easyflash\port\ef_port.c` file. Implement erase, write, read, print feature. Welcome everyone to **star and pull request**([Github](https://github.com/armink/EasyFlash)|[OSChina](http://git.oschina.net/armink/EasyFlash)|[Coding](https://coding.net/u/armink/p/EasyFlash/git)). The open source software success is inseparable from everyone efforts. I hope this project will help everyone reduce product development cycle and make product to success earlier. diff --git a/demo/stm32f10x/README.md b/demo/env/stm32f10x/README.md similarity index 100% rename from demo/stm32f10x/README.md rename to demo/env/stm32f10x/README.md diff --git a/demo/stm32f10x/non_os/EWARM/.gitignore b/demo/env/stm32f10x/non_os/EWARM/.gitignore similarity index 100% rename from demo/stm32f10x/non_os/EWARM/.gitignore rename to demo/env/stm32f10x/non_os/EWARM/.gitignore diff --git a/demo/stm32f10x/non_os/EWARM/EasyFlash.dep b/demo/env/stm32f10x/non_os/EWARM/EasyFlash.dep similarity index 100% rename from demo/stm32f10x/non_os/EWARM/EasyFlash.dep rename to demo/env/stm32f10x/non_os/EWARM/EasyFlash.dep diff --git a/demo/stm32f10x/non_os/EWARM/EasyFlash.ewd b/demo/env/stm32f10x/non_os/EWARM/EasyFlash.ewd similarity index 100% rename from demo/stm32f10x/non_os/EWARM/EasyFlash.ewd rename to demo/env/stm32f10x/non_os/EWARM/EasyFlash.ewd diff --git a/demo/stm32f10x/non_os/EWARM/EasyFlash.ewp b/demo/env/stm32f10x/non_os/EWARM/EasyFlash.ewp similarity index 100% rename from demo/stm32f10x/non_os/EWARM/EasyFlash.ewp rename to demo/env/stm32f10x/non_os/EWARM/EasyFlash.ewp diff --git a/demo/stm32f10x/non_os/EWARM/EasyFlash.eww b/demo/env/stm32f10x/non_os/EWARM/EasyFlash.eww similarity index 100% rename from demo/stm32f10x/non_os/EWARM/EasyFlash.eww rename to demo/env/stm32f10x/non_os/EWARM/EasyFlash.eww diff --git a/demo/stm32f10x/non_os/EWARM/EasyFlashCustomSfr.sfr b/demo/env/stm32f10x/non_os/EWARM/EasyFlashCustomSfr.sfr similarity index 100% rename from demo/stm32f10x/non_os/EWARM/EasyFlashCustomSfr.sfr rename to demo/env/stm32f10x/non_os/EWARM/EasyFlashCustomSfr.sfr diff --git a/demo/stm32f10x/non_os/EWARM/settings/EasyFlash.cspy.bat b/demo/env/stm32f10x/non_os/EWARM/settings/EasyFlash.cspy.bat similarity index 100% rename from demo/stm32f10x/non_os/EWARM/settings/EasyFlash.cspy.bat rename to demo/env/stm32f10x/non_os/EWARM/settings/EasyFlash.cspy.bat diff --git a/demo/stm32f10x/non_os/EWARM/settings/EasyFlash.dbgdt b/demo/env/stm32f10x/non_os/EWARM/settings/EasyFlash.dbgdt similarity index 100% rename from demo/stm32f10x/non_os/EWARM/settings/EasyFlash.dbgdt rename to demo/env/stm32f10x/non_os/EWARM/settings/EasyFlash.dbgdt diff --git a/demo/stm32f10x/non_os/EWARM/settings/EasyFlash.dni b/demo/env/stm32f10x/non_os/EWARM/settings/EasyFlash.dni similarity index 100% rename from demo/stm32f10x/non_os/EWARM/settings/EasyFlash.dni rename to demo/env/stm32f10x/non_os/EWARM/settings/EasyFlash.dni diff --git a/demo/stm32f10x/non_os/EWARM/settings/EasyFlash.wsdt b/demo/env/stm32f10x/non_os/EWARM/settings/EasyFlash.wsdt similarity index 100% rename from demo/stm32f10x/non_os/EWARM/settings/EasyFlash.wsdt rename to demo/env/stm32f10x/non_os/EWARM/settings/EasyFlash.wsdt diff --git a/demo/stm32f10x/non_os/EWARM/settings/EasyFlash_Debug.jlink b/demo/env/stm32f10x/non_os/EWARM/settings/EasyFlash_Debug.jlink similarity index 100% rename from demo/stm32f10x/non_os/EWARM/settings/EasyFlash_Debug.jlink rename to demo/env/stm32f10x/non_os/EWARM/settings/EasyFlash_Debug.jlink diff --git a/demo/stm32f10x/non_os/EWARM/settings/EasyFlash_EncodingOverride.xml b/demo/env/stm32f10x/non_os/EWARM/settings/EasyFlash_EncodingOverride.xml similarity index 100% rename from demo/stm32f10x/non_os/EWARM/settings/EasyFlash_EncodingOverride.xml rename to demo/env/stm32f10x/non_os/EWARM/settings/EasyFlash_EncodingOverride.xml diff --git a/demo/stm32f10x/non_os/EWARM/settings/EasyFlash_stm32f103xE.jlink b/demo/env/stm32f10x/non_os/EWARM/settings/EasyFlash_stm32f103xE.jlink similarity index 100% rename from demo/stm32f10x/non_os/EWARM/settings/EasyFlash_stm32f103xE.jlink rename to demo/env/stm32f10x/non_os/EWARM/settings/EasyFlash_stm32f103xE.jlink diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CMSIS END USER LICENCE AGREEMENT.pdf b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CMSIS END USER LICENCE AGREEMENT.pdf similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CMSIS END USER LICENCE AGREEMENT.pdf rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CMSIS END USER LICENCE AGREEMENT.pdf diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CMSIS debug support.htm b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CMSIS debug support.htm similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CMSIS debug support.htm rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CMSIS debug support.htm diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CMSIS_changes.htm b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CMSIS_changes.htm similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/CMSIS_changes.htm rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/CMSIS_changes.htm diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Documentation/CMSIS_Core.htm b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Documentation/CMSIS_Core.htm similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Documentation/CMSIS_Core.htm rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Documentation/CMSIS_Core.htm diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/arm_common_tables.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/arm_common_tables.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/arm_common_tables.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/arm_common_tables.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/arm_math.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/arm_math.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/arm_math.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/arm_math.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm0.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm0.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm0.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm0.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm0plus.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm0plus.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm0plus.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm0plus.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm3.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm3.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm3.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm3.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm4.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm4.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm4.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm4.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm4_simd.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm4_simd.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm4_simd.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cm4_simd.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cmFunc.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cmFunc.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cmFunc.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cmFunc.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cmInstr.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cmInstr.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cmInstr.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_cmInstr.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_sc000.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_sc000.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_sc000.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_sc000.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_sc300.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_sc300.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_sc300.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/Include/core_sc300.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/License.doc b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/License.doc similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/License.doc rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/License.doc diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/README.txt b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/README.txt similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/README.txt rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/README.txt diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/index.htm b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/index.htm similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/index.htm rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/index.htm diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/readme_patch.txt b/demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/readme_patch.txt similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_EWARM/readme_patch.txt rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_EWARM/readme_patch.txt diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.c b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.c rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.c diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/Release_Notes_for_STM32F10x_CMSIS.html b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/Release_Notes_for_STM32F10x_CMSIS.html similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/Release_Notes_for_STM32F10x_CMSIS.html rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/Release_Notes_for_STM32F10x_CMSIS.html diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CMSIS debug support.htm b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CMSIS debug support.htm similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CMSIS debug support.htm rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CMSIS debug support.htm diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CMSIS_changes.htm b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CMSIS_changes.htm similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CMSIS_changes.htm rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/CMSIS_changes.htm diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/Documentation/CMSIS_Core.htm b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/Documentation/CMSIS_Core.htm similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/Documentation/CMSIS_Core.htm rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/Documentation/CMSIS_Core.htm diff --git a/demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/License.doc b/demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/License.doc similarity index 100% rename from demo/stm32f10x/non_os/Libraries/CMSIS_RVMDK/License.doc rename to demo/env/stm32f10x/non_os/Libraries/CMSIS_RVMDK/License.doc diff --git a/demo/stm32f10x/non_os/Libraries/SConscript b/demo/env/stm32f10x/non_os/Libraries/SConscript similarity index 100% rename from demo/stm32f10x/non_os/Libraries/SConscript rename to demo/env/stm32f10x/non_os/Libraries/SConscript diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes.html b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes.html similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes.html rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes.html diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes_for_STM32F10x_StdPeriph_Driver.html b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes_for_STM32F10x_StdPeriph_Driver.html similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes_for_STM32F10x_StdPeriph_Driver.html rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes_for_STM32F10x_StdPeriph_Driver.html diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c diff --git a/demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c b/demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c similarity index 100% rename from demo/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c rename to demo/env/stm32f10x/non_os/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c diff --git a/demo/stm32f10x/non_os/README.md b/demo/env/stm32f10x/non_os/README.md similarity index 100% rename from demo/stm32f10x/non_os/README.md rename to demo/env/stm32f10x/non_os/README.md diff --git a/demo/stm32f10x/non_os/RVMDK/.gitignore b/demo/env/stm32f10x/non_os/RVMDK/.gitignore similarity index 100% rename from demo/stm32f10x/non_os/RVMDK/.gitignore rename to demo/env/stm32f10x/non_os/RVMDK/.gitignore diff --git a/demo/stm32f10x/non_os/RVMDK/EasyFlash.uvopt b/demo/env/stm32f10x/non_os/RVMDK/EasyFlash.uvopt similarity index 100% rename from demo/stm32f10x/non_os/RVMDK/EasyFlash.uvopt rename to demo/env/stm32f10x/non_os/RVMDK/EasyFlash.uvopt diff --git a/demo/stm32f10x/non_os/RVMDK/EasyFlash.uvproj b/demo/env/stm32f10x/non_os/RVMDK/EasyFlash.uvproj similarity index 100% rename from demo/stm32f10x/non_os/RVMDK/EasyFlash.uvproj rename to demo/env/stm32f10x/non_os/RVMDK/EasyFlash.uvproj diff --git a/demo/stm32f10x/non_os/RVMDK/EasyFlash_stm32f103xE.dep b/demo/env/stm32f10x/non_os/RVMDK/EasyFlash_stm32f103xE.dep similarity index 100% rename from demo/stm32f10x/non_os/RVMDK/EasyFlash_stm32f103xE.dep rename to demo/env/stm32f10x/non_os/RVMDK/EasyFlash_stm32f103xE.dep diff --git a/demo/stm32f10x/non_os/RVMDK/EasyFlash_uvopt.bak b/demo/env/stm32f10x/non_os/RVMDK/EasyFlash_uvopt.bak similarity index 100% rename from demo/stm32f10x/non_os/RVMDK/EasyFlash_uvopt.bak rename to demo/env/stm32f10x/non_os/RVMDK/EasyFlash_uvopt.bak diff --git a/demo/stm32f10x/non_os/RVMDK/EasyFlash_uvproj.bak b/demo/env/stm32f10x/non_os/RVMDK/EasyFlash_uvproj.bak similarity index 100% rename from demo/stm32f10x/non_os/RVMDK/EasyFlash_uvproj.bak rename to demo/env/stm32f10x/non_os/RVMDK/EasyFlash_uvproj.bak diff --git a/demo/stm32f10x/non_os/RVMDK/JLink Regs CM3.txt b/demo/env/stm32f10x/non_os/RVMDK/JLink Regs CM3.txt similarity index 100% rename from demo/stm32f10x/non_os/RVMDK/JLink Regs CM3.txt rename to demo/env/stm32f10x/non_os/RVMDK/JLink Regs CM3.txt diff --git a/demo/stm32f10x/non_os/RVMDK/JLinkLog.txt b/demo/env/stm32f10x/non_os/RVMDK/JLinkLog.txt similarity index 100% rename from demo/stm32f10x/non_os/RVMDK/JLinkLog.txt rename to demo/env/stm32f10x/non_os/RVMDK/JLinkLog.txt diff --git a/demo/stm32f10x/non_os/RVMDK/JLinkSettings.ini b/demo/env/stm32f10x/non_os/RVMDK/JLinkSettings.ini similarity index 100% rename from demo/stm32f10x/non_os/RVMDK/JLinkSettings.ini rename to demo/env/stm32f10x/non_os/RVMDK/JLinkSettings.ini diff --git a/demo/stm32f10x/non_os/app/inc/stm32f10x_conf.h b/demo/env/stm32f10x/non_os/app/inc/stm32f10x_conf.h similarity index 100% rename from demo/stm32f10x/non_os/app/inc/stm32f10x_conf.h rename to demo/env/stm32f10x/non_os/app/inc/stm32f10x_conf.h diff --git a/demo/stm32f10x/non_os/app/inc/stm32f10x_it.h b/demo/env/stm32f10x/non_os/app/inc/stm32f10x_it.h similarity index 100% rename from demo/stm32f10x/non_os/app/inc/stm32f10x_it.h rename to demo/env/stm32f10x/non_os/app/inc/stm32f10x_it.h diff --git a/demo/stm32f10x/non_os/app/src/app.c b/demo/env/stm32f10x/non_os/app/src/app.c similarity index 100% rename from demo/stm32f10x/non_os/app/src/app.c rename to demo/env/stm32f10x/non_os/app/src/app.c diff --git a/demo/stm32f10x/non_os/app/src/stm32f10x_it.c b/demo/env/stm32f10x/non_os/app/src/stm32f10x_it.c similarity index 100% rename from demo/stm32f10x/non_os/app/src/stm32f10x_it.c rename to demo/env/stm32f10x/non_os/app/src/stm32f10x_it.c diff --git a/demo/stm32f10x/non_os/components/easyflash/port/ef_port.c b/demo/env/stm32f10x/non_os/components/easyflash/port/ef_port.c similarity index 100% rename from demo/stm32f10x/non_os/components/easyflash/port/ef_port.c rename to demo/env/stm32f10x/non_os/components/easyflash/port/ef_port.c diff --git a/demo/stm32f10x/non_os/components/others/bsp.c b/demo/env/stm32f10x/non_os/components/others/bsp.c similarity index 100% rename from demo/stm32f10x/non_os/components/others/bsp.c rename to demo/env/stm32f10x/non_os/components/others/bsp.c diff --git a/demo/stm32f10x/non_os/components/others/bsp.h b/demo/env/stm32f10x/non_os/components/others/bsp.h similarity index 100% rename from demo/stm32f10x/non_os/components/others/bsp.h rename to demo/env/stm32f10x/non_os/components/others/bsp.h diff --git a/demo/stm32f10x/non_os/components/others/stm32f103xB.icf b/demo/env/stm32f10x/non_os/components/others/stm32f103xB.icf similarity index 100% rename from demo/stm32f10x/non_os/components/others/stm32f103xB.icf rename to demo/env/stm32f10x/non_os/components/others/stm32f103xB.icf diff --git a/demo/stm32f10x/non_os/components/others/stm32f103xE.icf b/demo/env/stm32f10x/non_os/components/others/stm32f103xE.icf similarity index 100% rename from demo/stm32f10x/non_os/components/others/stm32f103xE.icf rename to demo/env/stm32f10x/non_os/components/others/stm32f103xE.icf diff --git a/demo/stm32f10x/non_os/components/others/types.h b/demo/env/stm32f10x/non_os/components/others/types.h similarity index 100% rename from demo/stm32f10x/non_os/components/others/types.h rename to demo/env/stm32f10x/non_os/components/others/types.h diff --git a/demo/stm32f10x/rtt/EWARM/.gitignore b/demo/env/stm32f10x/rtt/EWARM/.gitignore similarity index 100% rename from demo/stm32f10x/rtt/EWARM/.gitignore rename to demo/env/stm32f10x/rtt/EWARM/.gitignore diff --git a/demo/stm32f10x/rtt/EWARM/EasyFlash.dep b/demo/env/stm32f10x/rtt/EWARM/EasyFlash.dep similarity index 100% rename from demo/stm32f10x/rtt/EWARM/EasyFlash.dep rename to demo/env/stm32f10x/rtt/EWARM/EasyFlash.dep diff --git a/demo/stm32f10x/rtt/EWARM/EasyFlash.ewd b/demo/env/stm32f10x/rtt/EWARM/EasyFlash.ewd similarity index 100% rename from demo/stm32f10x/rtt/EWARM/EasyFlash.ewd rename to demo/env/stm32f10x/rtt/EWARM/EasyFlash.ewd diff --git a/demo/stm32f10x/rtt/EWARM/EasyFlash.ewp b/demo/env/stm32f10x/rtt/EWARM/EasyFlash.ewp similarity index 100% rename from demo/stm32f10x/rtt/EWARM/EasyFlash.ewp rename to demo/env/stm32f10x/rtt/EWARM/EasyFlash.ewp diff --git a/demo/stm32f10x/rtt/EWARM/EasyFlash.eww b/demo/env/stm32f10x/rtt/EWARM/EasyFlash.eww similarity index 100% rename from demo/stm32f10x/rtt/EWARM/EasyFlash.eww rename to demo/env/stm32f10x/rtt/EWARM/EasyFlash.eww diff --git a/demo/stm32f10x/rtt/EWARM/EasyFlashCustomSfr.sfr b/demo/env/stm32f10x/rtt/EWARM/EasyFlashCustomSfr.sfr similarity index 100% rename from demo/stm32f10x/rtt/EWARM/EasyFlashCustomSfr.sfr rename to demo/env/stm32f10x/rtt/EWARM/EasyFlashCustomSfr.sfr diff --git a/demo/stm32f10x/rtt/EWARM/settings/EasyFlash.cspy.bat b/demo/env/stm32f10x/rtt/EWARM/settings/EasyFlash.cspy.bat similarity index 100% rename from demo/stm32f10x/rtt/EWARM/settings/EasyFlash.cspy.bat rename to demo/env/stm32f10x/rtt/EWARM/settings/EasyFlash.cspy.bat diff --git a/demo/stm32f10x/rtt/EWARM/settings/EasyFlash.dbgdt b/demo/env/stm32f10x/rtt/EWARM/settings/EasyFlash.dbgdt similarity index 100% rename from demo/stm32f10x/rtt/EWARM/settings/EasyFlash.dbgdt rename to demo/env/stm32f10x/rtt/EWARM/settings/EasyFlash.dbgdt diff --git a/demo/stm32f10x/rtt/EWARM/settings/EasyFlash.dni b/demo/env/stm32f10x/rtt/EWARM/settings/EasyFlash.dni similarity index 100% rename from demo/stm32f10x/rtt/EWARM/settings/EasyFlash.dni rename to demo/env/stm32f10x/rtt/EWARM/settings/EasyFlash.dni diff --git a/demo/stm32f10x/rtt/EWARM/settings/EasyFlash.wsdt b/demo/env/stm32f10x/rtt/EWARM/settings/EasyFlash.wsdt similarity index 100% rename from demo/stm32f10x/rtt/EWARM/settings/EasyFlash.wsdt rename to demo/env/stm32f10x/rtt/EWARM/settings/EasyFlash.wsdt diff --git a/demo/stm32f10x/rtt/EWARM/settings/EasyFlash_Debug.jlink b/demo/env/stm32f10x/rtt/EWARM/settings/EasyFlash_Debug.jlink similarity index 100% rename from demo/stm32f10x/rtt/EWARM/settings/EasyFlash_Debug.jlink rename to demo/env/stm32f10x/rtt/EWARM/settings/EasyFlash_Debug.jlink diff --git a/demo/stm32f10x/rtt/EWARM/settings/EasyFlash_EncodingOverride.xml b/demo/env/stm32f10x/rtt/EWARM/settings/EasyFlash_EncodingOverride.xml similarity index 100% rename from demo/stm32f10x/rtt/EWARM/settings/EasyFlash_EncodingOverride.xml rename to demo/env/stm32f10x/rtt/EWARM/settings/EasyFlash_EncodingOverride.xml diff --git a/demo/stm32f10x/rtt/EWARM/settings/EasyFlash_stm32f103xE.jlink b/demo/env/stm32f10x/rtt/EWARM/settings/EasyFlash_stm32f103xE.jlink similarity index 100% rename from demo/stm32f10x/rtt/EWARM/settings/EasyFlash_stm32f103xE.jlink rename to demo/env/stm32f10x/rtt/EWARM/settings/EasyFlash_stm32f103xE.jlink diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CMSIS END USER LICENCE AGREEMENT.pdf b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CMSIS END USER LICENCE AGREEMENT.pdf similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CMSIS END USER LICENCE AGREEMENT.pdf rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CMSIS END USER LICENCE AGREEMENT.pdf diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CMSIS debug support.htm b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CMSIS debug support.htm similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CMSIS debug support.htm rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CMSIS debug support.htm diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CMSIS_changes.htm b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CMSIS_changes.htm similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/CMSIS_changes.htm rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/CMSIS_changes.htm diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Documentation/CMSIS_Core.htm b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Documentation/CMSIS_Core.htm similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Documentation/CMSIS_Core.htm rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Documentation/CMSIS_Core.htm diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/arm_common_tables.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/arm_common_tables.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/arm_common_tables.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/arm_common_tables.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/arm_math.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/arm_math.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/arm_math.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/arm_math.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm0.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm0.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm0.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm0.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm0plus.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm0plus.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm0plus.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm0plus.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm3.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm3.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm3.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm3.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm4.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm4.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm4.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm4.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm4_simd.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm4_simd.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm4_simd.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cm4_simd.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cmFunc.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cmFunc.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cmFunc.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cmFunc.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cmInstr.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cmInstr.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cmInstr.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_cmInstr.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_sc000.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_sc000.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_sc000.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_sc000.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_sc300.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_sc300.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_sc300.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/Include/core_sc300.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/License.doc b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/License.doc similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/License.doc rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/License.doc diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/README.txt b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/README.txt similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/README.txt rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/README.txt diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/index.htm b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/index.htm similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/index.htm rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/index.htm diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/readme_patch.txt b/demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/readme_patch.txt similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_EWARM/readme_patch.txt rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_EWARM/readme_patch.txt diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.c b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.c rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.c diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/Release_Notes_for_STM32F10x_CMSIS.html b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/Release_Notes_for_STM32F10x_CMSIS.html similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/Release_Notes_for_STM32F10x_CMSIS.html rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/Release_Notes_for_STM32F10x_CMSIS.html diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CMSIS debug support.htm b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CMSIS debug support.htm similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CMSIS debug support.htm rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CMSIS debug support.htm diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CMSIS_changes.htm b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CMSIS_changes.htm similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CMSIS_changes.htm rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/CMSIS_changes.htm diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/Documentation/CMSIS_Core.htm b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/Documentation/CMSIS_Core.htm similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/Documentation/CMSIS_Core.htm rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/Documentation/CMSIS_Core.htm diff --git a/demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/License.doc b/demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/License.doc similarity index 100% rename from demo/stm32f10x/rtt/Libraries/CMSIS_RVMDK/License.doc rename to demo/env/stm32f10x/rtt/Libraries/CMSIS_RVMDK/License.doc diff --git a/demo/stm32f10x/rtt/Libraries/SConscript b/demo/env/stm32f10x/rtt/Libraries/SConscript similarity index 100% rename from demo/stm32f10x/rtt/Libraries/SConscript rename to demo/env/stm32f10x/rtt/Libraries/SConscript diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes.html b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes.html similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes.html rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes.html diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes_for_STM32F10x_StdPeriph_Driver.html b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes_for_STM32F10x_StdPeriph_Driver.html similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes_for_STM32F10x_StdPeriph_Driver.html rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes_for_STM32F10x_StdPeriph_Driver.html diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c diff --git a/demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c b/demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c similarity index 100% rename from demo/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c rename to demo/env/stm32f10x/rtt/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c diff --git a/demo/stm32f10x/rtt/README.md b/demo/env/stm32f10x/rtt/README.md similarity index 100% rename from demo/stm32f10x/rtt/README.md rename to demo/env/stm32f10x/rtt/README.md diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/AUTHORS b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/AUTHORS similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/AUTHORS rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/AUTHORS diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/COPYING b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/COPYING similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/COPYING rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/COPYING diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/SConscript b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/SConscript similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/SConscript rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/SConscript diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/SConscript b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/SConscript similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/SConscript rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/SConscript diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/alarm.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/alarm.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/alarm.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/alarm.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/i2c-bit-ops.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/i2c-bit-ops.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/i2c-bit-ops.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/i2c-bit-ops.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/i2c.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/i2c.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/i2c.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/i2c.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/i2c_dev.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/i2c_dev.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/i2c_dev.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/i2c_dev.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_card.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_card.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_card.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_card.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_cmd.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_cmd.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_cmd.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_cmd.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_core.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_core.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_core.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_core.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_host.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_host.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_host.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_host.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nand.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nand.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nand.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nand.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nor.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nor.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nor.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nor.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/rtc.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/rtc.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/rtc.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/rtc.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/sd.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/sd.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/sd.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/sd.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/sdio.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/sdio.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/sdio.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/sdio.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/sdio_func_ids.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/sdio_func_ids.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/sdio_func_ids.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/sdio_func_ids.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/serial.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/serial.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/serial.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/serial.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/spi.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/spi.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/spi.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/spi.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/usb_common.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/usb_common.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/usb_common.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/usb_common.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/usb_device.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/usb_device.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/usb_device.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/usb_device.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/usb_host.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/usb_host.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/usb_host.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/drivers/usb_host.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/rtdevice.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/rtdevice.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/rtdevice.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/include/rtdevice.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/serial/SConscript b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/serial/SConscript similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/serial/SConscript rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/serial/SConscript diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/serial/serial.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/serial/serial.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/serial/serial.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/serial/serial.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/SConscript b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/SConscript similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/SConscript rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/SConscript diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/completion.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/completion.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/completion.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/completion.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/dataqueue.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/dataqueue.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/dataqueue.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/dataqueue.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/pipe.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/pipe.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/pipe.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/pipe.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/portal.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/portal.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/portal.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/portal.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/ringbuffer.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/ringbuffer.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/ringbuffer.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/ringbuffer.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/wrokqueue.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/wrokqueue.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/wrokqueue.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/drivers/src/wrokqueue.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/SConscript b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/SConscript similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/SConscript rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/SConscript diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/cmd.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/cmd.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/cmd.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/cmd.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_compiler.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_compiler.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_compiler.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_compiler.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_error.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_error.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_error.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_error.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_error.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_error.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_error.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_error.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_heap.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_heap.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_heap.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_heap.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_heap.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_heap.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_heap.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_heap.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_init.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_init.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_init.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_init.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_node.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_node.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_node.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_node.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_node.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_node.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_node.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_node.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_ops.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_ops.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_ops.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_ops.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_ops.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_ops.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_ops.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_ops.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_parser.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_parser.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_parser.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_parser.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_parser.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_parser.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_parser.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_parser.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_token.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_token.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_token.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_token.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_token.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_token.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_token.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_token.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_var.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_var.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_var.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_var.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_var.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_var.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_var.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_var.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_vm.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_vm.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_vm.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_vm.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_vm.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_vm.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_vm.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/finsh_vm.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/msh.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/msh.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/msh.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/msh.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/msh.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/msh.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/msh.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/msh.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/msh_cmd.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/msh_cmd.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/msh_cmd.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/msh_cmd.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/shell.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/shell.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/shell.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/shell.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/shell.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/shell.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/shell.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/shell.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/symbol.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/symbol.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/symbol.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/components/finsh/symbol.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/include/cpuusage.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/include/cpuusage.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/include/cpuusage.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/include/cpuusage.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/include/rtdebug.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/include/rtdebug.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/include/rtdebug.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/include/rtdebug.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/include/rtdef.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/include/rtdef.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/include/rtdef.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/include/rtdef.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/include/rthw.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/include/rthw.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/include/rthw.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/include/rthw.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/include/rtm.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/include/rtm.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/include/rtm.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/include/rtm.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/include/rtservice.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/include/rtservice.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/include/rtservice.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/include/rtservice.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/include/rtthread.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/include/rtthread.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/include/rtthread.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/include/rtthread.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/SConscript b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/SConscript similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/SConscript rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/SConscript diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_gcc.S b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_gcc.S similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_gcc.S rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_gcc.S diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_iar.S b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_iar.S similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_iar.S rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_iar.S diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_rvds.S b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_rvds.S similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_rvds.S rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_rvds.S diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/cpuport.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/cpuport.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/cpuport.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/libcpu/arm/cortex-m3/cpuport.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/SConscript b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/SConscript similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/SConscript rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/SConscript diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/clock.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/clock.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/clock.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/clock.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/cpuusage.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/cpuusage.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/cpuusage.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/cpuusage.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/device.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/device.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/device.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/device.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/idle.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/idle.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/idle.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/idle.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/ipc.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/ipc.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/ipc.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/ipc.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/irq.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/irq.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/irq.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/irq.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/kservice.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/kservice.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/kservice.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/kservice.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/mem.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/mem.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/mem.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/mem.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/memheap.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/memheap.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/memheap.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/memheap.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/mempool.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/mempool.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/mempool.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/mempool.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/module.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/module.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/module.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/module.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/module.h b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/module.h similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/module.h rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/module.h diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/object.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/object.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/object.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/object.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/scheduler.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/scheduler.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/scheduler.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/scheduler.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/slab.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/slab.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/slab.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/slab.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/thread.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/thread.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/thread.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/thread.c diff --git a/demo/stm32f10x/rtt/RT-Thread-1.2.2/src/timer.c b/demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/timer.c similarity index 100% rename from demo/stm32f10x/rtt/RT-Thread-1.2.2/src/timer.c rename to demo/env/stm32f10x/rtt/RT-Thread-1.2.2/src/timer.c diff --git a/demo/stm32f10x/rtt/RVMDK/.gitignore b/demo/env/stm32f10x/rtt/RVMDK/.gitignore similarity index 100% rename from demo/stm32f10x/rtt/RVMDK/.gitignore rename to demo/env/stm32f10x/rtt/RVMDK/.gitignore diff --git a/demo/stm32f10x/rtt/RVMDK/EasyFlash.uvopt b/demo/env/stm32f10x/rtt/RVMDK/EasyFlash.uvopt similarity index 100% rename from demo/stm32f10x/rtt/RVMDK/EasyFlash.uvopt rename to demo/env/stm32f10x/rtt/RVMDK/EasyFlash.uvopt diff --git a/demo/stm32f10x/rtt/RVMDK/EasyFlash.uvproj b/demo/env/stm32f10x/rtt/RVMDK/EasyFlash.uvproj similarity index 100% rename from demo/stm32f10x/rtt/RVMDK/EasyFlash.uvproj rename to demo/env/stm32f10x/rtt/RVMDK/EasyFlash.uvproj diff --git a/demo/stm32f10x/rtt/RVMDK/EasyFlash_stm32f103xE.dep b/demo/env/stm32f10x/rtt/RVMDK/EasyFlash_stm32f103xE.dep similarity index 100% rename from demo/stm32f10x/rtt/RVMDK/EasyFlash_stm32f103xE.dep rename to demo/env/stm32f10x/rtt/RVMDK/EasyFlash_stm32f103xE.dep diff --git a/demo/stm32f10x/rtt/RVMDK/EasyFlash_uvopt.bak b/demo/env/stm32f10x/rtt/RVMDK/EasyFlash_uvopt.bak similarity index 100% rename from demo/stm32f10x/rtt/RVMDK/EasyFlash_uvopt.bak rename to demo/env/stm32f10x/rtt/RVMDK/EasyFlash_uvopt.bak diff --git a/demo/stm32f10x/rtt/RVMDK/EasyFlash_uvproj.bak b/demo/env/stm32f10x/rtt/RVMDK/EasyFlash_uvproj.bak similarity index 100% rename from demo/stm32f10x/rtt/RVMDK/EasyFlash_uvproj.bak rename to demo/env/stm32f10x/rtt/RVMDK/EasyFlash_uvproj.bak diff --git a/demo/stm32f10x/rtt/RVMDK/JLink Regs CM3.txt b/demo/env/stm32f10x/rtt/RVMDK/JLink Regs CM3.txt similarity index 100% rename from demo/stm32f10x/rtt/RVMDK/JLink Regs CM3.txt rename to demo/env/stm32f10x/rtt/RVMDK/JLink Regs CM3.txt diff --git a/demo/stm32f10x/rtt/RVMDK/JLinkLog.txt b/demo/env/stm32f10x/rtt/RVMDK/JLinkLog.txt similarity index 100% rename from demo/stm32f10x/rtt/RVMDK/JLinkLog.txt rename to demo/env/stm32f10x/rtt/RVMDK/JLinkLog.txt diff --git a/demo/stm32f10x/rtt/RVMDK/JLinkSettings.ini b/demo/env/stm32f10x/rtt/RVMDK/JLinkSettings.ini similarity index 100% rename from demo/stm32f10x/rtt/RVMDK/JLinkSettings.ini rename to demo/env/stm32f10x/rtt/RVMDK/JLinkSettings.ini diff --git a/demo/stm32f10x/rtt/app/inc/app_task.h b/demo/env/stm32f10x/rtt/app/inc/app_task.h similarity index 100% rename from demo/stm32f10x/rtt/app/inc/app_task.h rename to demo/env/stm32f10x/rtt/app/inc/app_task.h diff --git a/demo/stm32f10x/rtt/app/inc/delay_conf.h b/demo/env/stm32f10x/rtt/app/inc/delay_conf.h similarity index 100% rename from demo/stm32f10x/rtt/app/inc/delay_conf.h rename to demo/env/stm32f10x/rtt/app/inc/delay_conf.h diff --git a/demo/stm32f10x/rtt/app/inc/rtconfig.h b/demo/env/stm32f10x/rtt/app/inc/rtconfig.h similarity index 100% rename from demo/stm32f10x/rtt/app/inc/rtconfig.h rename to demo/env/stm32f10x/rtt/app/inc/rtconfig.h diff --git a/demo/stm32f10x/rtt/app/inc/stm32f10x_conf.h b/demo/env/stm32f10x/rtt/app/inc/stm32f10x_conf.h similarity index 100% rename from demo/stm32f10x/rtt/app/inc/stm32f10x_conf.h rename to demo/env/stm32f10x/rtt/app/inc/stm32f10x_conf.h diff --git a/demo/stm32f10x/rtt/app/inc/stm32f10x_it.h b/demo/env/stm32f10x/rtt/app/inc/stm32f10x_it.h similarity index 100% rename from demo/stm32f10x/rtt/app/inc/stm32f10x_it.h rename to demo/env/stm32f10x/rtt/app/inc/stm32f10x_it.h diff --git a/demo/stm32f10x/rtt/app/src/app.c b/demo/env/stm32f10x/rtt/app/src/app.c similarity index 100% rename from demo/stm32f10x/rtt/app/src/app.c rename to demo/env/stm32f10x/rtt/app/src/app.c diff --git a/demo/stm32f10x/rtt/app/src/app_task.c b/demo/env/stm32f10x/rtt/app/src/app_task.c similarity index 100% rename from demo/stm32f10x/rtt/app/src/app_task.c rename to demo/env/stm32f10x/rtt/app/src/app_task.c diff --git a/demo/stm32f10x/rtt/app/src/stm32f10x_it.c b/demo/env/stm32f10x/rtt/app/src/stm32f10x_it.c similarity index 100% rename from demo/stm32f10x/rtt/app/src/stm32f10x_it.c rename to demo/env/stm32f10x/rtt/app/src/stm32f10x_it.c diff --git a/demo/stm32f10x/rtt/app/src/user_finsh_cmd.c b/demo/env/stm32f10x/rtt/app/src/user_finsh_cmd.c similarity index 100% rename from demo/stm32f10x/rtt/app/src/user_finsh_cmd.c rename to demo/env/stm32f10x/rtt/app/src/user_finsh_cmd.c diff --git a/demo/stm32f10x/rtt/components/easyflash/port/ef_port.c b/demo/env/stm32f10x/rtt/components/easyflash/port/ef_port.c similarity index 100% rename from demo/stm32f10x/rtt/components/easyflash/port/ef_port.c rename to demo/env/stm32f10x/rtt/components/easyflash/port/ef_port.c diff --git a/demo/stm32f10x/rtt/components/others/bsp.c b/demo/env/stm32f10x/rtt/components/others/bsp.c similarity index 100% rename from demo/stm32f10x/rtt/components/others/bsp.c rename to demo/env/stm32f10x/rtt/components/others/bsp.c diff --git a/demo/stm32f10x/rtt/components/others/bsp.h b/demo/env/stm32f10x/rtt/components/others/bsp.h similarity index 100% rename from demo/stm32f10x/rtt/components/others/bsp.h rename to demo/env/stm32f10x/rtt/components/others/bsp.h diff --git a/demo/stm32f10x/rtt/components/others/stm32f103xB.icf b/demo/env/stm32f10x/rtt/components/others/stm32f103xB.icf similarity index 100% rename from demo/stm32f10x/rtt/components/others/stm32f103xB.icf rename to demo/env/stm32f10x/rtt/components/others/stm32f103xB.icf diff --git a/demo/stm32f10x/rtt/components/others/stm32f103xE.icf b/demo/env/stm32f10x/rtt/components/others/stm32f103xE.icf similarity index 100% rename from demo/stm32f10x/rtt/components/others/stm32f103xE.icf rename to demo/env/stm32f10x/rtt/components/others/stm32f103xE.icf diff --git a/demo/stm32f10x/rtt/components/others/types.h b/demo/env/stm32f10x/rtt/components/others/types.h similarity index 100% rename from demo/stm32f10x/rtt/components/others/types.h rename to demo/env/stm32f10x/rtt/components/others/types.h diff --git a/demo/stm32f10x/rtt/components/others/utils.c b/demo/env/stm32f10x/rtt/components/others/utils.c similarity index 100% rename from demo/stm32f10x/rtt/components/others/utils.c rename to demo/env/stm32f10x/rtt/components/others/utils.c diff --git a/demo/stm32f10x/rtt/components/others/utils.h b/demo/env/stm32f10x/rtt/components/others/utils.h similarity index 100% rename from demo/stm32f10x/rtt/components/others/utils.h rename to demo/env/stm32f10x/rtt/components/others/utils.h diff --git a/demo/stm32f10x/rtt/components/rtt_uart/usart.c b/demo/env/stm32f10x/rtt/components/rtt_uart/usart.c similarity index 100% rename from demo/stm32f10x/rtt/components/rtt_uart/usart.c rename to demo/env/stm32f10x/rtt/components/rtt_uart/usart.c diff --git a/demo/stm32f10x/rtt/components/rtt_uart/usart.h b/demo/env/stm32f10x/rtt/components/rtt_uart/usart.h similarity index 100% rename from demo/stm32f10x/rtt/components/rtt_uart/usart.h rename to demo/env/stm32f10x/rtt/components/rtt_uart/usart.h diff --git a/demo/stm32f4xx/EWARM/.gitignore b/demo/env/stm32f4xx/EWARM/.gitignore similarity index 100% rename from demo/stm32f4xx/EWARM/.gitignore rename to demo/env/stm32f4xx/EWARM/.gitignore diff --git a/demo/stm32f4xx/EWARM/EasyFlash.dep b/demo/env/stm32f4xx/EWARM/EasyFlash.dep similarity index 100% rename from demo/stm32f4xx/EWARM/EasyFlash.dep rename to demo/env/stm32f4xx/EWARM/EasyFlash.dep diff --git a/demo/stm32f4xx/EWARM/EasyFlash.ewd b/demo/env/stm32f4xx/EWARM/EasyFlash.ewd similarity index 100% rename from demo/stm32f4xx/EWARM/EasyFlash.ewd rename to demo/env/stm32f4xx/EWARM/EasyFlash.ewd diff --git a/demo/stm32f4xx/EWARM/EasyFlash.ewp b/demo/env/stm32f4xx/EWARM/EasyFlash.ewp similarity index 100% rename from demo/stm32f4xx/EWARM/EasyFlash.ewp rename to demo/env/stm32f4xx/EWARM/EasyFlash.ewp diff --git a/demo/stm32f4xx/EWARM/EasyFlash.eww b/demo/env/stm32f4xx/EWARM/EasyFlash.eww similarity index 100% rename from demo/stm32f4xx/EWARM/EasyFlash.eww rename to demo/env/stm32f4xx/EWARM/EasyFlash.eww diff --git a/demo/stm32f4xx/EWARM/EasyFlashCustomSfr.sfr b/demo/env/stm32f4xx/EWARM/EasyFlashCustomSfr.sfr similarity index 100% rename from demo/stm32f4xx/EWARM/EasyFlashCustomSfr.sfr rename to demo/env/stm32f4xx/EWARM/EasyFlashCustomSfr.sfr diff --git a/demo/stm32f4xx/EWARM/settings/EasyFlash.cspy.bat b/demo/env/stm32f4xx/EWARM/settings/EasyFlash.cspy.bat similarity index 100% rename from demo/stm32f4xx/EWARM/settings/EasyFlash.cspy.bat rename to demo/env/stm32f4xx/EWARM/settings/EasyFlash.cspy.bat diff --git a/demo/stm32f4xx/EWARM/settings/EasyFlash.dbgdt b/demo/env/stm32f4xx/EWARM/settings/EasyFlash.dbgdt similarity index 100% rename from demo/stm32f4xx/EWARM/settings/EasyFlash.dbgdt rename to demo/env/stm32f4xx/EWARM/settings/EasyFlash.dbgdt diff --git a/demo/stm32f4xx/EWARM/settings/EasyFlash.dni b/demo/env/stm32f4xx/EWARM/settings/EasyFlash.dni similarity index 100% rename from demo/stm32f4xx/EWARM/settings/EasyFlash.dni rename to demo/env/stm32f4xx/EWARM/settings/EasyFlash.dni diff --git a/demo/stm32f4xx/EWARM/settings/EasyFlash.wsdt b/demo/env/stm32f4xx/EWARM/settings/EasyFlash.wsdt similarity index 100% rename from demo/stm32f4xx/EWARM/settings/EasyFlash.wsdt rename to demo/env/stm32f4xx/EWARM/settings/EasyFlash.wsdt diff --git a/demo/stm32f4xx/EWARM/settings/EasyFlash_Debug.jlink b/demo/env/stm32f4xx/EWARM/settings/EasyFlash_Debug.jlink similarity index 100% rename from demo/stm32f4xx/EWARM/settings/EasyFlash_Debug.jlink rename to demo/env/stm32f4xx/EWARM/settings/EasyFlash_Debug.jlink diff --git a/demo/stm32f4xx/EWARM/settings/EasyFlash_EncodingOverride.xml b/demo/env/stm32f4xx/EWARM/settings/EasyFlash_EncodingOverride.xml similarity index 100% rename from demo/stm32f4xx/EWARM/settings/EasyFlash_EncodingOverride.xml rename to demo/env/stm32f4xx/EWARM/settings/EasyFlash_EncodingOverride.xml diff --git a/demo/stm32f4xx/EWARM/settings/EasyFlash_STM32F405RG.jlink b/demo/env/stm32f4xx/EWARM/settings/EasyFlash_STM32F405RG.jlink similarity index 100% rename from demo/stm32f4xx/EWARM/settings/EasyFlash_STM32F405RG.jlink rename to demo/env/stm32f4xx/EWARM/settings/EasyFlash_STM32F405RG.jlink diff --git a/demo/stm32f4xx/Libraries/CMSIS/CMSIS_END_USER_LICENCE_AGREEMENT.pdf b/demo/env/stm32f4xx/Libraries/CMSIS/CMSIS_END_USER_LICENCE_AGREEMENT.pdf similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/CMSIS_END_USER_LICENCE_AGREEMENT.pdf rename to demo/env/stm32f4xx/Libraries/CMSIS/CMSIS_END_USER_LICENCE_AGREEMENT.pdf diff --git a/demo/stm32f4xx/Libraries/CMSIS/CMSIS_END_USER_LICENCE_AGREEMENT.rtf b/demo/env/stm32f4xx/Libraries/CMSIS/CMSIS_END_USER_LICENCE_AGREEMENT.rtf similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/CMSIS_END_USER_LICENCE_AGREEMENT.rtf rename to demo/env/stm32f4xx/Libraries/CMSIS/CMSIS_END_USER_LICENCE_AGREEMENT.rtf diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_class_marks_example/ARM/arm_class_marks_example_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_class_marks_example/ARM/arm_class_marks_example_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_class_marks_example/ARM/arm_class_marks_example_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_class_marks_example/ARM/arm_class_marks_example_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_class_marks_example/GCC/arm_class_marks_example_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_class_marks_example/GCC/arm_class_marks_example_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_class_marks_example/GCC/arm_class_marks_example_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_class_marks_example/GCC/arm_class_marks_example_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/ARM/arm_convolution_example_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/ARM/arm_convolution_example_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/ARM/arm_convolution_example_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/ARM/arm_convolution_example_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/ARM/math_helper.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/ARM/math_helper.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/ARM/math_helper.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/ARM/math_helper.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/ARM/math_helper.h b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/ARM/math_helper.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/ARM/math_helper.h rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/ARM/math_helper.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/GCC/arm_convolution_example_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/GCC/arm_convolution_example_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/GCC/arm_convolution_example_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/GCC/arm_convolution_example_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/GCC/math_helper.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/GCC/math_helper.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/GCC/math_helper.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/GCC/math_helper.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/GCC/math_helper.h b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/GCC/math_helper.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/GCC/math_helper.h rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_convolution_example/GCC/math_helper.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_dotproduct_example/ARM/arm_dotproduct_example_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_dotproduct_example/ARM/arm_dotproduct_example_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_dotproduct_example/ARM/arm_dotproduct_example_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_dotproduct_example/ARM/arm_dotproduct_example_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_dotproduct_example/GCC/arm_dotproduct_example_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_dotproduct_example/GCC/arm_dotproduct_example_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_dotproduct_example/GCC/arm_dotproduct_example_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_dotproduct_example/GCC/arm_dotproduct_example_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/ARM/arm_fft_bin_data.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/ARM/arm_fft_bin_data.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/ARM/arm_fft_bin_data.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/ARM/arm_fft_bin_data.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/ARM/arm_fft_bin_example_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/ARM/arm_fft_bin_example_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/ARM/arm_fft_bin_example_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/ARM/arm_fft_bin_example_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/GCC/arm_fft_bin_data.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/GCC/arm_fft_bin_data.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/GCC/arm_fft_bin_data.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/GCC/arm_fft_bin_data.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/GCC/arm_fft_bin_example_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/GCC/arm_fft_bin_example_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/GCC/arm_fft_bin_example_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fft_bin_example/GCC/arm_fft_bin_example_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/arm_fir_data.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/arm_fir_data.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/arm_fir_data.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/arm_fir_data.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/arm_fir_example_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/arm_fir_example_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/arm_fir_example_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/arm_fir_example_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/math_helper.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/math_helper.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/math_helper.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/math_helper.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/math_helper.h b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/math_helper.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/math_helper.h rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_fir_example/ARM/math_helper.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/arm_graphic_equalizer_data.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/arm_graphic_equalizer_data.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/arm_graphic_equalizer_data.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/arm_graphic_equalizer_data.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/arm_graphic_equalizer_example_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/arm_graphic_equalizer_example_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/arm_graphic_equalizer_example_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/arm_graphic_equalizer_example_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/math_helper.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/math_helper.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/math_helper.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/math_helper.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/math_helper.h b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/math_helper.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/math_helper.h rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_graphic_equalizer_example/ARM/math_helper.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/arm_linear_interp_data.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/arm_linear_interp_data.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/arm_linear_interp_data.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/arm_linear_interp_data.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/arm_linear_interp_example_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/arm_linear_interp_example_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/arm_linear_interp_example_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/arm_linear_interp_example_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/math_helper.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/math_helper.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/math_helper.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/math_helper.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/math_helper.h b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/math_helper.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/math_helper.h rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_linear_interp_example/ARM/math_helper.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_matrix_example/ARM/arm_matrix_example_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_matrix_example/ARM/arm_matrix_example_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_matrix_example/ARM/arm_matrix_example_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_matrix_example/ARM/arm_matrix_example_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_matrix_example/ARM/math_helper.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_matrix_example/ARM/math_helper.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_matrix_example/ARM/math_helper.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_matrix_example/ARM/math_helper.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_matrix_example/ARM/math_helper.h b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_matrix_example/ARM/math_helper.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_matrix_example/ARM/math_helper.h rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_matrix_example/ARM/math_helper.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/arm_signal_converge_data.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/arm_signal_converge_data.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/arm_signal_converge_data.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/arm_signal_converge_data.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/arm_signal_converge_example_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/arm_signal_converge_example_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/arm_signal_converge_example_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/arm_signal_converge_example_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/math_helper.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/math_helper.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/math_helper.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/math_helper.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/math_helper.h b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/math_helper.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/math_helper.h rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_signal_converge_example/ARM/math_helper.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_sin_cos_example/ARM/arm_sin_cos_example_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_sin_cos_example/ARM/arm_sin_cos_example_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_sin_cos_example/ARM/arm_sin_cos_example_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_sin_cos_example/ARM/arm_sin_cos_example_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_variance_example/ARM/arm_variance_example_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_variance_example/ARM/arm_variance_example_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_variance_example/ARM/arm_variance_example_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Examples/arm_variance_example/ARM/arm_variance_example_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_add_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_negate_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_offset_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_scale_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_shift_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_shift_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_shift_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_shift_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_shift_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_shift_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_shift_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_shift_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_shift_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_shift_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_shift_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_shift_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_sub_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/CommonTables/arm_common_tables.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/CommonTables/arm_common_tables.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/CommonTables/arm_common_tables.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/CommonTables/arm_common_tables.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/CommonTables/arm_const_structs.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/CommonTables/arm_const_structs.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/CommonTables/arm_const_structs.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/CommonTables/arm_const_structs.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_conj_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_conj_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_conj_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_conj_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_conj_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_conj_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_conj_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_conj_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_conj_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_conj_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_conj_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_conj_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_dot_prod_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_dot_prod_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_dot_prod_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_dot_prod_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_squared_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_squared_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_squared_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_squared_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_real_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_real_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_real_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_real_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_real_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_real_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_real_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_real_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_real_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_real_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_real_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_real_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_init_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_init_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_init_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_init_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_reset_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_reset_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_reset_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_reset_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_reset_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_reset_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_reset_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_reset_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_reset_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_reset_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_reset_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_pid_reset_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_sin_cos_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_sin_cos_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_sin_cos_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_sin_cos_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_sin_cos_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_sin_cos_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_sin_cos_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/ControllerFunctions/arm_sin_cos_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_cos_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_cos_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_cos_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_cos_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_cos_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_cos_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_cos_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_cos_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_cos_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_cos_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_cos_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_cos_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sin_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sin_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sin_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sin_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sin_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sin_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sin_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sin_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sin_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sin_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sin_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sin_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sqrt_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sqrt_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sqrt_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sqrt_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sqrt_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sqrt_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sqrt_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_sqrt_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_f64.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_f64.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_f64.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_f64.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f64.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f64.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f64.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f64.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_fast_opt_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_fast_opt_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_fast_opt_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_fast_opt_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_fast_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_fast_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_fast_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_fast_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_fast_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_fast_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_fast_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_fast_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_opt_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_opt_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_opt_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_opt_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_opt_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_opt_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_opt_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_opt_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_fast_opt_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_fast_opt_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_fast_opt_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_fast_opt_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_fast_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_fast_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_fast_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_fast_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_fast_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_fast_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_fast_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_fast_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_opt_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_opt_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_opt_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_opt_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_opt_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_opt_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_opt_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_opt_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_conv_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_fast_opt_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_fast_opt_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_fast_opt_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_fast_opt_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_fast_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_fast_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_fast_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_fast_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_fast_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_fast_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_fast_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_fast_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_opt_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_opt_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_opt_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_opt_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_opt_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_opt_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_opt_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_opt_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_correlate_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_fast_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_fast_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_fast_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_fast_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_fast_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_fast_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_fast_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_fast_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_init_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_init_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_init_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_init_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_fast_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_fast_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_fast_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_fast_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_fast_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_fast_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_fast_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_fast_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_init_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_init_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_init_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_init_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_init_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_init_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_init_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_init_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_init_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_init_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_init_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_init_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_init_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_init_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_init_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_init_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_init_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_init_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_init_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_init_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_init_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/FilteringFunctions/arm_lms_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_add_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_add_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_add_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_add_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_add_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_add_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_add_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_add_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_add_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_add_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_add_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_add_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_cmplx_mult_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_cmplx_mult_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_cmplx_mult_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_cmplx_mult_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_cmplx_mult_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_cmplx_mult_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_cmplx_mult_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_cmplx_mult_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_cmplx_mult_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_cmplx_mult_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_cmplx_mult_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_cmplx_mult_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_init_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_init_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_init_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_init_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_inverse_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_inverse_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_inverse_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_inverse_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_inverse_f64.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_inverse_f64.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_inverse_f64.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_inverse_f64.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_fast_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_fast_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_fast_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_fast_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_fast_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_fast_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_fast_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_fast_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_scale_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_scale_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_scale_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_scale_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_scale_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_scale_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_scale_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_scale_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_scale_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_scale_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_scale_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_scale_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_sub_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_sub_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_sub_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_sub_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_sub_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_sub_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_sub_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_sub_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_sub_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_sub_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_sub_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_sub_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_trans_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_trans_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_trans_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_trans_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_trans_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_trans_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_trans_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_trans_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_trans_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_trans_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_trans_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/MatrixFunctions/arm_mat_trans_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_max_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_mean_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_min_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_power_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_rms_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_rms_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_rms_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_rms_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_rms_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_rms_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_rms_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_rms_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_rms_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_rms_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_rms_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_rms_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_std_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_std_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_std_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_std_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_std_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_std_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_std_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_std_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_std_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_std_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_std_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_std_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_var_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_var_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_var_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_var_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_var_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_var_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_var_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_var_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_var_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_var_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_var_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/StatisticsFunctions/arm_var_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_copy_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_fill_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_float_to_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_float_to_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_float_to_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_float_to_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_float_to_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_float_to_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_float_to_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_float_to_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_float_to_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_float_to_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_float_to_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_float_to_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q15_to_float.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q15_to_float.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q15_to_float.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q15_to_float.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q15_to_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q15_to_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q15_to_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q15_to_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q15_to_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q15_to_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q15_to_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q15_to_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q31_to_float.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q31_to_float.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q31_to_float.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q31_to_float.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q31_to_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q31_to_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q31_to_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q31_to_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q31_to_q7.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q31_to_q7.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q31_to_q7.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q31_to_q7.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q7_to_float.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q7_to_float.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q7_to_float.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q7_to_float.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q7_to_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q7_to_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q7_to_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q7_to_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q7_to_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q7_to_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q7_to_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/SupportFunctions/arm_q7_to_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_bitreversal.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_bitreversal.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_bitreversal.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_bitreversal.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_bitreversal2.S b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_bitreversal2.S similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_bitreversal2.S rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_bitreversal2.S diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_init_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_init_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_init_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_init_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_init_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_init_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_init_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_init_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix8_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix8_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix8_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_cfft_radix8_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_init_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_init_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_init_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_init_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_dct4_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_fast_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_fast_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_fast_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_fast_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_fast_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_fast_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_fast_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_fast_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_init_f32.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_init_f32.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_init_f32.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_init_f32.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_init_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_init_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_init_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_init_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_init_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_init_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_init_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_init_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_q15.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_q15.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_q15.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_q15.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_q31.c b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_q31.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_q31.c rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/Source/TransformFunctions/arm_rfft_q31.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/license.txt b/demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/license.txt similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/DSP_Lib/license.txt rename to demo/env/stm32f4xx/Libraries/CMSIS/DSP_Lib/license.txt diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Include/system_stm32f4xx.h b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Include/system_stm32f4xx.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Include/system_stm32f4xx.h rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Include/system_stm32f4xx.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Release_Notes.html b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Release_Notes.html similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Release_Notes.html rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Release_Notes.html diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TASKING/cstart_thumb2.asm b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TASKING/cstart_thumb2.asm similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TASKING/cstart_thumb2.asm rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TASKING/cstart_thumb2.asm diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f401xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f401xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f401xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f401xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f40_41xxx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f40_41xxx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f40_41xxx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f40_41xxx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f40xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f40xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f40xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f40xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f411xe.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f411xe.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f411xe.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f411xe.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f427_437xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f427_437xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f427_437xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f427_437xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f427xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f427xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f427xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f427xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f429_439xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f429_439xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f429_439xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f429_439xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f446xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f446xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f446xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/TrueSTUDIO/startup_stm32f446xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f40_41xxx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f40_41xxx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f40_41xxx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f40_41xxx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f40xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f40xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f40xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f40xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427_437xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427_437xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427_437xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427_437xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427x.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427x.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427x.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427x.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429_439xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429_439xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429_439xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429_439xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f401xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f401xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f401xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f401xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f40_41xxx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f40_41xxx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f40_41xxx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f40_41xxx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f40xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f40xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f40xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f40xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f427_437xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f427_437xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f427_437xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f427_437xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f427x.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f427x.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f427x.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f427x.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f429_439xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f429_439xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f429_439xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f429_439xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f40_41xxx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f40_41xxx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f40_41xxx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f40_41xxx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f40xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f40xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f40xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f40xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427_437xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427_437xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427_437xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427_437xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427x.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427x.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427x.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427x.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429_439xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429_439xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429_439xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429_439xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f446xx.s b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f446xx.s similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f446xx.s rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f446xx.s diff --git a/demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c b/demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c rename to demo/env/stm32f4xx/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c diff --git a/demo/stm32f4xx/Libraries/CMSIS/Include/arm_common_tables.h b/demo/env/stm32f4xx/Libraries/CMSIS/Include/arm_common_tables.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Include/arm_common_tables.h rename to demo/env/stm32f4xx/Libraries/CMSIS/Include/arm_common_tables.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/Include/arm_const_structs.h b/demo/env/stm32f4xx/Libraries/CMSIS/Include/arm_const_structs.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Include/arm_const_structs.h rename to demo/env/stm32f4xx/Libraries/CMSIS/Include/arm_const_structs.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/Include/arm_math.h b/demo/env/stm32f4xx/Libraries/CMSIS/Include/arm_math.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Include/arm_math.h rename to demo/env/stm32f4xx/Libraries/CMSIS/Include/arm_math.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/Include/core_cm0.h b/demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cm0.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Include/core_cm0.h rename to demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cm0.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/Include/core_cm0plus.h b/demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cm0plus.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Include/core_cm0plus.h rename to demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cm0plus.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/Include/core_cm3.h b/demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cm3.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Include/core_cm3.h rename to demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cm3.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/Include/core_cm4.h b/demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cm4.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Include/core_cm4.h rename to demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cm4.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/Include/core_cm7.h b/demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cm7.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Include/core_cm7.h rename to demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cm7.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/Include/core_cmFunc.h b/demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cmFunc.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Include/core_cmFunc.h rename to demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cmFunc.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/Include/core_cmInstr.h b/demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cmInstr.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Include/core_cmInstr.h rename to demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cmInstr.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/Include/core_cmSimd.h b/demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cmSimd.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Include/core_cmSimd.h rename to demo/env/stm32f4xx/Libraries/CMSIS/Include/core_cmSimd.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/Include/core_sc000.h b/demo/env/stm32f4xx/Libraries/CMSIS/Include/core_sc000.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Include/core_sc000.h rename to demo/env/stm32f4xx/Libraries/CMSIS/Include/core_sc000.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/Include/core_sc300.h b/demo/env/stm32f4xx/Libraries/CMSIS/Include/core_sc300.h similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/Include/core_sc300.h rename to demo/env/stm32f4xx/Libraries/CMSIS/Include/core_sc300.h diff --git a/demo/stm32f4xx/Libraries/CMSIS/README.txt b/demo/env/stm32f4xx/Libraries/CMSIS/README.txt similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/README.txt rename to demo/env/stm32f4xx/Libraries/CMSIS/README.txt diff --git a/demo/stm32f4xx/Libraries/CMSIS/index.html b/demo/env/stm32f4xx/Libraries/CMSIS/index.html similarity index 100% rename from demo/stm32f4xx/Libraries/CMSIS/index.html rename to demo/env/stm32f4xx/Libraries/CMSIS/index.html diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/Release_Notes.html b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/Release_Notes.html similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/Release_Notes.html rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/Release_Notes.html diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/misc.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/misc.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/misc.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/misc.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_adc.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_adc.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_adc.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_adc.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_can.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_can.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_can.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_can.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_cec.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_cec.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_cec.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_cec.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_crc.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_crc.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_crc.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_crc.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_cryp.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_cryp.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_cryp.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_cryp.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dac.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dac.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dac.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dac.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dbgmcu.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dbgmcu.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dbgmcu.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dbgmcu.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dcmi.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dcmi.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dcmi.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dcmi.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dma.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dma.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dma.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dma.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dma2d.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dma2d.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dma2d.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dma2d.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_exti.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_exti.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_exti.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_exti.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_flash.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_flash.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_flash.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_flash.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_flash_ramfunc.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_flash_ramfunc.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_flash_ramfunc.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_flash_ramfunc.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fmc.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fmc.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fmc.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fmc.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fmpi2c.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fmpi2c.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fmpi2c.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fmpi2c.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fsmc.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fsmc.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fsmc.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fsmc.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_gpio.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_gpio.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_gpio.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_gpio.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_hash.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_hash.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_hash.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_hash.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_i2c.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_i2c.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_i2c.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_i2c.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_iwdg.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_iwdg.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_iwdg.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_iwdg.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_ltdc.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_ltdc.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_ltdc.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_ltdc.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_pwr.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_pwr.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_pwr.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_pwr.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_qspi.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_qspi.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_qspi.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_qspi.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rcc.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rcc.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rcc.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rcc.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rng.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rng.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rng.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rng.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rtc.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rtc.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rtc.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rtc.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_sai.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_sai.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_sai.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_sai.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_sdio.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_sdio.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_sdio.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_sdio.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_spdifrx.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_spdifrx.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_spdifrx.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_spdifrx.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_spi.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_spi.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_spi.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_spi.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_syscfg.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_syscfg.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_syscfg.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_syscfg.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_tim.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_tim.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_tim.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_tim.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_usart.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_usart.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_usart.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_usart.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_wwdg.h b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_wwdg.h similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_wwdg.h rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_wwdg.h diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/misc.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/misc.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/misc.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/misc.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_adc.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_adc.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_adc.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_adc.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_can.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_can.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_can.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_can.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cec.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cec.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cec.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cec.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_crc.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_crc.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_crc.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_crc.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_aes.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_aes.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_aes.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_aes.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_des.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_des.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_des.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_des.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_tdes.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_tdes.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_tdes.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_tdes.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dac.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dac.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dac.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dac.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dbgmcu.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dbgmcu.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dbgmcu.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dbgmcu.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dcmi.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dcmi.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dcmi.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dcmi.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma2d.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma2d.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma2d.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma2d.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_exti.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_exti.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_exti.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_exti.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash_ramfunc.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash_ramfunc.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash_ramfunc.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash_ramfunc.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fmc.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fmc.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fmc.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fmc.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fmpi2c.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fmpi2c.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fmpi2c.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fmpi2c.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fsmc.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fsmc.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fsmc.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fsmc.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_gpio.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_gpio.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_gpio.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_gpio.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_md5.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_md5.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_md5.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_md5.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_sha1.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_sha1.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_sha1.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_sha1.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_i2c.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_i2c.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_i2c.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_i2c.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_iwdg.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_iwdg.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_iwdg.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_iwdg.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_ltdc.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_ltdc.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_ltdc.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_ltdc.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_pwr.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_pwr.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_pwr.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_pwr.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_qspi.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_qspi.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_qspi.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_qspi.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rcc.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rcc.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rcc.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rcc.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rng.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rng.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rng.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rng.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rtc.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rtc.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rtc.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rtc.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_sai.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_sai.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_sai.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_sai.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_sdio.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_sdio.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_sdio.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_sdio.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_spdifrx.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_spdifrx.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_spdifrx.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_spdifrx.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_spi.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_spi.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_spi.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_spi.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_syscfg.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_syscfg.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_syscfg.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_syscfg.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_tim.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_tim.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_tim.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_tim.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_usart.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_usart.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_usart.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_usart.c diff --git a/demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_wwdg.c b/demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_wwdg.c similarity index 100% rename from demo/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_wwdg.c rename to demo/env/stm32f4xx/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_wwdg.c diff --git a/demo/stm32f4xx/README.md b/demo/env/stm32f4xx/README.md similarity index 100% rename from demo/stm32f4xx/README.md rename to demo/env/stm32f4xx/README.md diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/AUTHORS b/demo/env/stm32f4xx/RT-Thread-1.2.2/AUTHORS similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/AUTHORS rename to demo/env/stm32f4xx/RT-Thread-1.2.2/AUTHORS diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/COPYING b/demo/env/stm32f4xx/RT-Thread-1.2.2/COPYING similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/COPYING rename to demo/env/stm32f4xx/RT-Thread-1.2.2/COPYING diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/SConscript b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/SConscript similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/SConscript rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/SConscript diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/SConscript b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/SConscript similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/SConscript rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/SConscript diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/alarm.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/alarm.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/alarm.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/alarm.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/i2c-bit-ops.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/i2c-bit-ops.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/i2c-bit-ops.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/i2c-bit-ops.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/i2c.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/i2c.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/i2c.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/i2c.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/i2c_dev.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/i2c_dev.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/i2c_dev.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/i2c_dev.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_card.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_card.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_card.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_card.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_cmd.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_cmd.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_cmd.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_cmd.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_core.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_core.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_core.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_core.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_host.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_host.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_host.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mmcsd_host.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nand.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nand.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nand.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nand.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nor.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nor.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nor.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/mtd_nor.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/rtc.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/rtc.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/rtc.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/rtc.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/sd.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/sd.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/sd.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/sd.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/sdio.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/sdio.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/sdio.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/sdio.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/sdio_func_ids.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/sdio_func_ids.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/sdio_func_ids.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/sdio_func_ids.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/serial.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/serial.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/serial.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/serial.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/spi.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/spi.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/spi.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/spi.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/usb_common.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/usb_common.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/usb_common.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/usb_common.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/usb_device.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/usb_device.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/usb_device.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/usb_device.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/usb_host.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/usb_host.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/usb_host.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/drivers/usb_host.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/rtdevice.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/rtdevice.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/rtdevice.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/include/rtdevice.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/serial/SConscript b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/serial/SConscript similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/serial/SConscript rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/serial/SConscript diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/serial/serial.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/serial/serial.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/serial/serial.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/serial/serial.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/SConscript b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/SConscript similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/SConscript rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/SConscript diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/completion.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/completion.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/completion.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/completion.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/dataqueue.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/dataqueue.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/dataqueue.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/dataqueue.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/pipe.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/pipe.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/pipe.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/pipe.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/portal.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/portal.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/portal.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/portal.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/ringbuffer.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/ringbuffer.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/ringbuffer.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/ringbuffer.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/wrokqueue.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/wrokqueue.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/wrokqueue.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/drivers/src/wrokqueue.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/SConscript b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/SConscript similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/SConscript rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/SConscript diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/cmd.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/cmd.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/cmd.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/cmd.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_compiler.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_compiler.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_compiler.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_compiler.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_error.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_error.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_error.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_error.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_error.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_error.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_error.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_error.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_heap.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_heap.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_heap.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_heap.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_heap.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_heap.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_heap.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_heap.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_init.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_init.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_init.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_init.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_node.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_node.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_node.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_node.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_node.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_node.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_node.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_node.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_ops.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_ops.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_ops.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_ops.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_ops.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_ops.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_ops.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_ops.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_parser.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_parser.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_parser.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_parser.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_parser.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_parser.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_parser.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_parser.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_token.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_token.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_token.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_token.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_token.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_token.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_token.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_token.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_var.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_var.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_var.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_var.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_var.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_var.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_var.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_var.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_vm.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_vm.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_vm.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_vm.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_vm.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_vm.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_vm.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/finsh_vm.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/msh.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/msh.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/msh.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/msh.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/msh.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/msh.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/msh.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/msh.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/msh_cmd.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/msh_cmd.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/msh_cmd.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/msh_cmd.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/shell.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/shell.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/shell.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/shell.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/shell.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/shell.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/shell.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/shell.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/symbol.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/symbol.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/components/finsh/symbol.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/components/finsh/symbol.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/include/cpuusage.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/include/cpuusage.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/include/cpuusage.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/include/cpuusage.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/include/rtdebug.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/include/rtdebug.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/include/rtdebug.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/include/rtdebug.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/include/rtdef.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/include/rtdef.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/include/rtdef.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/include/rtdef.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/include/rthw.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/include/rthw.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/include/rthw.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/include/rthw.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/include/rtm.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/include/rtm.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/include/rtm.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/include/rtm.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/include/rtservice.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/include/rtservice.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/include/rtservice.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/include/rtservice.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/include/rtthread.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/include/rtthread.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/include/rtthread.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/include/rtthread.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/libcpu/SConscript b/demo/env/stm32f4xx/RT-Thread-1.2.2/libcpu/SConscript similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/libcpu/SConscript rename to demo/env/stm32f4xx/RT-Thread-1.2.2/libcpu/SConscript diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/context_gcc.S b/demo/env/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/context_gcc.S similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/context_gcc.S rename to demo/env/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/context_gcc.S diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/context_iar.S b/demo/env/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/context_iar.S similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/context_iar.S rename to demo/env/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/context_iar.S diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/context_rvds.S b/demo/env/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/context_rvds.S similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/context_rvds.S rename to demo/env/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/context_rvds.S diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/cpuport.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/cpuport.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/cpuport.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/libcpu/arm/cortex-m4/cpuport.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/SConscript b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/SConscript similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/SConscript rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/SConscript diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/clock.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/clock.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/clock.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/clock.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/cpuusage.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/cpuusage.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/cpuusage.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/cpuusage.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/device.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/device.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/device.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/device.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/idle.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/idle.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/idle.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/idle.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/ipc.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/ipc.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/ipc.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/ipc.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/irq.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/irq.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/irq.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/irq.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/kservice.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/kservice.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/kservice.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/kservice.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/mem.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/mem.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/mem.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/mem.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/memheap.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/memheap.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/memheap.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/memheap.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/mempool.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/mempool.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/mempool.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/mempool.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/module.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/module.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/module.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/module.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/module.h b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/module.h similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/module.h rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/module.h diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/object.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/object.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/object.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/object.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/scheduler.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/scheduler.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/scheduler.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/scheduler.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/slab.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/slab.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/slab.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/slab.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/thread.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/thread.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/thread.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/thread.c diff --git a/demo/stm32f4xx/RT-Thread-1.2.2/src/timer.c b/demo/env/stm32f4xx/RT-Thread-1.2.2/src/timer.c similarity index 100% rename from demo/stm32f4xx/RT-Thread-1.2.2/src/timer.c rename to demo/env/stm32f4xx/RT-Thread-1.2.2/src/timer.c diff --git a/demo/stm32f4xx/RVMDK/.gitignore b/demo/env/stm32f4xx/RVMDK/.gitignore similarity index 100% rename from demo/stm32f4xx/RVMDK/.gitignore rename to demo/env/stm32f4xx/RVMDK/.gitignore diff --git a/demo/stm32f4xx/app/inc/app_task.h b/demo/env/stm32f4xx/app/inc/app_task.h similarity index 100% rename from demo/stm32f4xx/app/inc/app_task.h rename to demo/env/stm32f4xx/app/inc/app_task.h diff --git a/demo/stm32f4xx/app/inc/delay_conf.h b/demo/env/stm32f4xx/app/inc/delay_conf.h similarity index 100% rename from demo/stm32f4xx/app/inc/delay_conf.h rename to demo/env/stm32f4xx/app/inc/delay_conf.h diff --git a/demo/stm32f4xx/app/inc/rtconfig.h b/demo/env/stm32f4xx/app/inc/rtconfig.h similarity index 100% rename from demo/stm32f4xx/app/inc/rtconfig.h rename to demo/env/stm32f4xx/app/inc/rtconfig.h diff --git a/demo/stm32f4xx/app/inc/stm32f4xx_conf.h b/demo/env/stm32f4xx/app/inc/stm32f4xx_conf.h similarity index 100% rename from demo/stm32f4xx/app/inc/stm32f4xx_conf.h rename to demo/env/stm32f4xx/app/inc/stm32f4xx_conf.h diff --git a/demo/stm32f4xx/app/inc/stm32f4xx_it.h b/demo/env/stm32f4xx/app/inc/stm32f4xx_it.h similarity index 100% rename from demo/stm32f4xx/app/inc/stm32f4xx_it.h rename to demo/env/stm32f4xx/app/inc/stm32f4xx_it.h diff --git a/demo/stm32f4xx/app/src/app.c b/demo/env/stm32f4xx/app/src/app.c similarity index 100% rename from demo/stm32f4xx/app/src/app.c rename to demo/env/stm32f4xx/app/src/app.c diff --git a/demo/stm32f4xx/app/src/app_task.c b/demo/env/stm32f4xx/app/src/app_task.c similarity index 100% rename from demo/stm32f4xx/app/src/app_task.c rename to demo/env/stm32f4xx/app/src/app_task.c diff --git a/demo/stm32f4xx/app/src/stm32f4xx_it.c b/demo/env/stm32f4xx/app/src/stm32f4xx_it.c similarity index 100% rename from demo/stm32f4xx/app/src/stm32f4xx_it.c rename to demo/env/stm32f4xx/app/src/stm32f4xx_it.c diff --git a/demo/stm32f4xx/app/src/user_finsh_cmd.c b/demo/env/stm32f4xx/app/src/user_finsh_cmd.c similarity index 100% rename from demo/stm32f4xx/app/src/user_finsh_cmd.c rename to demo/env/stm32f4xx/app/src/user_finsh_cmd.c diff --git a/demo/stm32f4xx/components/easyflash/port/ef_port.c b/demo/env/stm32f4xx/components/easyflash/port/ef_port.c similarity index 100% rename from demo/stm32f4xx/components/easyflash/port/ef_port.c rename to demo/env/stm32f4xx/components/easyflash/port/ef_port.c diff --git a/demo/stm32f4xx/components/others/bsp.c b/demo/env/stm32f4xx/components/others/bsp.c similarity index 100% rename from demo/stm32f4xx/components/others/bsp.c rename to demo/env/stm32f4xx/components/others/bsp.c diff --git a/demo/stm32f4xx/components/others/bsp.h b/demo/env/stm32f4xx/components/others/bsp.h similarity index 100% rename from demo/stm32f4xx/components/others/bsp.h rename to demo/env/stm32f4xx/components/others/bsp.h diff --git a/demo/stm32f4xx/components/others/stm32f103xB.icf b/demo/env/stm32f4xx/components/others/stm32f103xB.icf similarity index 100% rename from demo/stm32f4xx/components/others/stm32f103xB.icf rename to demo/env/stm32f4xx/components/others/stm32f103xB.icf diff --git a/demo/stm32f4xx/components/others/stm32f103xE.icf b/demo/env/stm32f4xx/components/others/stm32f103xE.icf similarity index 100% rename from demo/stm32f4xx/components/others/stm32f103xE.icf rename to demo/env/stm32f4xx/components/others/stm32f103xE.icf diff --git a/demo/stm32f4xx/components/others/stm32f405xG.icf b/demo/env/stm32f4xx/components/others/stm32f405xG.icf similarity index 100% rename from demo/stm32f4xx/components/others/stm32f405xG.icf rename to demo/env/stm32f4xx/components/others/stm32f405xG.icf diff --git a/demo/stm32f4xx/components/others/types.h b/demo/env/stm32f4xx/components/others/types.h similarity index 100% rename from demo/stm32f4xx/components/others/types.h rename to demo/env/stm32f4xx/components/others/types.h diff --git a/demo/stm32f4xx/components/others/utils.c b/demo/env/stm32f4xx/components/others/utils.c similarity index 100% rename from demo/stm32f4xx/components/others/utils.c rename to demo/env/stm32f4xx/components/others/utils.c diff --git a/demo/stm32f4xx/components/others/utils.h b/demo/env/stm32f4xx/components/others/utils.h similarity index 100% rename from demo/stm32f4xx/components/others/utils.h rename to demo/env/stm32f4xx/components/others/utils.h diff --git a/demo/stm32f4xx/components/rtt_uart/usart.c b/demo/env/stm32f4xx/components/rtt_uart/usart.c similarity index 100% rename from demo/stm32f4xx/components/rtt_uart/usart.c rename to demo/env/stm32f4xx/components/rtt_uart/usart.c diff --git a/demo/stm32f4xx/components/rtt_uart/usart.h b/demo/env/stm32f4xx/components/rtt_uart/usart.h similarity index 100% rename from demo/stm32f4xx/components/rtt_uart/usart.h rename to demo/env/stm32f4xx/components/rtt_uart/usart.h diff --git a/demo/iap/README.md b/demo/iap/README.md new file mode 100644 index 0000000..d1cb760 --- /dev/null +++ b/demo/iap/README.md @@ -0,0 +1,7 @@ +# IAP Deno + +--- + +|File or folder name |Description| +|:----- |:----| +|ymodem+rtt.c |Using RT-Thread RTOS and it ymodem utils| diff --git a/demo/iap/ymodem+rtt.c b/demo/iap/ymodem+rtt.c new file mode 100644 index 0000000..17bb24d --- /dev/null +++ b/demo/iap/ymodem+rtt.c @@ -0,0 +1,123 @@ +/* + * This file is part of the EasyFlash Library. + * + * Copyright (c) 2014, Armink, + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * 'Software'), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Function: It's a demo for EasyFlash IAP fucnction. You must use RT-Thread to run this demo. + * Created on: 2015-07-06 + */ + + +/** + * IAP ²裺 + * 1RT-ThreadFinshն"update" + * 2Ymodem俪ʼʱͨymodem_on_beginصʹef_erase_bak_app洢Ӧã + * 3ʹef_write_data_to_bakյݱ浽FlashС̽YmodemݵĻصymodem_on_dataУ + * 4ɺ޸Ļ"iap_need_copy_app"ֵΪ1"change iap_copy_app_size"ֵΪAPPС滷 + * Ϊ˱֤ڸʱ´ϵȻԶָ£ + * 5ӦӦóڣ + * 6޸IJ滷"iap_need_copy_app""iap_copy_app_size"ֵΪ0 + * + * IAP update step: + * 1. Input "update" command in RT-Thread finsh terminal. + * 2. It will use ef_erase_bak_app to erase backup application section when ymodem_on_begin. + * 3. Save received data(ef_write_data_to_bak) to flash. + * This process is in Ymodem received data callback funciton ymodem_on_data. + * 4. After received finish. Change and save the Env "iap_need_copy_app to" 1 and "change iap_copy_app_size" to downloaded size. + * Make sure if update process case power-down, the update will auto resume on next reboot. + * 5. Erase and copy downloaded application to application entry. + * 6. Change and save the Env "iap_need_copy_app" and "iap_copy_app_size" to 0. + */ + +#include +#include +#include "finsh.h" +#include "ymodem.h" +#include "easyflash.h" +#include "stdlib.h" + +static uint32_t update_file_total_size, update_file_cur_size; +static enum rym_code ymodem_on_begin(struct rym_ctx *ctx, rt_uint8_t *buf, rt_size_t len) { + char *file_name, *file_size; + + /* calculate and store file size */ + file_name = (char *) &buf[0]; + file_size = (char *) &buf[rt_strlen(file_name) + 1]; + update_file_total_size = atol(file_size); + update_file_cur_size = 0; + + /* erase backup section */ + if (ef_erase_bak_app(update_file_total_size)) { + /* if erase fail then end session */ + return RYM_CODE_CAN; + } + + return RYM_CODE_ACK; +} + +static enum rym_code ymodem_on_data(struct rym_ctx *ctx, rt_uint8_t *buf, rt_size_t len) { + /* write data of application to backup section */ + if (ef_write_data_to_bak(buf, len, &update_file_cur_size, update_file_total_size)) { + /* if write fail then end session */ + return RYM_CODE_CAN; + } + return RYM_CODE_ACK; +} + +/** + * update command for RT-Thread finsh-msh command. + */ +void update(uint8_t argc, char **argv) { + uint16_t size; + char *recv_buff, c_file_size[11] = {0}; + struct rym_ctx rctx; + + rt_kprintf("Please select a update file and use Ymodem to send.\r\n"); + + if (!rym_recv_on_device(&rctx, serial_get_device(), + RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_INT_RX, ymodem_on_begin, ymodem_on_data, NULL, + RT_TICK_PER_SECOND)) { + /* wait some time for terminal response finish */ + rt_thread_delay(RT_TICK_PER_SECOND); + /* set need copy application from backup section flag is 1, backup application length */ + ef_set_env("iap_need_copy_app", "1"); + rt_sprintf(c_file_size, "%ld", update_file_total_size); + ef_set_env("iap_copy_app_size", c_file_size); + ef_save_env(); + /* copy downloaded application to application entry */ + if (ef_erase_user_app(iap_get_app_addr(), update_file_total_size) + || ef_copy_app_from_bak(iap_get_app_addr(), update_file_total_size)) { + rt_kprintf("Update user app fail.\n"); + } else { + rt_kprintf("Update user app success.\n"); + } + /* clean need copy application from backup section flag */ + ef_set_env("iap_need_copy_app", "0"); + ef_set_env("iap_copy_app_size", "0"); + ef_save_env(); + } else { + /* wait some time for terminal response finish */ + rt_thread_delay(RT_TICK_PER_SECOND); + rt_kprintf("Update user app fail.\n"); + } +} +MSH_CMD_EXPORT(update, Update user application); diff --git a/demo/log/README.md b/demo/log/README.md new file mode 100644 index 0000000..0989881 --- /dev/null +++ b/demo/log/README.md @@ -0,0 +1,7 @@ +# Log Deno + +--- + +|File or folder name |Description| +|:----- |:----| +|easyLogger.c |Using EasyLogger lib function| diff --git a/demo/log/easylogger.c b/demo/log/easylogger.c new file mode 100644 index 0000000..19a4579 --- /dev/null +++ b/demo/log/easylogger.c @@ -0,0 +1,90 @@ +/* + * This file is part of the EasyFlash Library. + * + * Copyright (c) 2014, Armink, + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * 'Software'), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Function: It's a demo for EasyFlash Log fucnction. You must use EasyLogger(https://github.com/armink/EasyLogger). + * Created on: 2015-07-06 + */ + +#include "elog_flash.h" + +#define log_a(...) elog_a("main.test.a", __VA_ARGS__) +#define log_e(...) elog_e("main.test.e", __VA_ARGS__) +#define log_w(...) elog_w("main.test.w", __VA_ARGS__) +#define log_i(...) elog_i("main.test.i", __VA_ARGS__) +#define log_d(...) elog_d("main.test.d", __VA_ARGS__) +#define log_v(...) elog_v("main.test.v", __VA_ARGS__) + +static void test_elog(void); +static void elog_user_assert_hook(const char* ex, const char* func, size_t line); + +int main(void){ + + /* initialize EasyFlash and EasyLogger */ + if ((easyflash_init() == EF_NO_ERR)&&(elog_init() == ELOG_NO_ERR)) { + /* set EasyLogger log format */ + elog_set_fmt( ELOG_FMT_LVL | ELOG_FMT_TAG | ELOG_FMT_TIME /*| ELOG_FMT_P_INFO*/ | ELOG_FMT_T_INFO + | ELOG_FMT_DIR /*| ELOG_FMT_FUNC*/| ELOG_FMT_LINE); + elog_set_filter_lvl(ELOG_LVL_VERBOSE); + /* initialize EasyLogger Flash plugin */ + elog_flash_init(); + /* start EasyLogger */ + elog_start(); + /* set EasyLogger assert hook */ + elog_assert_set_hook(elog_user_assert_hook); + /* test logger output */ + test_elog(); + } + + return 0; +} + +/** + * Elog demo + */ +static void test_elog(void) { + /* output all saved log on flash */ + elog_flash_outout_all(); + /* test log output for all level */ + log_a("Hello EasyLogger!"); + log_e("Hello EasyLogger!"); + log_w("Hello EasyLogger!"); + log_i("Hello EasyLogger!"); + log_d("Hello EasyLogger!"); + log_v("Hello EasyLogger!"); + elog_raw("Hello EasyLogger!"); + /* trigger assert. Now will run elog_user_assert_hook. All log information will save to flash. */ + ELOG_ASSERT(0); +} + +static void elog_user_assert_hook(const char* ex, const char* func, size_t line) { + /* disable logger output lock */ + elog_output_lock_enabled(false); + /* disable flash plugin lock */ + elog_flash_lock_enabled(false); + /* output assert information */ + elog_a("elog", "(%s) has assert failed at %s:%ld.\n", ex, func, line); + /* write all buffered log to flash */ + elog_flash_flush(); + while(1); +}