PWM running

zhusstt · Aug 30, 2012 · a97bbb7 · a97bbb7
1 parent 97d1b6b
commit a97bbb7
Show file tree

Hide file tree

Showing 22 changed files with 714 additions and 690 deletions.
diff --git a/Sensors/ppg_new.o b/Sensors/ppg_new.o
diff --git a/Sensors/pressure.o b/Sensors/pressure.o
diff --git a/Util/USB/hw_config.o b/Util/USB/hw_config.o
diff --git a/Util/USB/mass_mal.o b/Util/USB/mass_mal.o
diff --git a/Util/USB/memory.o b/Util/USB/memory.o
diff --git a/Util/USB/usb_prop.o b/Util/USB/usb_prop.o
diff --git a/Util/USB/usb_scsi.o b/Util/USB/usb_scsi.o
diff --git a/Util/fat_fs/src/sd_spi_stm32.o b/Util/fat_fs/src/sd_spi_stm32.o
diff --git a/Util/rprintf.o b/Util/rprintf.o
diff --git a/adc.o b/adc.o
diff --git a/gpio.o b/gpio.o
diff --git a/interrupts.o b/interrupts.o
diff --git a/main.bin b/main.bin
diff --git a/main.elf b/main.elf
diff --git a/main.map b/main.map
diff --git a/main.o b/main.o
diff --git a/pwr.o b/pwr.o
diff --git a/tests/timsim/timsim.m b/tests/timsim/timsim.m
@@ -0,0 +1,26 @@
+function [sig]=timsim(counter3,counter2,counter4)
+sig=[];
+for(a=1:1161216)
+	counter3+=1;
+	if(counter3<5983)
+		counter2+=1;
+		if(counter2<5921)
+			counter4+=1;
+			if(counter4==5983)
+				counter4=0;
+			endif
+		else
+			if(counter2==5952)
+				counter2=0;
+			endif
+		endif
+	else
+		if(counter3==6048)
+			counter3=0;
+		endif
+	endif
+	sig(a,:)=[counter3,counter2,counter4];
+	printf("%f   \r",a/1161216);
+	fflush(stdout);
+endfor
+endfunction  
diff --git a/timer.c b/timer.c
@@ -132,9 +132,8 @@ void setup_pwm(void) {
   TIM_SelectOutputTrigger(TIM2,TIM_TRGOSource_OC1Ref);
   TIM_OC1Init(TIM2, &TIM_OCInitStructure);		//Tim2,ch1 used for gating
   TIM_OC1PreloadConfig(TIM2, TIM_OCPreload_Enable);
-  //TIM_SelectMasterSlaveMode(TIM4,TIM_MasterSlaveMode_Enable);
   #if PPG_CHANNELS>1
-  //TIM_ETRConfig(TIM4,TIM_ExtTRGPSC_OFF,TIM_ExtTRGPolarity_NonInverted,0x00);//Setup timer4 to trigger off timer2 with no filtering
+  TIM_SelectMasterSlaveMode(TIM4,TIM_MasterSlaveMode_Enable);
   TIM_SelectInputTrigger(TIM4,TIM_TS_ITR1);		//Tim4 off tim2
   TIM_SelectSlaveMode(TIM4,TIM_SlaveMode_Gated);	//Tim4 is gated by the tim2 channel1 input
   #endif
@@ -148,8 +147,8 @@ void setup_pwm(void) {
     TIM_Cmd(TIM2, ENABLE);
   #else
     #if PPG_CHANNELS>2
-      //TIM4->CNT=PWM_PERIOD_CENTER/2;//This causes the third timer to be in antiphase, giving reduce peak ADC signal
-      //TIM_Cmd(TIM4, ENABLE);
+      TIM4->CNT=PWM_PERIOD_CENTER/2;//This causes the third timer to be in antiphase, giving reduce peak ADC signal
+      TIM_Cmd(TIM4, ENABLE);
     #endif
     #if PPG_CHANNELS>1
       TIM_Cmd(TIM2, ENABLE);

diff --git a/timer.h b/timer.h
@@ -4,7 +4,7 @@
 #define MAX_DUTY 2047*3/4	/*max duty cycle for the motor - dont want to risk going to 100% as it will overrev motor*/
 #define PWM_RES MAX_DUTY	/*motor pwm resolution*/
 
-#define PWM_PERIOD_TWO 5982ul
+#define PWM_PERIOD_TWO 6047ul//5982ul
 #define PWM_PERIOD_ONE 6047ul
 #define PWM_PERIOD_ZERO 5951ul
 

diff --git a/timer.o b/timer.o
diff --git a/usart.o b/usart.o