diff --git a/.gitignore b/.gitignore index b310fa1..97339aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1,7 @@ /.vs -/.vs/slnx.sqlite -/.vs/tasks.vs.json -/.vs/test/v16/.suo -/.vs/test/v16/Browse.VC.db -/.vs/test/v16/Browse.VC.db-shm -/.vs/test/v16/Browse.VC.db-wal -/.vs/test/v16/Browse.VC.opendb -/.vs/test/v16/ipch/AutoPCH/291705294dd594cc/MAIN.ipch -/.vs/test/v16/ipch/AutoPCH/3854b8d8fc67ea4/STM32F4XX_HAL.ipch -/.vs/test/v16/ipch/AutoPCH/3cb8fc0ec124017c/STM32F407XX_MATLAB.ipch -/.vs/test/v16/ipch/AutoPCH/5fbc2639f7ec2c10/STM32F407XX_MATLAB.ipch -/.vs/test/v16/ipch/AutoPCH/c31768203856fa04/STM32F407XX_MATLAB.ipch -/.vs/test/v16/ipch/AutoPCH/f64e8f1797b0f4bf/SETJMP.ipch -/.vs/test/v16/.suo -/.vs/test/v16/Browse.VC.db -/.vs/slnx.sqlite -/.vs/test/v16/.suo -/.vs/VSWorkspaceState.json -/Code/.vs/Code/v16/.suo -/Code/.vs/Code/v16/Browse.VC.db -/Code/.vs/ProjectSettings.json -/Code/.vs/slnx.sqlite -/Code/.vs/VSWorkspaceState.json -/mcu_test_r2021a.slxc -/MCU.mexw64 -/MCU.mexw64.pdb -/slprj/sim/varcache/mcu_test_r2021a/checksumOfCache.mat -/slprj/sim/varcache/mcu_test_r2021a/tmwinternal/simulink_cache.xml -/slprj/sim/varcache/mcu_test_r2021a/varInfo.mat +/slprj +/Code/.vs/ + +*.slxc +*.mexw64 +*.mexw64.pdb diff --git a/.outdate/MCU_Wrapper/MCU.c b/.outdate/MCU_Wrapper/MCU.c index 0f8a373..711ac4d 100644 --- a/.outdate/MCU_Wrapper/MCU.c +++ b/.outdate/MCU_Wrapper/MCU.c @@ -158,10 +158,10 @@ static void mdlTerminate(SimStruct *S) { //TerminateThread(hThread, NULL); //CloseHandle(hThread); - flag_to_end = 1; // выставляем флаг закончить код МК - ResumeThread(hThread); // запускаем код мк - WaitForSingleObject(hThread, 1000); // и ждем пока он закончиться - SIM_deInitialize_Simulation(); // деинициализируем симуляцию + flag_to_end = 1; + ResumeThread(hThread); + WaitForSingleObject(hThread, 1000); + SIM_deInitialize_Simulation(); mexUnlock(); } #ifdef MATLAB_MEX_FILE /* Is this file being compiled as a diff --git a/.outdate/MCU_Wrapper/controller.h b/.outdate/MCU_Wrapper/controller.h index 8536298..c735835 100644 --- a/.outdate/MCU_Wrapper/controller.h +++ b/.outdate/MCU_Wrapper/controller.h @@ -117,10 +117,11 @@ extern double SIM_Sample_Time; // sample time /** * @brief While statement for emulate MCU code in Simulink. * @param _expression_ - expression for while. - * @note while, , (flag_to_end) - * . .. . - ( 1) while - * + * @note while, , (_expression_ != 0) + * ( - ). + * . , + * . + * while, . * * @code @ref sim_while_CODE_ to see for replace while sim_while (for debug). */ diff --git a/mcu_test.slx.r2021b b/.outdate/mcu_test.slx.r2021b similarity index 100% rename from mcu_test.slx.r2021b rename to .outdate/mcu_test.slx.r2021b diff --git a/mcu_test_r2021a.slx.r2021a b/.outdate/mcu_test_r2021a.slx.r2021a similarity index 100% rename from mcu_test_r2021a.slx.r2021a rename to .outdate/mcu_test_r2021a.slx.r2021a diff --git a/mcu_test.slx b/.outdate/mcu_test_r2023a.slx similarity index 100% rename from mcu_test.slx rename to .outdate/mcu_test_r2023a.slx diff --git a/Core/Inc/ClockPackTransf.h b/.outdate/stm32f1xx test/Core/Inc/ClockPackTransf.h similarity index 100% rename from Core/Inc/ClockPackTransf.h rename to .outdate/stm32f1xx test/Core/Inc/ClockPackTransf.h diff --git a/Core/Inc/main.h b/.outdate/stm32f1xx test/Core/Inc/main.h similarity index 100% rename from Core/Inc/main.h rename to .outdate/stm32f1xx test/Core/Inc/main.h diff --git a/Core/Inc/stm32f1xx_hal_conf.h b/.outdate/stm32f1xx test/Core/Inc/stm32f1xx_hal_conf.h similarity index 100% rename from Core/Inc/stm32f1xx_hal_conf.h rename to .outdate/stm32f1xx test/Core/Inc/stm32f1xx_hal_conf.h diff --git a/Core/Inc/stm32f1xx_it.h b/.outdate/stm32f1xx test/Core/Inc/stm32f1xx_it.h similarity index 100% rename from Core/Inc/stm32f1xx_it.h rename to .outdate/stm32f1xx test/Core/Inc/stm32f1xx_it.h diff --git a/Core/Src/ClockPackTransf.c b/.outdate/stm32f1xx test/Core/Src/ClockPackTransf.c similarity index 100% rename from Core/Src/ClockPackTransf.c rename to .outdate/stm32f1xx test/Core/Src/ClockPackTransf.c diff --git a/Core/Src/main.c b/.outdate/stm32f1xx test/Core/Src/main.c similarity index 100% rename from Core/Src/main.c rename to .outdate/stm32f1xx test/Core/Src/main.c diff --git a/Core/Src/stm32f1xx_hal_msp.c b/.outdate/stm32f1xx test/Core/Src/stm32f1xx_hal_msp.c similarity index 100% rename from Core/Src/stm32f1xx_hal_msp.c rename to .outdate/stm32f1xx test/Core/Src/stm32f1xx_hal_msp.c diff --git a/Core/Src/stm32f1xx_it.c b/.outdate/stm32f1xx test/Core/Src/stm32f1xx_it.c similarity index 100% rename from Core/Src/stm32f1xx_it.c rename to .outdate/stm32f1xx test/Core/Src/stm32f1xx_it.c diff --git a/Core/Src/system_stm32f1xx.c b/.outdate/stm32f1xx test/Core/Src/system_stm32f1xx.c similarity index 100% rename from Core/Src/system_stm32f1xx.c rename to .outdate/stm32f1xx test/Core/Src/system_stm32f1xx.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f100xb_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f100xb_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f100xb_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f100xb_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f100xe_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f100xe_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f100xe_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f100xe_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101x6_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101x6_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101x6_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101x6_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101xb_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101xb_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101xb_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101xb_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101xe_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101xe_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101xe_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101xe_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101xg_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101xg_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101xg_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f101xg_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f102x6_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f102x6_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f102x6_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f102x6_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f102xb_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f102xb_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f102xb_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f102xb_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103x6_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103x6_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103x6_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103x6_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103xb_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103xb_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103xb_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103xb_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103xe_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103xe_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103xe_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103xe_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103xg_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103xg_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103xg_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f103xg_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f105xc_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f105xc_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f105xc_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f105xc_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f107xc_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f107xc_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f107xc_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f107xc_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f1xx.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f1xx.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f1xx.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/stm32f1xx.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/system_stm32f1xx.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/system_stm32f1xx.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/system_stm32f1xx.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/Device/STM32F1xx/system_stm32f1xx.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/arm_defines.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/arm_defines.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/arm_defines.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/arm_defines.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/core_cm1_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/core_cm1_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/core_cm1_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/core_cm1_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/core_cm3_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/core_cm3_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/core_cm3_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/core_cm3_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/core_cm4_matlab.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/core_cm4_matlab.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/core_cm4_matlab.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/core_cm4_matlab.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/CMSIS/stdint.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/stdint.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/CMSIS/stdint.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/CMSIS/stdint.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32f1xx_hal_can_ex_legacy.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32f1xx_hal_can_ex_legacy.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32f1xx_hal_can_ex_legacy.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32f1xx_hal_can_ex_legacy.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32f1xx_hal_can_legacy.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32f1xx_hal_can_legacy.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32f1xx_hal_can_legacy.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32f1xx_hal_can_legacy.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32_assert_template.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32_assert_template.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32_assert_template.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32_assert_template.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_can.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_can.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_can.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_can.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cec.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cec.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cec.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cec.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_conf_template.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_conf_template.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_conf_template.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_conf_template.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_crc.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_crc.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_crc.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_crc.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac_ex.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac_ex.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac_ex.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac_ex.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_eth.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_eth.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_eth.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_eth.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_hcd.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_hcd.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_hcd.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_hcd.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2s.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2s.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2s.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2s.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_irda.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_irda.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_irda.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_irda.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_mmc.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_mmc.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_mmc.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_mmc.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_nand.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_nand.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_nand.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_nand.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_nor.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_nor.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_nor.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_nor.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pccard.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pccard.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pccard.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pccard.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd_ex.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd_ex.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd_ex.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd_ex.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc_ex.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc_ex.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc_ex.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc_ex.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_sd.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_sd.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_sd.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_sd.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_smartcard.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_smartcard.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_smartcard.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_smartcard.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_sram.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_sram.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_sram.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_sram.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_usart.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_usart.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_usart.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_usart.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_wwdg.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_wwdg.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_wwdg.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_wwdg.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_adc.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_adc.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_adc.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_adc.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_bus.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_bus.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_bus.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_bus.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_cortex.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_cortex.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_cortex.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_cortex.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_crc.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_crc.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_crc.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_crc.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dac.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dac.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dac.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dac.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dma.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dma.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dma.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dma.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_exti.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_exti.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_exti.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_exti.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_fsmc.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_fsmc.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_fsmc.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_fsmc.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_gpio.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_gpio.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_gpio.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_gpio.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_i2c.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_i2c.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_i2c.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_i2c.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_iwdg.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_iwdg.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_iwdg.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_iwdg.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_pwr.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_pwr.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_pwr.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_pwr.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rcc.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rcc.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rcc.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rcc.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rtc.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rtc.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rtc.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rtc.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_sdmmc.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_sdmmc.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_sdmmc.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_sdmmc.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_spi.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_spi.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_spi.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_spi.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_system.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_system.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_system.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_system.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_tim.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_tim.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_tim.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_tim.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usart.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usart.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usart.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usart.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usb.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usb.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usb.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usb.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_utils.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_utils.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_utils.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_utils.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_wwdg.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_wwdg.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_wwdg.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_wwdg.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cec.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cec.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cec.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cec.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_crc.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_crc.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_crc.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_crc.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac_ex.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac_ex.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac_ex.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac_ex.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_eth.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_eth.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_eth.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_eth.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_hcd.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_hcd.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_hcd.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_hcd.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2s.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2s.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2s.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2s.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_irda.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_irda.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_irda.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_irda.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_mmc.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_mmc.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_mmc.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_mmc.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_msp_template.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_msp_template.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_msp_template.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_msp_template.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nand.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nand.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nand.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nand.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nor.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nor.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nor.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nor.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pccard.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pccard.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pccard.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pccard.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sd.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sd.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sd.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sd.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_smartcard.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_smartcard.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_smartcard.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_smartcard.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sram.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sram.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sram.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sram.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_timebase_rtc_alarm_template.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_timebase_rtc_alarm_template.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_timebase_rtc_alarm_template.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_timebase_rtc_alarm_template.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_timebase_tim_template.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_timebase_tim_template.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_timebase_tim_template.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_timebase_tim_template.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_usart.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_usart.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_usart.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_usart.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_wwdg.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_wwdg.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_wwdg.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_wwdg.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_adc.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_adc.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_adc.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_adc.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_crc.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_crc.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_crc.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_crc.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_dac.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_dac.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_dac.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_dac.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_dma.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_dma.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_dma.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_dma.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_exti.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_exti.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_exti.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_exti.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_fsmc.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_fsmc.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_fsmc.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_fsmc.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_gpio.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_gpio.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_gpio.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_gpio.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_i2c.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_i2c.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_i2c.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_i2c.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_pwr.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_pwr.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_pwr.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_pwr.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_rcc.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_rcc.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_rcc.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_rcc.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_rtc.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_rtc.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_rtc.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_rtc.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_sdmmc.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_sdmmc.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_sdmmc.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_sdmmc.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_spi.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_spi.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_spi.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_spi.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_tim.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_tim.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_tim.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_tim.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usart.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usart.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usart.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usart.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_utils.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_utils.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_utils.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_utils.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_gpio.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_gpio.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_gpio.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_gpio.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_gpio.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_gpio.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_gpio.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_gpio.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_rcc.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_rcc.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_rcc.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_rcc.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_rcc.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_rcc.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_rcc.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_rcc.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_tim.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_tim.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_tim.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_tim.c diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_tim.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_tim.h similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_tim.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_tim.h diff --git a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_periph_registers.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_periph_registers.c similarity index 100% rename from MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_periph_registers.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_periph_registers.c diff --git a/MCU_STM32F1xx_Matlab/stm32_defs.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/stm32_defs.h similarity index 100% rename from MCU_STM32F1xx_Matlab/stm32_defs.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/stm32_defs.h diff --git a/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.c b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.c similarity index 100% rename from MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.c rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.c diff --git a/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.h b/.outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.h similarity index 100% rename from MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.h rename to .outdate/stm32f1xx test/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.h diff --git a/Core.stm32f4xx/Inc/gpio.h b/.outdate/stm32f4xx test/Core.stm32f4xx2/Inc/gpio.h similarity index 100% rename from Core.stm32f4xx/Inc/gpio.h rename to .outdate/stm32f4xx test/Core.stm32f4xx2/Inc/gpio.h diff --git a/Core.stm32f4xx/Inc/main.h b/.outdate/stm32f4xx test/Core.stm32f4xx2/Inc/main.h similarity index 100% rename from Core.stm32f4xx/Inc/main.h rename to .outdate/stm32f4xx test/Core.stm32f4xx2/Inc/main.h diff --git a/Core.stm32f4xx/Inc/proj_setup.h b/.outdate/stm32f4xx test/Core.stm32f4xx2/Inc/proj_setup.h similarity index 100% rename from Core.stm32f4xx/Inc/proj_setup.h rename to .outdate/stm32f4xx test/Core.stm32f4xx2/Inc/proj_setup.h diff --git a/Core.stm32f4xx/Inc/stm32f4xx_hal_conf.h b/.outdate/stm32f4xx test/Core.stm32f4xx2/Inc/stm32f4xx_hal_conf.h similarity index 100% rename from Core.stm32f4xx/Inc/stm32f4xx_hal_conf.h rename to .outdate/stm32f4xx test/Core.stm32f4xx2/Inc/stm32f4xx_hal_conf.h diff --git a/Core.stm32f4xx/Inc/stm32f4xx_it.h b/.outdate/stm32f4xx test/Core.stm32f4xx2/Inc/stm32f4xx_it.h similarity index 100% rename from Core.stm32f4xx/Inc/stm32f4xx_it.h rename to .outdate/stm32f4xx test/Core.stm32f4xx2/Inc/stm32f4xx_it.h diff --git a/Core.stm32f4xx/Inc/tim.h b/.outdate/stm32f4xx test/Core.stm32f4xx2/Inc/tim.h similarity index 100% rename from Core.stm32f4xx/Inc/tim.h rename to .outdate/stm32f4xx test/Core.stm32f4xx2/Inc/tim.h diff --git a/Core.stm32f4xx/Src/gpio.c b/.outdate/stm32f4xx test/Core.stm32f4xx2/Src/gpio.c similarity index 100% rename from Core.stm32f4xx/Src/gpio.c rename to .outdate/stm32f4xx test/Core.stm32f4xx2/Src/gpio.c diff --git a/Core.stm32f4xx/Src/main.c b/.outdate/stm32f4xx test/Core.stm32f4xx2/Src/main.c similarity index 100% rename from Core.stm32f4xx/Src/main.c rename to .outdate/stm32f4xx test/Core.stm32f4xx2/Src/main.c diff --git a/Core.stm32f4xx/Src/stm32f4xx_hal_msp.c b/.outdate/stm32f4xx test/Core.stm32f4xx2/Src/stm32f4xx_hal_msp.c similarity index 100% rename from Core.stm32f4xx/Src/stm32f4xx_hal_msp.c rename to .outdate/stm32f4xx test/Core.stm32f4xx2/Src/stm32f4xx_hal_msp.c diff --git a/Core.stm32f4xx/Src/stm32f4xx_it.c b/.outdate/stm32f4xx test/Core.stm32f4xx2/Src/stm32f4xx_it.c similarity index 100% rename from Core.stm32f4xx/Src/stm32f4xx_it.c rename to .outdate/stm32f4xx test/Core.stm32f4xx2/Src/stm32f4xx_it.c diff --git a/Core.stm32f4xx/Src/system_stm32f4xx.c b/.outdate/stm32f4xx test/Core.stm32f4xx2/Src/system_stm32f4xx.c similarity index 100% rename from Core.stm32f4xx/Src/system_stm32f4xx.c rename to .outdate/stm32f4xx test/Core.stm32f4xx2/Src/system_stm32f4xx.c diff --git a/Core.stm32f4xx/Src/tim.c b/.outdate/stm32f4xx test/Core.stm32f4xx2/Src/tim.c similarity index 100% rename from Core.stm32f4xx/Src/tim.c rename to .outdate/stm32f4xx test/Core.stm32f4xx2/Src/tim.c diff --git a/Code/Core/Src/main.c b/Code/Core/Src/main.c index 129e9c9..eafa273 100644 --- a/Code/Core/Src/main.c +++ b/Code/Core/Src/main.c @@ -153,6 +153,7 @@ int main(void) log_ctrl[R_LOG_CTRL_LOG_SIZE] = 50; log_ctrl[R_LOG_CTRL_LOG_PWM_NUMB] = 3; + WriteSettingsToMem(); MODBUS_FirstInit(); Control_Timer_FirstInit(); PWM_Sine_FirstInit(); diff --git a/Code/Modbus/modbus.c b/Code/Modbus/modbus.c index d54318c..951b0b1 100644 --- a/Code/Modbus/modbus.c +++ b/Code/Modbus/modbus.c @@ -45,9 +45,9 @@ modbus1_suart.huart = &modbus1_huart; modbus1_suart.huart->Instance = USED_MODBUS_UART; modbus1_suart.huart->Init.BaudRate = 38400; - modbus1_suart.GPIOx = MB_GPIOX; - modbus1_suart.GPIO_PIN_RX = MB_GPIO_PIN_RX; - modbus1_suart.GPIO_PIN_TX = MB_GPIO_PIN_TX; + modbus1_suart.GPIOx = MODBUS_GPIOX; + modbus1_suart.GPIO_PIN_RX = MODBUS_GPIO_PIN_RX; + modbus1_suart.GPIO_PIN_TX = MODBUS_GPIO_PIN_TX; // set up timeout TIM for modbus modbus1_stim.htim = &modbus1_htim; @@ -99,21 +99,21 @@ void MODBUS_FirstInit(void) //-----------SETUP MODBUS------------- // set up UART for modbus modbus1_suart.huart.Instance = USED_MODBUS_UART; - modbus1_suart.huart.Init.BaudRate = MB_SPEED; - modbus1_suart.GPIOx = MB_GPIOX; - modbus1_suart.GPIO_PIN_RX = MB_GPIO_PIN_RX; - modbus1_suart.GPIO_PIN_TX = MB_GPIO_PIN_TX; + modbus1_suart.huart.Init.BaudRate = PROJSET.MB_SPEED; + modbus1_suart.GPIOx = (GPIO_TypeDef *)PROJSET.MB_GPIOX; + modbus1_suart.GPIO_PIN_RX = PROJSET.MB_GPIO_PIN_RX; + modbus1_suart.GPIO_PIN_TX = PROJSET.MB_GPIO_PIN_TX; // set up timeout TIM for modbus modbus1_stim.htim.Instance = USED_MODBUS_TIM; - modbus1_stim.sTimAHBFreqMHz = MB_TIM_AHB_FREQ; + modbus1_stim.sTimAHBFreqMHz = PROJSET.MB_TIM_AHB_FREQ; modbus1_stim.sTimMode = TIM_IT_CONF; // set up modbus: MB_RX_Size_NotConst and Timeout enable - hmodbus1.ID = MB_ID; - hmodbus1.sRS_RX_Size_Mode = RS_RX_Size_NotConst; - hmodbus1.sRS_Timeout = MB_MAX_TIMEOUT; + hmodbus1.ID = PROJSET.MB_DEVICE_ID; + hmodbus1.sRS_Timeout = PROJSET.MB_MAX_TIMEOUT; hmodbus1.sRS_Mode = SLAVE_ALWAYS_WAIT; + hmodbus1.sRS_RX_Size_Mode = RS_RX_Size_NotConst; // INIT hmodbus1.RS_STATUS = RS_Init(&hmodbus1, &modbus1_suart, &modbus1_stim, 0); @@ -811,17 +811,17 @@ RS_StatusTypeDef RS_Define_Size_of_RX_Message(RS_HandleTypeDef *hmodbus, uint32_ //------------------------------------------------------------------- //-------------------------HANDLERS FUNCTION------------------------- -#if (MB_UART_NUMB == 1) // choose handler for UART +#if (MODBUS_UART_NUMB == 1) // choose handler for UART void USART1_IRQHandler(void) -#elif (MB_UART_NUMB == 2) +#elif (MODBUS_UART_NUMB == 2) void USART2_IRQHandler(void) -#elif (MB_UART_NUMB == 3) +#elif (MODBUS_UART_NUMB == 3) void USART3_IRQHandler(void) -#elif (MB_UART_NUMB == 4) +#elif (MODBUS_UART_NUMB == 4) void USART4_IRQHandler(void) -#elif (MB_UART_NUMB == 5) +#elif (MODBUS_UART_NUMB == 5) void USART5_IRQHandler(void) -#elif (MB_UART_NUMB == 6) +#elif (MODBUS_UART_NUMB == 6) void USART6_IRQHandler(void) #endif { @@ -829,29 +829,29 @@ void USART6_IRQHandler(void) RS_UART_Handler(&hmodbus1); Trace_MB_UART_Exit(); } -#if (MB_TIM_NUMB == 1) || (MB_TIM_NUMB == 10) // choose handler for TIM +#if (MODBUS_TIM_NUMB == 1) || (MODBUS_TIM_NUMB == 10) // choose handler for TIM void TIM1_UP_TIM10_IRQHandler(void) -#elif (MB_TIM_NUMB == 2) +#elif (MODBUS_TIM_NUMB == 2) void TIM2_IRQHandler(void) -#elif (MB_TIM_NUMB == 3) +#elif (MODBUS_TIM_NUMB == 3) void TIM3_IRQHandler(void) -#elif (MB_TIM_NUMB == 4) +#elif (MODBUS_TIM_NUMB == 4) void TIM4_IRQHandler(void) -#elif (MB_TIM_NUMB == 5) +#elif (MODBUS_TIM_NUMB == 5) void TIM5_IRQHandler(void) -#elif (MB_TIM_NUMB == 6) +#elif (MODBUS_TIM_NUMB == 6) void TIM6_DAC_IRQHandler(void) -#elif (MB_TIM_NUMB == 7) +#elif (MODBUS_TIM_NUMB == 7) void TIM7_IRQHandler(void) -#elif (MB_TIM_NUMB == 8) || (MB_TIM_NUMB == 13) +#elif (MODBUS_TIM_NUMB == 8) || (MODBUS_TIM_NUMB == 13) void TIM8_UP_TIM13_IRQHandler(void) -#elif (MB_TIM_NUMB == 1) || (MB_TIM_NUMB == 9) +#elif (MODBUS_TIM_NUMB == 1) || (MODBUS_TIM_NUMB == 9) void TIM1_BRK_TIM9_IRQHandler(void) -#elif (MB_TIM_NUMB == 1) || (MB_TIM_NUMB == 11) +#elif (MODBUS_TIM_NUMB == 1) || (MODBUS_TIM_NUMB == 11) void TIM1_TRG_COM_TIM11_IRQHandler(void) -#elif (MB_TIM_NUMB == 8) || (MB_TIM_NUMB == 12) +#elif (MODBUS_TIM_NUMB == 8) || (MODBUS_TIM_NUMB == 12) void TIM8_BRK_TIM12_IRQHandler(void) -#elif (MB_TIM_NUMB == 8) || (MB_TIM_NUMB == 14) +#elif (MODBUS_TIM_NUMB == 8) || (MODBUS_TIM_NUMB == 14) void TIM8_TRG_COM_TIM14_IRQHandler(void) #endif { diff --git a/Code/Modbus/modbus.h b/Code/Modbus/modbus.h index cafed7d..0479966 100644 --- a/Code/Modbus/modbus.h +++ b/Code/Modbus/modbus.h @@ -9,32 +9,29 @@ MODBUS. #include "stm32f4xx_hal.h" #include "modbus_data.h" +#include "settings.h" // for modbus settings ///////////////////////////////////////////////////////////////////// //////////////////////////---SETTINGS---///////////////////////////// -//----------DEFINES FOR MODBUS SETTING-------------- -#define MB_UART_NUMB 3 // number of used uart -#define MB_SPEED 115200 -#define MB_GPIOX GPIOB -#define MB_GPIO_PIN_RX GPIO_PIN_11 -#define MB_GPIO_PIN_TX GPIO_PIN_10 -/* accord to this define sets define USED_MB_UART = USARTx */ -#define MB_TIM_NUMB 7 // number of used uart -#define MB_TIM_AHB_FREQ 72 -/* accord to this define sets define USED_MB_TIM = TIMx */ +////----------DEFINES FOR MODBUS SETTING-------------- +//#define MODBUS_UART_NUMB 3 // number of used uart +//#define MODBUS_SPEED 115200 +//#define MODBUS_GPIOX GPIOB +//#define MODBUS_GPIO_PIN_RX GPIO_PIN_11 +//#define MODBUS_GPIO_PIN_TX GPIO_PIN_10 +///* accord to this define sets define USED_MB_UART = USARTx */ +//#define MODBUS_TIM_NUMB 7 // number of used uart +//#define MODBUS_TIM_AHB_FREQ 72 +///* accord to this define sets define USED_MB_TIM = TIMx */ -/* defines for modbus behaviour */ -#define MB_ID 1 // number of used uart -#define MB_MAX_TIMEOUT 5000 // is ms -// custom define for size of receive message -//-------------------------------------------------- +///* defines for modbus behaviour */ +//#define MODBUS_DEVICE_ID 1 // number of used uart +//#define MODBUS_MAX_TIMEOUT 5000 // is ms +//// custom define for size of receive message +////-------------------------------------------------- //---------------MODBUS DEVICE DATA----------------- - - - /* EXTERN REGISTERS/COILS */ - extern uint16_t sine_log[R_SINE_LOG_QNT]; // start from 0x0000 extern uint16_t pwm_log[R_PWM_LOG_QNT]; // start from 500 (0x1F4) extern uint16_t cnt_log[R_CNT_LOG_QNT]; // start from 100 (0x3E8) @@ -136,7 +133,7 @@ typedef enum }MB_CoilsOpTypeDef; //------------DEFINES FOR PROCESS DATA-------------- -/**S +/** * @brief Calc dividing including remainder * @param _val_ - делимое. * @param _div_ - делитель. @@ -353,66 +350,66 @@ uint8_t MB_Write_Miltuple_Regs(RS_MsgTypeDef *modbus_msg); /////////////////////////---CALC DEFINES---////////////////////////// /* set USART_TypeDef for choosen numb of usart */ -#if (MB_UART_NUMB == 1) +#if (MODBUS_UART_NUMB == 1) #define USED_MODBUS_UART USART1 #define USE_USART1 -#elif (MB_UART_NUMB == 2) +#elif (MODBUS_UART_NUMB == 2) #define USED_MODBUS_UART USART2 #define USE_USART2 -#elif (MB_UART_NUMB == 3) +#elif (MODBUS_UART_NUMB == 3) #define USED_MODBUS_UART USART3 #define USE_USART3 -#elif (MB_UART_NUMB == 4) +#elif (MODBUS_UART_NUMB == 4) #define USED_MODBUS_UART UART4 #define USE_UART4 -#elif (MB_UART_NUMB == 5) +#elif (MODBUS_UART_NUMB == 5) #define USED_MODBUS_UART UART5 #define USE_UART6 -#elif (MB_UART_NUMB == 6) +#elif (MODBUS_UART_NUMB == 6) #define USED_MODBUS_UART USART6 #define USE_USART6 #endif -#if (MB_TIM_NUMB == 1) +#if (MODBUS_TIM_NUMB == 1) #define USED_MODBUS_TIM TIM1 #define USE_TIM1 -#elif (MB_TIM_NUMB == 2) +#elif (MODBUS_TIM_NUMB == 2) #define USED_MODBUS_TIM TIM2 #define USE_TIM2 -#elif (MB_TIM_NUMB == 3) +#elif (MODBUS_TIM_NUMB == 3) #define USED_MODBUS_TIM TIM3 #define USE_TIM3 -#elif (MB_TIM_NUMB == 4) +#elif (MODBUS_TIM_NUMB == 4) #define USED_MODBUS_TIM TIM4 #define USE_TIM4 -#elif (MB_TIM_NUMB == 5) +#elif (MODBUS_TIM_NUMB == 5) #define USED_MODBUS_TIM TIM5 #define USE_TIM5 -#elif (MB_TIM_NUMB == 6) +#elif (MODBUS_TIM_NUMB == 6) #define USED_MODBUS_TIM TIM6 #define USE_TIM6 -#elif (MB_TIM_NUMB == 7) +#elif (MODBUS_TIM_NUMB == 7) #define USED_MODBUS_TIM TIM7 #define USE_TIM7 -#elif (MB_TIM_NUMB == 8) +#elif (MODBUS_TIM_NUMB == 8) #define USED_MODBUS_TIM TIM8 #define USE_TIM8 -#elif (MB_TIM_NUMB == 9) +#elif (MODBUS_TIM_NUMB == 9) #define USED_MODBUS_TIM TIM9 #define USE_TIM9 -#elif (MB_TIM_NUMB == 10) +#elif (MODBUS_TIM_NUMB == 10) #define USED_MODBUS_TIM TIM10 #define USE_TIM10 -#elif (MB_TIM_NUMB == 11) +#elif (MODBUS_TIM_NUMB == 11) #define USED_MODBUS_TIM TIM11 #define USE_TIM11 -#elif (MB_TIM_NUMB == 12) +#elif (MODBUS_TIM_NUMB == 12) #define USED_MODBUS_TIM TIM12 #define USE_TIM12 -#elif (MB_TIM_NUMB == 13) +#elif (MODBUS_TIM_NUMB == 13) #define USED_MODBUS_TIM TIM13 #define USE_TIM13 -#elif (MB_TIM_NUMB == 14) +#elif (MODBUS_TIM_NUMB == 14) #define USED_MODBUS_TIM TIM14 #define USE_TIM14 #endif diff --git a/Code/PWM/control.c b/Code/PWM/control.c index 14a4193..c907d0f 100644 --- a/Code/PWM/control.c +++ b/Code/PWM/control.c @@ -189,7 +189,7 @@ void Set_Log_Params(void) void Control_Timer_ReInit(TIM_SettingsTypeDef *stim) { TIM_Base_MspDeInit(&stim->htim); - hpwm1.stim.sTickBaseMHz = TIMER_CTRL_TICKBASE; + hpwm1.stim.sTickBaseMHz = PROJSET.TIM_CTRL_TICKBASE; TIM_Base_Init(stim); HAL_TIM_Base_Start_IT(&stim->htim); // timer for sinus @@ -206,8 +206,8 @@ void Control_Timer_FirstInit(void) // tim settings TIM_CTRL.htim.Instance = TIM12; TIM_CTRL.sTimMode = TIM_IT_MODE; - TIM_CTRL.sTickBaseMHz = TIMER_CTRL_TICKBASE; - TIM_CTRL.sTimAHBFreqMHz = TIMER_CTRL_AHB_FREQ; + TIM_CTRL.sTickBaseMHz = PROJSET.TIM_CTRL_TICKBASE; + TIM_CTRL.sTimAHBFreqMHz = PROJSET.TIM_CTRL_AHB_FREQ; TIM_CTRL.sTimFreqHz = HZ_TIMER_CTRL; TIM_Base_Init(&TIM_CTRL); @@ -233,6 +233,8 @@ void TIM8_BRK_TIM12_IRQHandler(void) Fill_Logs_with_Data(); Update_Params_For_Log(); Update_Params_For_PWM(&hpwm1); - Trace_CTRL_TIM_Exit(); + WriteSettingsToMem(); + + Trace_CTRL_TIM_Exit(); } \ No newline at end of file diff --git a/Code/PWM/control.h b/Code/PWM/control.h index 534db92..d42e12e 100644 --- a/Code/PWM/control.h +++ b/Code/PWM/control.h @@ -1,8 +1,8 @@ #ifndef __CONTROL_H_ #define __CONTROL_H_ -#include "modbus_data.h" #include "periph_general.h" +#include "modbus.h" #include "math.h" #include "settings.h" diff --git a/Code/PWM/control_def.h b/Code/PWM/control_def.h deleted file mode 100644 index 8975eb3..0000000 --- a/Code/PWM/control_def.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef __CONTROL_H_ -#define __CONTROL_H_ - -#include "modbus_data.h" -#include "periph_general.h" -#include "math.h" - -#define M_PI 3.14159265358979323846 /* pi */ - -// defines for timers -#define HZ_TIMER_CTRL 400 -#define HZ_TIMER_PWM 1000 - - -// defines for PWMs -//#define INTERNAL_THREE_PHASE_PWM_ENABLE // pwm with timer in slave mode: time shift less than 1 period of PWM -//#define SINE_THREE_PHASE_PWM_ENABLE // pwm sine with time shift - -#define SIN_TABLE_SIZE_MAX HZ_TIMER_PWM - - -// defines for filling arrays -#define CALC_SAMPLES_PER_PERIOD(_hztim_, _hztarget_) (_hztim_/_hztarget_) -//(TIM_CTRL.sTimFreq/PWM.PWM_Value) - -// OR define samples -//#define SAMPLES_PER_PERIOD 10 -//#define HZ_TIMER_CTRL (HZ_SINUS*SAMPLES_PER_PERIOD) - -#define CALC_NUMB_OF_PERIODS(_arr_size_, _hztim_, _hztarget_) (_arr_size_/CALC_SAMPLES_PER_PERIOD(_hztim_, _hztarget_)) -//#define NUMB_OF_PERIODS (5) - -#define CALC_ARR_SIZE(_numb_of_periods_, _samples_per_period_) ((_numb_of_periods_)*(_samples_per_period_)) - - - - -#endif // __CONTROL_H_ \ No newline at end of file diff --git a/Code/PWM/pwm.c b/Code/PWM/pwm.c index d6ee882..8ced758 100644 --- a/Code/PWM/pwm.c +++ b/Code/PWM/pwm.c @@ -1,4 +1,5 @@ #include "pwm.h" +//#include "rng.h" PWM_HandleTypeDef hpwm1; PWM_SlaveHandleTypeDef hpwm2; @@ -32,16 +33,16 @@ void PWM_Sine_FirstInit(void) hpwm1.sConfigOC.OCFastMode = TIM_OCFAST_DISABLE; // tim1 settings - hpwm1.stim.htim.Instance = TIMER_PWM_INSTANCE; + hpwm1.stim.htim.Instance = TIMER_PWM1_INSTANCE; hpwm1.stim.sTimMode = TIM_IT_MODE; - hpwm1.stim.sTickBaseMHz = TIMER_PWM_TICKBASE; - hpwm1.stim.sTimAHBFreqMHz = TIMER_PWM_AHB_FREQ; hpwm1.stim.sTimFreqHz = HZ_TIMER_PWM; - hpwm1.GPIOx = TIMER_PWM_GPIOx; - hpwm1.GPIO_PIN_X1 = TIMER_PWM_GPIO_PIN_X1; - hpwm1.GPIO_PIN_X2 = TIMER_PWM_GPIO_PIN_X2; - hpwm1.PWM_Channel1 = TIMER_PWM_TIM_CHANNEL1; - hpwm1.PWM_Channel2 = TIMER_PWM_TIM_CHANNEL2; + hpwm1.stim.sTickBaseMHz = PROJSET.TIM_PWM_TICKBASE; + hpwm1.stim.sTimAHBFreqMHz = PROJSET.TIM_PWM_AHB_FREQ; + hpwm1.GPIOx = TIMER_PWM1_GPIOx; + hpwm1.GPIO_PIN_X1 = PROJSET.TIM_PWM1_GPIO_PIN_X1; + hpwm1.GPIO_PIN_X2 = PROJSET.TIM_PWM1_GPIO_PIN_X2; + hpwm1.PWM_Channel1 = PROJSET.TIM_PWM1_TIM_CHANNEL1; + hpwm1.PWM_Channel2 = PROJSET.TIM_PWM1_TIM_CHANNEL2; hpwm1.hpwm2 = (void *)&hpwm2; hpwm1.hpwm3 = (void *)&hpwm3; @@ -53,22 +54,22 @@ void PWM_Sine_FirstInit(void) // PWM SLAVES INIT hpwm2.hMasterPWM = &hpwm1; hpwm2.stim = hpwm1.stim; - hpwm2.stim.htim.Instance = TIMER_PWM2_INSTANCE; - hpwm2.GPIOx = TIMER_PWM2_GPIOx; - hpwm2.GPIO_PIN_X1 = TIMER_PWM2_GPIO_PIN_X1; - hpwm2.GPIO_PIN_X2 = TIMER_PWM2_GPIO_PIN_X2; - hpwm2.PWM_Channel1 = TIMER_PWM2_TIM_CHANNEL1; - hpwm2.PWM_Channel2 = TIMER_PWM2_TIM_CHANNEL2; + hpwm2.stim.htim.Instance = (TIM_TypeDef *)PROJSET.TIM_PWM2_INSTANCE; + hpwm2.GPIOx = (GPIO_TypeDef *)PROJSET.TIM_PWM2_GPIOx; + hpwm2.GPIO_PIN_X1 = PROJSET.TIM_PWM2_GPIO_PIN_X1; + hpwm2.GPIO_PIN_X2 = PROJSET.TIM_PWM2_GPIO_PIN_X2; + hpwm2.PWM_Channel1 = PROJSET.TIM_PWM2_TIM_CHANNEL1; + hpwm2.PWM_Channel2 = PROJSET.TIM_PWM2_TIM_CHANNEL2; hpwm2.Duty_Shift_Ratio = (float)2/3; hpwm3.hMasterPWM = &hpwm1; hpwm3.stim = hpwm1.stim; - hpwm3.stim.htim.Instance = TIMER_PWM3_INSTANCE; - hpwm3.GPIOx = TIMER_PWM3_GPIOx; - hpwm3.GPIO_PIN_X1 = TIMER_PWM3_GPIO_PIN_X1; - hpwm3.GPIO_PIN_X2 = TIMER_PWM3_GPIO_PIN_X2; - hpwm3.PWM_Channel1 = TIMER_PWM3_TIM_CHANNEL1; - hpwm3.PWM_Channel2 = TIMER_PWM3_TIM_CHANNEL2; + hpwm3.stim.htim.Instance = (TIM_TypeDef *)PROJSET.TIM_PWM3_INSTANCE; + hpwm3.GPIOx = (GPIO_TypeDef *)PROJSET.TIM_PWM3_GPIOx; + hpwm3.GPIO_PIN_X1 = PROJSET.TIM_PWM3_GPIO_PIN_X1; + hpwm3.GPIO_PIN_X2 = PROJSET.TIM_PWM3_GPIO_PIN_X2; + hpwm3.PWM_Channel1 = PROJSET.TIM_PWM3_TIM_CHANNEL1; + hpwm3.PWM_Channel2 = PROJSET.TIM_PWM3_TIM_CHANNEL2; hpwm3.Duty_Shift_Ratio = (float)-2/3; PWM_SlavePhase_Init(&hpwm2); @@ -116,13 +117,13 @@ void PWM_Handler(PWM_HandleTypeDef *hpwm) if(Duty >= 0) { - PWM_Set_Compare1(hpwm, Duty+PWM_Sine_Calc_Min_Duty(hpwm)); // set first channel + PWM_Set_Compare1(hpwm, Duty); // set first channel PWM_Set_Compare2(hpwm, 0); // reset second channel } else // если это вторая полуволна { PWM_Set_Compare1(hpwm, 0); // reset first channel - PWM_Set_Compare2(hpwm, (-Duty)+PWM_Sine_Calc_Min_Duty(hpwm)); // set second channel + PWM_Set_Compare2(hpwm, -Duty); // set second channel } PWM_SlavePhase_Set_DutyTable_Signed(PWM_Set_pSlaveHandle(hpwm,hpwm2), sin_ind); @@ -147,30 +148,53 @@ void PWM_Handler(PWM_HandleTypeDef *hpwm) PWM_Set_Compare2(PWM_Set_pSlaveHandle(hpwm,hpwm2), 0); // reset second channel PWM_Set_Compare1(PWM_Set_pSlaveHandle(hpwm,hpwm3), 0); // reset first channel PWM_Set_Compare2(PWM_Set_pSlaveHandle(hpwm,hpwm3), 0); // reset second channel +// uint32_t pwm_rng = 0; +// HAL_RNG_GenerateRandomNumber(&hrng, &pwm_rng); +// pwm_rng = ((pwm_rng&0xFFFF)/(0xFFFF/PWM_Get_Autoreload(hpwm)))/((float)100/hpwm->PWM_Value); +// if (pwm_rng < PWM_Calc_Min_Duty(hpwm)) +// pwm_rng = PWM_Calc_Min_Duty(hpwm); // if second channel enabled if(PWM_Get_Mode(hpwm, PWM_CH_MODE)) { - PWM_Set_Compare1(hpwm, 0); // reset first channel + PWM_Set_Compare1(hpwm, 0); // reset first channel PWM_Set_Duty_From_Percent(hpwm, hpwm->PWM_Channel2); // set second channel +// __HAL_TIM_SET_COMPARE(&(hpwm->stim.htim), TIM_CHANNEL_2, pwm_rng); // set second channel } // if first channel enabled else { +// __HAL_TIM_SET_COMPARE(&(hpwm->stim.htim), TIM_CHANNEL_1, pwm_rng); // set second channel PWM_Set_Duty_From_Percent(hpwm, hpwm->PWM_Channel1); // set first channel PWM_Set_Compare2(hpwm, 0); // reset second channel } } //-----CHECK CHANNELS FOR ERRORS----- + uint16_t min_duty = PWM_Calc_Min_Duty(hpwm); + // IF FIRST CHANNEL IS ACRIVE + if(PWM_Get_Compare1(hpwm) != 0) + { + // Duty shoud be bigger or equeal than min duration + if (PWM_Get_Compare1(hpwm)PWM_Get_Autoreload(hpwm)-min_duty) + PWM_Set_Compare1(hpwm, PWM_Get_Autoreload(hpwm)-min_duty); + } + // IF SECOND CHANNEL IS ACRIVE + else if(PWM_Get_Compare2(hpwm) != 0) + { + // Duty shoud be bigger or equeal than min duration + if (PWM_Get_Compare2(hpwm)PWM_Get_Autoreload(hpwm)) - PWM_Set_Compare1(hpwm, PWM_Get_Autoreload(hpwm)); - // Duty shoud be less or equeal than ARR - if (PWM_Get_Compare2(hpwm)>PWM_Get_Autoreload(hpwm)) - PWM_Set_Compare2(hpwm, PWM_Get_Autoreload(hpwm)); - // Only one channel shoud be active + if (PWM_Get_Compare2(hpwm)>PWM_Get_Autoreload(hpwm)-min_duty) + PWM_Set_Compare2(hpwm, PWM_Get_Autoreload(hpwm)-min_duty); + } + // IF BOTH CHANNEL IS ACRIVE if((PWM_Get_Compare1(hpwm) != 0) && (PWM_Get_Compare2(hpwm) != 0)) { + // Only one channel shoud be active so disable all PWM_Set_Compare1(hpwm, 0); PWM_Set_Compare2(hpwm, 0); } @@ -546,14 +570,16 @@ void PWM_SlavePhase_Set_DutyTable_Signed(PWM_SlaveHandleTypeDef *hspwm, uint16_t // если это первая полуволна if(Duty > 0) { - PWM_Set_Compare1(hspwm, Duty+PWM_Sine_Calc_Min_Duty(hspwm->hMasterPWM)); // set first channel + PWM_Set_Compare1(hspwm, Duty+PWM_Calc_Min_Duty(hspwm->hMasterPWM)); // set first channel PWM_Set_Compare2(hspwm, 0); // reset second channel } else // если это вторая полуволна { PWM_Set_Compare1(hspwm, 0); // reset first channel - PWM_Set_Compare2(hspwm, (-Duty)+PWM_Sine_Calc_Min_Duty(hspwm->hMasterPWM)); // set second channel + PWM_Set_Compare2(hspwm, (-Duty)+PWM_Calc_Min_Duty(hspwm->hMasterPWM)); // set second channel } + //if(hspwm == &hpwm2) + //__ASM(""); } else // if three phase disabled { @@ -574,20 +600,34 @@ void PWM_SlavePhase_Check_Channels(PWM_SlaveHandleTypeDef *hspwm) // if three phase enables if (PWM_Get_Mode(hspwm->hMasterPWM, PWM_PHASE_MODE)) { + uint16_t min_duty = PWM_Calc_Min_Duty(hspwm->hMasterPWM); + // IF FIRST CHANNEL IS ACRIVE + if(PWM_Get_Compare1(hspwm) != 0) + { + // Duty shoud be bigger or equeal than min duration + if (PWM_Get_Compare1(hspwm)PWM_Get_Autoreload(hspwm)-min_duty) + PWM_Set_Compare1(hspwm, PWM_Get_Autoreload(hspwm)-min_duty); + } + // IF SECOND CHANNEL IS ACRIVE + else if(PWM_Get_Compare2(hspwm) != 0) + // Duty shoud be bigger or equeal than min duration + if (PWM_Get_Compare2(hspwm)PWM_Get_Autoreload(hspwm)) - PWM_Set_Compare1(hspwm, PWM_Get_Autoreload(hspwm)); - // Duty shoud be less or equeal than ARR - if (PWM_Get_Compare2(hspwm)>PWM_Get_Autoreload(hspwm)) - PWM_Set_Compare2(hspwm, PWM_Get_Autoreload(hspwm)); - // Only one channel shoud be active + if (PWM_Get_Compare2(hspwm)>PWM_Get_Autoreload(hspwm)-min_duty) + PWM_Set_Compare2(hspwm, PWM_Get_Autoreload(hspwm)-min_duty); + // IF BOTH CHANNEL IS ACRIVE if((PWM_Get_Compare1(hspwm) != 0) && (PWM_Get_Compare2(hspwm) != 0)) - { // reset channels - PWM_Set_Compare1(hspwm, 0); // reset first channel - PWM_Set_Compare2(hspwm, 0); // reset second channel + { + // Only one channel shoud be active so disable all + PWM_Set_Compare1(hspwm, 0); + PWM_Set_Compare2(hspwm, 0); } } - else // if three phase disabled + else { // reset channels PWM_Set_Compare1(hspwm, 0); // reset first channel @@ -631,7 +671,31 @@ void PWM_SlavePhase_CreateDeadTime(PWM_SlaveHandleTypeDef *hspwm, float *LocalDe //------------------------------------------------------------------- //------------------------HANDLERS FUNCTIONS------------------------- //---------------PWM TIMER----------------- +#if (PWM_MASTER_TIM_NUMB == 1) || (PWM_MASTER_TIM_NUMB == 10) // choose handler for TIM +void TIM1_UP_TIM10_IRQHandler(void) +#elif (PWM_MASTER_TIM_NUMB == 2) +void TIM2_IRQHandler(void) +#elif (PWM_MASTER_TIM_NUMB == 3) +void TIM3_IRQHandler(void) +#elif (PWM_MASTER_TIM_NUMB == 4) void TIM4_IRQHandler(void) +#elif (PWM_MASTER_TIM_NUMB == 5) +void TIM5_IRQHandler(void) +#elif (PWM_MASTER_TIM_NUMB == 6) +void TIM6_DAC_IRQHandler(void) +#elif (PWM_MASTER_TIM_NUMB == 7) +void TIM7_IRQHandler(void) +#elif (PWM_MASTER_TIM_NUMB == 8) || (PWM_MASTER_TIM_NUMB == 13) +void TIM8_UP_TIM13_IRQHandler(void) +#elif (PWM_MASTER_TIM_NUMB == 1) || (PWM_MASTER_TIM_NUMB == 9) +void TIM1_BRK_TIM9_IRQHandler(void) +#elif (PWM_MASTER_TIM_NUMB == 1) || (PWM_MASTER_TIM_NUMB == 11) +void TIM1_TRG_COM_TIM11_IRQHandler(void) +#elif (PWM_MASTER_TIM_NUMB == 8) || (PWM_MASTER_TIM_NUMB == 12) +void TIM8_BRK_TIM12_IRQHandler(void) +#elif (PWM_MASTER_TIM_NUMB == 8) || (PWM_MASTER_TIM_NUMB == 14) +void TIM8_TRG_COM_TIM14_IRQHandler(void) +#endif { Trace_PWM_TIM_Enter(); HAL_TIM_IRQHandler(&hpwm1.stim.htim); @@ -668,7 +732,7 @@ void PWM_SineSingChannel_FirstInit(void) hpwm1.sConfigOC.OCFastMode = TIM_OCFAST_DISABLE; // tim1 settings - hpwm1.stim.htim.Instance = TIMER_PWM_INSTANCE; + hpwm1.stim.htim.Instance = TIMER_PWM1_INSTANCE; hpwm1.stim.sTimMode = TIM_IT_MODE; hpwm1.stim.sTickBaseMHz = TIM_TickBase_1US; hpwm1.stim.sTimAHBFreqMHz = 72; diff --git a/Code/PWM/pwm.h b/Code/PWM/pwm.h index 6194161..093909d 100644 --- a/Code/PWM/pwm.h +++ b/Code/PWM/pwm.h @@ -23,7 +23,7 @@ extern uint32_t sin_table[SIN_TABLE_SIZE_MAX]; * @param _hpwm_ - указатель на хендл pwm. * @return _val_ - количество тиков кратчайшего импульса. */ -#define PWM_Sine_Calc_Min_Duty(_hpwm_) ((_hpwm_)->PWM_MinPulseDur/(_hpwm_)->stim.sTickBaseMHz) +#define PWM_Calc_Min_Duty(_hpwm_) ((_hpwm_)->PWM_MinPulseDur/(_hpwm_)->stim.sTickBaseMHz) /** * @brief Calc Scale Koef for Table & AUTORELOAD REGISTER * @param _hpwm_ - указатель на хендл pwm. @@ -34,7 +34,7 @@ extern uint32_t sin_table[SIN_TABLE_SIZE_MAX]; * @note Если задана минимальная длительность импульса в тактах n, она вычитается из ARR: [0, ARR-2*n] И потом регистр ARR заполняется так, что диапазон его значений будет [n, ARR-n] @ref PWM_Get_Table_Element_Unsigned */ -#define PWM_Calc_Duty_Scale(_hpwm_, _scale_) ((float)PWM_Get_Autoreload(_hpwm_)-2*PWM_Sine_Calc_Min_Duty(_hpwm_))/(_scale_) +#define PWM_Calc_Duty_Scale(_hpwm_, _scale_) ((float)PWM_Get_Autoreload(_hpwm_))/(_scale_) /** * @brief Get Table Element Scaled corresponding to TIM ARR register @@ -44,7 +44,7 @@ extern uint32_t sin_table[SIN_TABLE_SIZE_MAX]; * @note Если задана минимальная длительность импульса в тактах n, то регистр ARR заполняется так, что диапазон его значений будет [n, ARR-n] */ -#define PWM_Get_Table_Element_Unsigned(_hpwm_,_ind_) ((*((_hpwm_)->pDuty_Table_Origin+_ind_)*((_hpwm_)->Duty_Table_Scale))+PWM_Sine_Calc_Min_Duty(_hpwm_)) +#define PWM_Get_Table_Element_Unsigned(_hpwm_,_ind_) (*((_hpwm_)->pDuty_Table_Origin+_ind_)*((_hpwm_)->Duty_Table_Scale)) /** * @brief Get Table Element Scaled and Shifted corresponding to TIM ARR register @@ -208,7 +208,6 @@ typedef struct // PWM_SlaveHandleTypeDef extern PWM_SlaveHandleTypeDef hpwm2; extern PWM_SlaveHandleTypeDef hpwm3; - //--------------------------------PWM FUNCTIONS---------------------------------- /** * @brief reInitialization of PWM TIM. diff --git a/Code/PWM/settings.c b/Code/PWM/settings.c new file mode 100644 index 0000000..4f56115 --- /dev/null +++ b/Code/PWM/settings.c @@ -0,0 +1,265 @@ +#include "control.h" +ProjectSettings_TypeDef PROJSET; +uint32_t PageError = 0x00; + uint8_t UpdateSettings = 0; + +void WriteSettingsToMem(void) +{ + FillStructWithDefines(); + //HAL_FLASH_Unlock(); + // + //CheckSettingsInFLASH(); + // + //if(CheckIsSettingsValid(&PROJSET)) // if new settings are invalid + // PROJSET = *PROJSET_MEM; // take the old settings from mem + //else // if new settings are valid + // SetFlagUpdateSettingsInMem(); // save the new settings in mem (set flag to do this) + // + //HAL_FLASH_Lock(); + +} + +void SetFlagUpdateSettingsInMem(void) +{ + //UpdateSettings = 0; + //// MODBUS settings + //if(PROJSET_MEM->MB_DEVICE_ID != PROJSET.MB_DEVICE_ID) + // UpdateSettings = 1; + //if(PROJSET_MEM->MB_SPEED != PROJSET.MB_SPEED) + // UpdateSettings = 1; + //if(PROJSET_MEM->MB_GPIOX != PROJSET.MB_GPIOX) + // UpdateSettings = 1; + //if(PROJSET_MEM->MB_GPIO_PIN_RX != PROJSET.MB_GPIO_PIN_RX) + // UpdateSettings = 1; + //if(PROJSET_MEM->MB_GPIO_PIN_RX != PROJSET.MB_GPIO_PIN_RX) + // UpdateSettings = 1; + //if(PROJSET_MEM->MB_MAX_TIMEOUT != PROJSET.MB_MAX_TIMEOUT) + // UpdateSettings = 1; + // + //// PWM settings + //if(PROJSET_MEM->TIM_PWM_TICKBASE != PROJSET.TIM_PWM_TICKBASE) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_PWM_AHB_FREQ != PROJSET.TIM_PWM_AHB_FREQ) + // UpdateSettings = 1; + // + //if(PROJSET_MEM->TIM_PWM1_TIM_CHANNEL1 != PROJSET.TIM_PWM1_TIM_CHANNEL1) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_PWM1_TIM_CHANNEL2 != PROJSET.TIM_PWM1_TIM_CHANNEL2) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_PWM1_GPIOx != PROJSET.TIM_PWM1_GPIOx) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_PWM1_GPIO_PIN_X1 != PROJSET.TIM_PWM1_GPIO_PIN_X1) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_PWM1_GPIO_PIN_X2 != PROJSET.TIM_PWM1_GPIO_PIN_X2) + // UpdateSettings = 1; + // + //if(PROJSET_MEM->TIM_PWM2_INSTANCE != PROJSET.TIM_PWM2_INSTANCE) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_PWM2_TIM_CHANNEL1 != PROJSET.TIM_PWM2_TIM_CHANNEL1) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_PWM2_TIM_CHANNEL2 != PROJSET.TIM_PWM2_TIM_CHANNEL2) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_PWM2_GPIOx != PROJSET.TIM_PWM2_GPIOx) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_PWM2_GPIO_PIN_X1 != PROJSET.TIM_PWM2_GPIO_PIN_X1) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_PWM2_GPIO_PIN_X2 != PROJSET.TIM_PWM2_GPIO_PIN_X2) + // UpdateSettings = 1; + // + //if(PROJSET_MEM->TIM_PWM3_INSTANCE != PROJSET.TIM_PWM3_INSTANCE) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_PWM3_TIM_CHANNEL1 != PROJSET.TIM_PWM3_TIM_CHANNEL1) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_PWM3_TIM_CHANNEL2 != PROJSET.TIM_PWM3_TIM_CHANNEL2) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_PWM3_GPIOx != PROJSET.TIM_PWM3_GPIOx) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_PWM3_GPIO_PIN_X1 != PROJSET.TIM_PWM3_GPIO_PIN_X1) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_PWM3_GPIO_PIN_X2 != PROJSET.TIM_PWM3_GPIO_PIN_X2) + // UpdateSettings = 1; + // + //// CTRL settings + //if(PROJSET_MEM->TIM_CTRL_TICKBASE != PROJSET.TIM_CTRL_TICKBASE) + // UpdateSettings = 1; + //if(PROJSET_MEM->TIM_CTRL_AHB_FREQ != PROJSET.TIM_CTRL_AHB_FREQ) + // UpdateSettings = 1; +} + + +void UpdateSettingsInMem(void) +{ + //if(UpdateSettings) + //{ + // FLASH_EraseInitTypeDef EraseInitStruct; + // PageError = 0x00; + // + // EraseInitStruct.TypeErase = FLASH_TYPEERASE_SECTORS;// erase pages + // EraseInitStruct.Banks = FLASH_BANK_1; + // EraseInitStruct.Sector = FLASH_SECTOR_4; //first sector for erase + // EraseInitStruct.NbSectors = 1;// num of sector that need to be erased + // + // HAL_FLASH_Unlock(); + // HAL_FLASHEx_Erase(&EraseInitStruct, &PageError); + // + // + // /* Wait for last operation to be completed */ + // if(FLASH_WaitForLastOperation((uint32_t)50000U) == HAL_OK) + // { + // /* If the previous operation is completed, proceed to program the new data */ + // CLEAR_BIT(FLASH->CR, FLASH_CR_PSIZE); + // FLASH->CR |= FLASH_PSIZE_WORD; + // FLASH->CR |= FLASH_CR_PG; + // *PROJSET_MEM = PROJSET; // save the new settings in mem + // } + // HAL_FLASH_Lock(); + // UpdateSettings = 0; + //} +} + +void FillSettingsWithDefines(void) +{ + // rewrite all setting corresponding to defines + + //FLASH_EraseInitTypeDef EraseInitStruct; + //PageError = 0x00; + // + //EraseInitStruct.TypeErase = FLASH_TYPEERASE_SECTORS;// erase pages + //EraseInitStruct.Banks = FLASH_BANK_1; + //EraseInitStruct.Sector = FLASH_SECTOR_4; //first sector for erase + //EraseInitStruct.NbSectors = 1;// num of sector that need to be erased + // + //HAL_FLASH_Unlock(); + //HAL_FLASHEx_Erase(&EraseInitStruct, &PageError); + //// MODBUS settings + //FLASH_WRITE_SETTING(PROJSET_MEM->MB_DEVICE_ID, MODBUS_DEVICE_ID); + //FLASH_WRITE_SETTING(PROJSET_MEM->MB_SPEED, MODBUS_SPEED); + //FLASH_WRITE_SETTING(PROJSET_MEM->MB_GPIOX, (uint32_t)MODBUS_GPIOX); + //FLASH_WRITE_SETTING(PROJSET_MEM->MB_GPIO_PIN_RX, MODBUS_GPIO_PIN_RX); + //FLASH_WRITE_SETTING(PROJSET_MEM->MB_GPIO_PIN_TX, MODBUS_GPIO_PIN_TX); + //FLASH_WRITE_SETTING(PROJSET_MEM->MB_MAX_TIMEOUT, MODBUS_MAX_TIMEOUT); + //FLASH_WRITE_SETTING(PROJSET_MEM->MB_TIM_AHB_FREQ, MODBUS_TIM_AHB_FREQ); + // + //// PWM settings + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM_TICKBASE, TIMER_PWM_TICKBASE); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM_AHB_FREQ, TIMER_PWM_AHB_FREQ); + // + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM1_TIM_CHANNEL1, TIMER_PWM1_TIM_CHANNEL1); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM1_TIM_CHANNEL2, TIMER_PWM1_TIM_CHANNEL2); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM1_GPIOx, (uint32_t)TIMER_PWM1_GPIOx); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM1_GPIO_PIN_X1, TIMER_PWM1_GPIO_PIN_X1); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM1_GPIO_PIN_X2, TIMER_PWM1_GPIO_PIN_X2); + // + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM2_INSTANCE, (uint32_t)TIMER_PWM2_INSTANCE); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM2_TIM_CHANNEL1, TIMER_PWM2_TIM_CHANNEL1); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM2_TIM_CHANNEL2, TIMER_PWM2_TIM_CHANNEL2); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM2_GPIOx, (uint32_t)TIMER_PWM2_GPIOx); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM2_GPIO_PIN_X1, TIMER_PWM2_GPIO_PIN_X1); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM2_GPIO_PIN_X2, TIMER_PWM2_GPIO_PIN_X2); + // + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM3_INSTANCE, (uint32_t)TIMER_PWM3_INSTANCE); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM3_TIM_CHANNEL1, TIMER_PWM3_TIM_CHANNEL1); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM3_TIM_CHANNEL2, TIMER_PWM3_TIM_CHANNEL2); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM3_GPIOx, (uint32_t)TIMER_PWM3_GPIOx); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM3_GPIO_PIN_X1, TIMER_PWM3_GPIO_PIN_X1); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_PWM3_GPIO_PIN_X2, TIMER_PWM3_GPIO_PIN_X2); + // + //// CTRL settings + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_CTRL_TICKBASE, TIMER_CTRL_TICKBASE); + //FLASH_WRITE_SETTING(PROJSET_MEM->TIM_CTRL_AHB_FREQ, TIMER_CTRL_AHB_FREQ); + //HAL_FLASH_Lock(); + +} + +void FillStructWithDefines(void) +{ + // rewrite all setting corresponding to defines + + + // MODBUS settings + STRUCT_WRITE_SETTING(PROJSET.MB_DEVICE_ID, MODBUS_DEVICE_ID); + STRUCT_WRITE_SETTING(PROJSET.MB_SPEED, MODBUS_SPEED); + STRUCT_WRITE_SETTING(PROJSET.MB_GPIOX, MODBUS_GPIOX); + STRUCT_WRITE_SETTING(PROJSET.MB_GPIO_PIN_RX, MODBUS_GPIO_PIN_RX); + STRUCT_WRITE_SETTING(PROJSET.MB_GPIO_PIN_TX, MODBUS_GPIO_PIN_TX); + STRUCT_WRITE_SETTING(PROJSET.MB_MAX_TIMEOUT, MODBUS_MAX_TIMEOUT); + STRUCT_WRITE_SETTING(PROJSET.MB_TIM_AHB_FREQ, MODBUS_TIM_AHB_FREQ); + + // PWM settings + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM_TICKBASE, TIMER_PWM_TICKBASE); + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM_AHB_FREQ, TIMER_PWM_AHB_FREQ); + + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM1_TIM_CHANNEL1, TIMER_PWM1_TIM_CHANNEL1); + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM1_TIM_CHANNEL2, TIMER_PWM1_TIM_CHANNEL2); + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM1_GPIOx, TIMER_PWM1_GPIOx); + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM1_GPIO_PIN_X1, TIMER_PWM1_GPIO_PIN_X1); + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM1_GPIO_PIN_X2, TIMER_PWM1_GPIO_PIN_X2); + + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM2_INSTANCE, TIMER_PWM2_INSTANCE); + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM2_TIM_CHANNEL1, TIMER_PWM2_TIM_CHANNEL1); + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM2_TIM_CHANNEL2, TIMER_PWM2_TIM_CHANNEL2); + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM2_GPIOx, TIMER_PWM2_GPIOx); + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM2_GPIO_PIN_X1, TIMER_PWM2_GPIO_PIN_X1); + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM2_GPIO_PIN_X2, TIMER_PWM2_GPIO_PIN_X2); + + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM3_INSTANCE, TIMER_PWM3_INSTANCE); + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM3_TIM_CHANNEL1, TIMER_PWM3_TIM_CHANNEL1); + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM3_TIM_CHANNEL2, TIMER_PWM3_TIM_CHANNEL2); + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM3_GPIOx, TIMER_PWM3_GPIOx); + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM3_GPIO_PIN_X1, TIMER_PWM3_GPIO_PIN_X1); + STRUCT_WRITE_SETTING(PROJSET.TIM_PWM3_GPIO_PIN_X2, TIMER_PWM3_GPIO_PIN_X2); + + // CTRL settings + STRUCT_WRITE_SETTING(PROJSET.TIM_CTRL_TICKBASE, TIMER_CTRL_TICKBASE); + STRUCT_WRITE_SETTING(PROJSET.TIM_CTRL_AHB_FREQ, TIMER_CTRL_AHB_FREQ); + +} +void CheckSettingsInFLASH(void) +{ + //if(CheckIsSettingsValid(PROJSET_MEM)) + // FillSettingsWithDefines(); + // + //PROJSET = *PROJSET_MEM; +} +int CheckIsSettingsValid(ProjectSettings_TypeDef *set_struct) +{ + // if some of setting are missing + // chech MODBUS + if((!IS_UART_BAUDRATE(set_struct->MB_SPEED) || (set_struct->MB_SPEED ) == 0) || + (!IS_GPIO_ALL_INSTANCE((GPIO_TypeDef *)set_struct->MB_GPIOX)) || + (!IS_GPIO_PIN((GPIO_TypeDef *)set_struct->MB_GPIO_PIN_TX)) || + (!IS_GPIO_PIN((GPIO_TypeDef *)set_struct->MB_GPIO_PIN_RX)) || + ((set_struct->MB_TIM_AHB_FREQ) == 0)) + { + return 1; + } + // chech control tim + if((set_struct->TIM_CTRL_AHB_FREQ) == 0) + { + return 1; + } + // chech PWM tims + if((set_struct->TIM_PWM_AHB_FREQ) == 0 || + (!IS_GPIO_ALL_INSTANCE((GPIO_TypeDef *)set_struct->TIM_PWM1_GPIOx)) || + (!IS_GPIO_PIN((GPIO_TypeDef *)set_struct->TIM_PWM1_GPIO_PIN_X1)) || + (!IS_GPIO_PIN((GPIO_TypeDef *)set_struct->TIM_PWM1_GPIO_PIN_X2)) || + (!IS_TIM_CHANNELS(set_struct->TIM_PWM1_TIM_CHANNEL1)) || + (!IS_TIM_CHANNELS(set_struct->TIM_PWM1_TIM_CHANNEL2)) || + (!IS_TIM_INSTANCE((TIM_TypeDef *)set_struct->TIM_PWM2_INSTANCE)) || + (!IS_GPIO_ALL_INSTANCE((GPIO_TypeDef *)set_struct->TIM_PWM2_GPIOx)) || + (!IS_GPIO_PIN((GPIO_TypeDef *)set_struct->TIM_PWM2_GPIO_PIN_X1)) || + (!IS_GPIO_PIN((GPIO_TypeDef *)set_struct->TIM_PWM2_GPIO_PIN_X2)) || + (!IS_TIM_CHANNELS(set_struct->TIM_PWM2_TIM_CHANNEL1)) || + (!IS_TIM_CHANNELS(set_struct->TIM_PWM2_TIM_CHANNEL2)) || + (!IS_TIM_INSTANCE((TIM_TypeDef *)set_struct->TIM_PWM3_INSTANCE)) || + (!IS_GPIO_ALL_INSTANCE((GPIO_TypeDef *)set_struct->TIM_PWM3_GPIOx)) || + (!IS_GPIO_PIN((GPIO_TypeDef *)set_struct->TIM_PWM3_GPIO_PIN_X1)) || + (!IS_GPIO_PIN((GPIO_TypeDef *)set_struct->TIM_PWM3_GPIO_PIN_X2)) || + (!IS_TIM_CHANNELS(set_struct->TIM_PWM3_TIM_CHANNEL1)) || + (!IS_TIM_CHANNELS(set_struct->TIM_PWM3_TIM_CHANNEL2))) + { + return 1; + } + + return 0; +} \ No newline at end of file diff --git a/Code/PWM/settings.h b/Code/PWM/settings.h index 9ed5c6b..3061544 100644 --- a/Code/PWM/settings.h +++ b/Code/PWM/settings.h @@ -1,17 +1,44 @@ +/********************************MODBUS************************************* +Данный файл содержит объявления базовых функции и дефайны для реализации +MODBUS. +Данный файл необходимо подключить в rs_message.h. После подключать rs_message.h +к основному проекту. +***************************************************************************/ +#ifndef __PROJ_SETTINGS_H_ +#define __PROJ_SETTINGS_H_ + +#include "stm32f4xx_hal.h" +//--------DEFINES FOR SETTING OF SETTINGS----------- +#define SETTINGS_FLASH_ADDRESS_SHIFT (0x10000) +#define SETTINGS_FLASH_ADDRESS (FLASH_BASE + SETTINGS_FLASH_ADDRESS_SHIFT) + +#define EEPROM_BASE +#define SETTINGS_EEPROM_ADDRESS_SHIFT +#define SETTINGS_EEPROM_ADDRESS (EEPROM_BASE + SETTINGS_EEPROM_ADDRESS_SHIFT) + +#ifdef USE_EEPROM +#define SETTINGS_ADDRESS SETTINGS_EEPROM_ADDRESS +#else // USE_EEPROM +#define SETTINGS_ADDRESS (SETTINGS_FLASH_ADDRESS) +#endif // USE_EEPROM +//-------------------------------------------------- +//------------DEFINES FOR PWM SETTING--------------- // settings defines #define HZ_TIMER_CTRL 400 #define HZ_TIMER_PWM 1000 // TIM PWM1 SETTINGS -#define TIMER_PWM_INSTANCE TIM4 +#define PWM_MASTER_TIM_NUMB 4 #define TIMER_PWM_TICKBASE TIM_TickBase_1US #define TIMER_PWM_AHB_FREQ 72 -#define TIMER_PWM_TIM_CHANNEL1 TIM_CHANNEL_1 -#define TIMER_PWM_TIM_CHANNEL2 TIM_CHANNEL_2 -#define TIMER_PWM_GPIOx GPIOD -#define TIMER_PWM_GPIO_PIN_X1 GPIO_PIN_12 -#define TIMER_PWM_GPIO_PIN_X2 GPIO_PIN_13 + +#define TIMER_PWM1_INSTANCE TIM4 +#define TIMER_PWM1_TIM_CHANNEL1 TIM_CHANNEL_1 +#define TIMER_PWM1_TIM_CHANNEL2 TIM_CHANNEL_2 +#define TIMER_PWM1_GPIOx GPIOD +#define TIMER_PWM1_GPIO_PIN_X1 GPIO_PIN_12 +#define TIMER_PWM1_GPIO_PIN_X2 GPIO_PIN_13 @@ -39,4 +66,86 @@ // PWM SETTINGS #define SIN_TABLE_ORIGIN sin_table -#define SIN_TABLE_SIZE_MAX 1000 \ No newline at end of file +#define SIN_TABLE_SIZE_MAX 1000 +//-------------------------------------------------- + +//----------DEFINES FOR MODBUS SETTING-------------- +#define MODBUS_UART_NUMB 3 // number of used uart +#define MODBUS_SPEED 115200 +#define MODBUS_GPIOX GPIOB +#define MODBUS_GPIO_PIN_RX GPIO_PIN_11 +#define MODBUS_GPIO_PIN_TX GPIO_PIN_10 +/* accord to this define sets define USED_MB_UART = USARTx */ +#define MODBUS_TIM_NUMB 7 // number of used uart +#define MODBUS_TIM_AHB_FREQ 72 +/* accord to this define sets define USED_MB_TIM = TIMx */ + +/* defines for modbus behaviour */ +#define MODBUS_DEVICE_ID 1 // number of used uart +#define MODBUS_MAX_TIMEOUT 5000 // is ms +// custom define for size of receive message +//-------------------------------------------------- + +typedef struct +{ + // ctrl periph settings + uint64_t TIM_CTRL_TICKBASE; + uint64_t TIM_CTRL_AHB_FREQ; + // pwm peripth settings + uint64_t TIM_PWM_TICKBASE; + uint64_t TIM_PWM_AHB_FREQ; + +// uint64_t TIM_PWM1_INSTANCE; + uint64_t TIM_PWM1_TIM_CHANNEL1; + uint64_t TIM_PWM1_TIM_CHANNEL2; + uint64_t TIM_PWM1_GPIOx; + uint64_t TIM_PWM1_GPIO_PIN_X1; + uint64_t TIM_PWM1_GPIO_PIN_X2; + + uint64_t TIM_PWM2_INSTANCE; + uint64_t TIM_PWM2_TIM_CHANNEL1; + uint64_t TIM_PWM2_TIM_CHANNEL2; + uint64_t TIM_PWM2_GPIOx; + uint64_t TIM_PWM2_GPIO_PIN_X1; + uint64_t TIM_PWM2_GPIO_PIN_X2; + + uint64_t TIM_PWM3_INSTANCE; + uint64_t TIM_PWM3_TIM_CHANNEL1; + uint64_t TIM_PWM3_TIM_CHANNEL2; + uint64_t TIM_PWM3_GPIOx; + uint64_t TIM_PWM3_GPIO_PIN_X1; + uint64_t TIM_PWM3_GPIO_PIN_X2; + + + // modbus peripth settings + uint64_t MB_DEVICE_ID; + uint64_t MB_SPEED; + uint64_t MB_GPIOX; + uint64_t MB_GPIO_PIN_RX; + uint64_t MB_GPIO_PIN_TX; + uint64_t MB_MAX_TIMEOUT; + uint64_t MB_TIM_AHB_FREQ; + +// uint32_t MB_UART_NUMB; +// uint32_t MB_TIM_NUMB; +}ProjectSettings_TypeDef; +extern ProjectSettings_TypeDef PROJSET; + +//#define PROJSET_MEM ((ProjectSettings_TypeDef *)SETTINGS_ADDRESS) + + +//#define HAL_FLASH_GET_TYPEPROGRAM(_val_) (sizeof(PROJSET_MEM->MB_DEVICE_ID)/2 - 1) +#define HAL_FLASH_GET_TYPEPROGRAM(_val_) FLASH_TYPEPROGRAM_WORD +#define FLASH_WRITE_SETTING(_setting_, _val_) HAL_FLASH_Program(HAL_FLASH_GET_TYPEPROGRAM(_setting_), (uint32_t)(&_setting_), (uint32_t)_val_); +#define STRUCT_WRITE_SETTING(_setting_, _val_) (_setting_ = _val_) + + +void FillStructWithDefines(void); +void SetFlagUpdateSettingsInMem(void); +void UpdateSettingsInMem(void); +void WriteSettingsToMem(void); +void FillSettingsWithDefines(void); +void CheckSettingsInFLASH(void); +int CheckIsSettingsValid(ProjectSettings_TypeDef *set_struct); + +#endif // __PROJ_SETTINGS_H_ \ No newline at end of file diff --git a/mcu_test.slxc b/mcu_test.slxc deleted file mode 100644 index 64c5e5c..0000000 Binary files a/mcu_test.slxc and /dev/null differ diff --git a/mcu_test_r2021a.slx b/mcu_test_r2021a.slx index 4e4f0ec..ddb0e24 100644 Binary files a/mcu_test_r2021a.slx and b/mcu_test_r2021a.slx differ