diff --git a/shared/f3hw.h b/shared/f3hw.h index 0265d2d7..2880420e 100644 --- a/shared/f3hw.h +++ b/shared/f3hw.h @@ -1,3 +1,4 @@ +//stmbl #define AREF 3.338// analog reference voltage #define VDIVUP 249000.0 * 2.0//HV div pullup R1,R12 @@ -10,10 +11,28 @@ #define PWM_V TIM8->CCR2 #define PWM_W TIM8->CCR1 -//ottercontrol -//#define USB_DISCONNECT_PIN GPIO_PIN_13 -//#define USB_DISCONNECT_PORT GPIOC - +#define PWM_DEADTIME 0 //io board //#define USB_CONNECT_PIN GPIO_PIN_15 //#define USB_CONNECT_PORT GPIOB + +/* +//otter +#define AREF 3.3// analog reference voltage + +#define VDIVUP 56000.0//HV div pullup R1,R12 +#define VDIVDOWN 2000.0//HV div pulldown R2,R9 + +#define LED_Pin GPIO_PIN_0 +#define LED_GPIO_Port GPIOA + +#define PWM_U TIM8->CCR1 +#define PWM_V TIM8->CCR2 +#define PWM_W TIM8->CCR3 + +//ottercontrol +#define USB_DISCONNECT_PIN GPIO_PIN_13 +#define USB_DISCONNECT_PORT GPIOC + +#define PWM_DEADTIME 50 +*/ diff --git a/stm32f303/src/tim.c b/stm32f303/src/tim.c index 7759063f..86daf51e 100644 --- a/stm32f303/src/tim.c +++ b/stm32f303/src/tim.c @@ -44,6 +44,7 @@ /* Includes ------------------------------------------------------------------*/ #include "tim.h" +#include "f3hw.h" /* USER CODE BEGIN 0 */ @@ -114,7 +115,7 @@ void MX_TIM8_Init(void) sBreakDeadTimeConfig.OffStateRunMode = TIM_OSSR_DISABLE; sBreakDeadTimeConfig.OffStateIDLEMode = TIM_OSSI_DISABLE; sBreakDeadTimeConfig.LockLevel = TIM_LOCKLEVEL_OFF; - sBreakDeadTimeConfig.DeadTime = 0; + sBreakDeadTimeConfig.DeadTime = PWM_DEADTIME; sBreakDeadTimeConfig.BreakState = TIM_BREAK_DISABLE; sBreakDeadTimeConfig.BreakPolarity = TIM_BREAKPOLARITY_HIGH; sBreakDeadTimeConfig.BreakFilter = 0;