Всякие фиксы модели и заготовки для АЦП
И почему то все равно MATLAB намертво блокирует mingw64.... Приходится перезапускать матлаб для перекомпиляции
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
**************************************************************************/
|
||||
#include "stm32_matlab_conf.h"
|
||||
#include "mcu_wrapper_conf.h"
|
||||
#include "app_includes.h"
|
||||
|
||||
MCU_MemoryTypeDef MCU_MEM;
|
||||
DBGMCU_TypeDef DEBUG_MCU;
|
||||
@@ -40,6 +41,17 @@ void deInitialize_MCU(void)
|
||||
// обнуление структур, симулирующих память МК
|
||||
memset(&MCU_MEM, 0, sizeof(MCU_MEM));
|
||||
memset(&MCU_CORTEX_MEM, 0, sizeof(MCU_CORTEX_MEM));
|
||||
memset(&htim1, 0, sizeof(htim1));
|
||||
|
||||
|
||||
ClearStruct(htim1);
|
||||
ClearStruct(htim3);
|
||||
ClearStruct(htim8);
|
||||
ClearStruct(htim11);
|
||||
ClearStruct(htim12);
|
||||
ClearStruct(htim13);
|
||||
ClearStruct(hadc3);
|
||||
ClearStruct(hdma_adc3);
|
||||
}
|
||||
|
||||
/*------------------------------FUNCTIONS--------------------------------*/
|
||||
@@ -164,9 +176,9 @@ void Init_TIM_SIM(void)
|
||||
tim5s.Channels.OC4_GPIOx = GPIOA;
|
||||
tim5s.Channels.OC4_PIN_SHIFT = 3;
|
||||
#endif
|
||||
#ifdef USE_TIMx
|
||||
#ifdef USE_TIM6
|
||||
memset(&tim6s, 0, sizeof(tim6s));
|
||||
tim6s.tx_cnt = TIMx->CNT;
|
||||
tim6s.tx_cnt = TIM6->CNT;
|
||||
tim6s.tx_step = hmcu.sSimSampleTime * ABP1_TIMS_Value;
|
||||
|
||||
tim6s.Channels.OC1_GPIOx = GPIOA;
|
||||
@@ -178,6 +190,118 @@ void Init_TIM_SIM(void)
|
||||
tim6s.Channels.OC4_GPIOx = GPIOA;
|
||||
tim6s.Channels.OC4_PIN_SHIFT = 0;
|
||||
#endif
|
||||
#ifdef USE_TIM7
|
||||
memset(&tim7s, 0, sizeof(tim7s));
|
||||
tim7s.tx_cnt = TIM7->CNT;
|
||||
tim7s.tx_step = hmcu.sSimSampleTime * ABP1_TIMS_Value;
|
||||
|
||||
tim7s.Channels.OC1_GPIOx = GPIOA;
|
||||
tim7s.Channels.OC1_PIN_SHIFT = 0;
|
||||
tim7s.Channels.OC2_GPIOx = GPIOA;
|
||||
tim7s.Channels.OC2_PIN_SHIFT = 0;
|
||||
tim7s.Channels.OC3_GPIOx = GPIOA;
|
||||
tim7s.Channels.OC3_PIN_SHIFT = 0;
|
||||
tim7s.Channels.OC4_GPIOx = GPIOA;
|
||||
tim7s.Channels.OC4_PIN_SHIFT = 0;
|
||||
#endif
|
||||
#ifdef USE_TIM8
|
||||
memset(&tim8s, 0, sizeof(tim8s));
|
||||
tim8s.tx_cnt = TIM8->CNT;
|
||||
tim8s.tx_step = hmcu.sSimSampleTime * ABP2_TIMS_Value;
|
||||
|
||||
tim8s.Channels.OC1_GPIOx = GPIOA;
|
||||
tim8s.Channels.OC1_PIN_SHIFT = 0;
|
||||
tim8s.Channels.OC2_GPIOx = GPIOA;
|
||||
tim8s.Channels.OC2_PIN_SHIFT = 0;
|
||||
tim8s.Channels.OC3_GPIOx = GPIOA;
|
||||
tim8s.Channels.OC3_PIN_SHIFT = 0;
|
||||
tim8s.Channels.OC4_GPIOx = GPIOA;
|
||||
tim8s.Channels.OC4_PIN_SHIFT = 0;
|
||||
#endif
|
||||
#ifdef USE_TIM9
|
||||
memset(&tim9s, 0, sizeof(tim9s));
|
||||
tim9s.tx_cnt = TIM9->CNT;
|
||||
tim9s.tx_step = hmcu.sSimSampleTime * ABP2_TIMS_Value;
|
||||
|
||||
tim9s.Channels.OC1_GPIOx = GPIOA;
|
||||
tim9s.Channels.OC1_PIN_SHIFT = 0;
|
||||
tim9s.Channels.OC2_GPIOx = GPIOA;
|
||||
tim9s.Channels.OC2_PIN_SHIFT = 0;
|
||||
tim9s.Channels.OC3_GPIOx = GPIOA;
|
||||
tim9s.Channels.OC3_PIN_SHIFT = 0;
|
||||
tim9s.Channels.OC4_GPIOx = GPIOA;
|
||||
tim9s.Channels.OC4_PIN_SHIFT = 0;
|
||||
#endif
|
||||
#ifdef USE_TIM10
|
||||
memset(&tim10s, 0, sizeof(tim10s));
|
||||
tim10s.tx_cnt = TIM10->CNT;
|
||||
tim10s.tx_step = hmcu.sSimSampleTime * ABP2_TIMS_Value;
|
||||
|
||||
tim10s.Channels.OC1_GPIOx = GPIOA;
|
||||
tim10s.Channels.OC1_PIN_SHIFT = 0;
|
||||
tim10s.Channels.OC2_GPIOx = GPIOA;
|
||||
tim10s.Channels.OC2_PIN_SHIFT = 0;
|
||||
tim10s.Channels.OC3_GPIOx = GPIOA;
|
||||
tim10s.Channels.OC3_PIN_SHIFT = 0;
|
||||
tim10s.Channels.OC4_GPIOx = GPIOA;
|
||||
tim10s.Channels.OC4_PIN_SHIFT = 0;
|
||||
#endif
|
||||
#ifdef USE_TIM11
|
||||
memset(&tim11s, 0, sizeof(tim11s));
|
||||
tim11s.tx_cnt = TIM11->CNT;
|
||||
tim11s.tx_step = hmcu.sSimSampleTime * ABP2_TIMS_Value;
|
||||
|
||||
tim11s.Channels.OC1_GPIOx = GPIOA;
|
||||
tim11s.Channels.OC1_PIN_SHIFT = 0;
|
||||
tim11s.Channels.OC2_GPIOx = GPIOA;
|
||||
tim11s.Channels.OC2_PIN_SHIFT = 0;
|
||||
tim11s.Channels.OC3_GPIOx = GPIOA;
|
||||
tim11s.Channels.OC3_PIN_SHIFT = 0;
|
||||
tim11s.Channels.OC4_GPIOx = GPIOA;
|
||||
tim11s.Channels.OC4_PIN_SHIFT = 0;
|
||||
#endif
|
||||
#ifdef USE_TIM12
|
||||
memset(&tim12s, 0, sizeof(tim12s));
|
||||
tim12s.tx_cnt = TIM12->CNT;
|
||||
tim12s.tx_step = hmcu.sSimSampleTime * ABP1_TIMS_Value;
|
||||
|
||||
tim12s.Channels.OC1_GPIOx = GPIOA;
|
||||
tim12s.Channels.OC1_PIN_SHIFT = 0;
|
||||
tim12s.Channels.OC2_GPIOx = GPIOA;
|
||||
tim12s.Channels.OC2_PIN_SHIFT = 0;
|
||||
tim12s.Channels.OC3_GPIOx = GPIOA;
|
||||
tim12s.Channels.OC3_PIN_SHIFT = 0;
|
||||
tim12s.Channels.OC4_GPIOx = GPIOA;
|
||||
tim12s.Channels.OC4_PIN_SHIFT = 0;
|
||||
#endif
|
||||
#ifdef USE_TIM13
|
||||
memset(&tim13s, 0, sizeof(tim13s));
|
||||
tim13s.tx_cnt = TIM13->CNT;
|
||||
tim13s.tx_step = hmcu.sSimSampleTime * ABP1_TIMS_Value;
|
||||
|
||||
tim13s.Channels.OC1_GPIOx = GPIOA;
|
||||
tim13s.Channels.OC1_PIN_SHIFT = 0;
|
||||
tim13s.Channels.OC2_GPIOx = GPIOA;
|
||||
tim13s.Channels.OC2_PIN_SHIFT = 0;
|
||||
tim13s.Channels.OC3_GPIOx = GPIOA;
|
||||
tim13s.Channels.OC3_PIN_SHIFT = 0;
|
||||
tim13s.Channels.OC4_GPIOx = GPIOA;
|
||||
tim13s.Channels.OC4_PIN_SHIFT = 0;
|
||||
#endif
|
||||
#ifdef USE_TIM14
|
||||
memset(&tim14s, 0, sizeof(tim14s));
|
||||
tim14s.tx_cnt = TIM14->CNT;
|
||||
tim14s.tx_step = hmcu.sSimSampleTime * ABP1_TIMS_Value;
|
||||
|
||||
tim14s.Channels.OC1_GPIOx = GPIOA;
|
||||
tim14s.Channels.OC1_PIN_SHIFT = 0;
|
||||
tim14s.Channels.OC2_GPIOx = GPIOA;
|
||||
tim14s.Channels.OC2_PIN_SHIFT = 0;
|
||||
tim14s.Channels.OC3_GPIOx = GPIOA;
|
||||
tim14s.Channels.OC3_PIN_SHIFT = 0;
|
||||
tim14s.Channels.OC4_GPIOx = GPIOA;
|
||||
tim14s.Channels.OC4_PIN_SHIFT = 0;
|
||||
#endif
|
||||
}
|
||||
/*-------------------------------TIMERS----------------------------------*/
|
||||
//-----------------------------------------------------------------------//
|
||||
|
||||
Reference in New Issue
Block a user