Mirrors_Framework/stmbl
1
0
Fork 0
mirror of https://github.com/rene-dev/stmbl.git synced 2026-09-25 17:40:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rene-dev/stmbl

Browse Source
This commit is contained in:
crinq
2014-07-21 19:21:41 +02:00
parent 0118b3e7b7 d5d5955e6f
commit bd0bee8dfd
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.c
+9 -9
View File
@@ -66,17 +66,12 @@ void output_pwm(){
void TIM2_IRQHandler(void){//1KHz
TIM_ClearITPendingBit(TIM2, TIM_IT_Update);
GPIO_SetBits(GPIOD,GPIO_Pin_11);
//GPIO_SetBits(GPIOD,GPIO_Pin_11);
mag_pos+=pi/100;
output_pwm();
GPIO_ResetBits(GPIOD,GPIO_Pin_11);
//GPIO_ResetBits(GPIOD,GPIO_Pin_11);
}
void TIM7_IRQHandler(void){//DAC int handler
TIM_ClearITPendingBit(TIM7, TIM_IT_Update);
}
void ADC_IRQHandler(void)
{
//int t1, t2;
@@ -97,6 +92,11 @@ int main(void)
while(1) // Do not exit
{
GPIO_SetBits(GPIOD,GPIO_Pin_11);
Delay(1000);
GPIO_ResetBits(GPIOD,GPIO_Pin_11);
Delay(1000);
/*if(followe){
GPIO_ResetBits(GPIOD,GPIO_Pin_15);//disable
TIM4->CCR1 = 0;
@@ -109,10 +109,10 @@ int main(void)
}
void Delay(volatile uint32_t nCount) {
//float one;
float one;
while(nCount--)
{
//one = (float) nCount;
one = (float) nCount;
}
}
src/setup.c
+9 -10
View File
@@ -96,7 +96,7 @@ void setup(){
ADC_EOCOnEachRegularChannelCmd(ADC3,DISABLE);
*/
/* pwm set up */
/* pwm set up, TIM4*/
/* Compute the prescaler value */ // 168MHz/2 / pwm frq / pwm res - 1
uint16_t PrescalerValue = (uint16_t) ((SystemCoreClock /2) / 10000 / mag_res) - 1; // = 4
@@ -107,29 +107,28 @@ void setup(){
TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up;
TIM_TimeBaseInit(TIM4, &TIM_TimeBaseStructure);
/* PWM1 Mode configuration: Channel1 */
TIM_OCInitStructure.TIM_OCMode = TIM_OCMode_PWM1;
TIM_OCInitStructure.TIM_OutputState = TIM_OutputState_Enable;
TIM_OCInitStructure.TIM_Pulse = 0;
TIM_OCInitStructure.TIM_OCPolarity = TIM_OCPolarity_High;
/* PWM1 Mode configuration: Channel1 */
TIM_OC1Init(TIM4, &TIM_OCInitStructure);
TIM_OC1PreloadConfig(TIM4, TIM_OCPreload_Enable);
/* PWM1 Mode configuration: Channel2 */
TIM_OCInitStructure.TIM_OutputState = TIM_OutputState_Enable;
TIM_OCInitStructure.TIM_Pulse = 0;
TIM_OC2Init(TIM4, &TIM_OCInitStructure);
TIM_OC2PreloadConfig(TIM4, TIM_OCPreload_Enable);
/* PWM1 Mode configuration: Channel3 */
TIM_OCInitStructure.TIM_OutputState = TIM_OutputState_Enable;
TIM_OCInitStructure.TIM_Pulse = 0;
TIM_OC3Init(TIM4, &TIM_OCInitStructure);
TIM_OC3PreloadConfig(TIM4, TIM_OCPreload_Enable);
/* int set up */
/* int set up, TIM2*/
TIM_TimeBaseStructure.TIM_ClockDivision = TIM_CKD_DIV1;
TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up;
TIM_TimeBaseStructure.TIM_Period = 8400;//1kHz
@@ -138,7 +137,7 @@ void setup(){
TIM_TimeBaseInit(TIM2, &TIM_TimeBaseStructure);
TIM_ITConfig(TIM2, TIM_IT_Update, ENABLE);
//TIM_SelectOutputTrigger(TIM2, TIM_TRGOSource_Update);//DAC?
/* int NVIC setup */
NVIC_InitStructure.NVIC_IRQChannel = TIM2_IRQn;
NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;