WebSVN – EngineBay2 – Diff – /branches/stm32f103/Core/Src/main.c



          new_time = RPM_Time[next_count];
          RPM_Count_Latch = next_count;
 
          RPM_Pulsewidth = new_time - base_time; // not wrapped
 
 
          if (RPM_Pulsewidth > BREAKER_MIN)
            {
 
              RPM_Diff = new_time - last_dwell_end;
 

  hspi1.Init.Direction = SPI_DIRECTION_2LINES;
  hspi1.Init.DataSize = SPI_DATASIZE_8BIT;
  hspi1.Init.CLKPolarity = SPI_POLARITY_LOW;
  hspi1.Init.CLKPhase = SPI_PHASE_1EDGE;
  hspi1.Init.NSS = SPI_NSS_SOFT;
  hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_64;
  hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;
  hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
  hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
  hspi1.Init.CRCPolynomial = 10;
  if (HAL_SPI_Init(&hspi1) != HAL_OK)

 
  /* USER CODE BEGIN TIM2_Init 1 */
 
  /* USER CODE END TIM2_Init 1 */
  htim2.Instance = TIM2;
  htim2.Init.Prescaler = 359;
  htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
  htim2.Init.Period = 65535;
  htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
  htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
  if (HAL_TIM_Base_Init(&htim2) != HAL_OK)

 
  /* USER CODE BEGIN TIM3_Init 1 */
 
  /* USER CODE END TIM3_Init 1 */
  htim3.Instance = TIM3;
  htim3.Init.Prescaler = 359;
  htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
  htim3.Init.Period = 99;
  htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
  htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
  if (HAL_TIM_Base_Init(&htim3) != HAL_OK)

 
  /* USER CODE BEGIN TIM4_Init 1 */
 
  /* USER CODE END TIM4_Init 1 */
  htim4.Instance = TIM4;
  htim4.Init.Prescaler = 359;
  htim4.Init.CounterMode = TIM_COUNTERMODE_UP;
  htim4.Init.Period = 9999;
  htim4.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
  htim4.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
  if (HAL_TIM_Base_Init(&htim4) != HAL_OK)

Subversion Repositories EngineBay2

(root)/branches/stm32f103/Core/Src/main.c – Rev 39 → 40

Rev 39		Rev 40
Line 223...		Line 223...
223	new_time = RPM_Time[next_count];	223	new_time = RPM_Time[next_count];
224	RPM_Count_Latch = next_count;	224	RPM_Count_Latch = next_count;
225		225
226	RPM_Pulsewidth = new_time - base_time; // not wrapped	226	RPM_Pulsewidth = new_time - base_time; // not wrapped
227		227
228	// if the pulse was low,	-
229	if (RPM_Pulsewidth > BREAKER_MIN)	228	if (RPM_Pulsewidth > BREAKER_MIN)
230	{	229	{
231		230
232	RPM_Diff = new_time - last_dwell_end;	231	RPM_Diff = new_time - last_dwell_end;
233		232
Line 814...		Line 813...
814	hspi1.Init.Direction = SPI_DIRECTION_2LINES;	813	hspi1.Init.Direction = SPI_DIRECTION_2LINES;
815	hspi1.Init.DataSize = SPI_DATASIZE_8BIT;	814	hspi1.Init.DataSize = SPI_DATASIZE_8BIT;
816	hspi1.Init.CLKPolarity = SPI_POLARITY_LOW;	815	hspi1.Init.CLKPolarity = SPI_POLARITY_LOW;
817	hspi1.Init.CLKPhase = SPI_PHASE_1EDGE;	816	hspi1.Init.CLKPhase = SPI_PHASE_1EDGE;
818	hspi1.Init.NSS = SPI_NSS_SOFT;	817	hspi1.Init.NSS = SPI_NSS_SOFT;
819	hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_4;	818	hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_64;
820	hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;	819	hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;
821	hspi1.Init.TIMode = SPI_TIMODE_DISABLE;	820	hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
822	hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;	821	hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
823	hspi1.Init.CRCPolynomial = 10;	822	hspi1.Init.CRCPolynomial = 10;
824	if (HAL_SPI_Init(&hspi1) != HAL_OK)	823	if (HAL_SPI_Init(&hspi1) != HAL_OK)
Line 849...		Line 848...
849		848
850	/* USER CODE BEGIN TIM2_Init 1 */	849	/* USER CODE BEGIN TIM2_Init 1 */
851		850
852	/* USER CODE END TIM2_Init 1 */	851	/* USER CODE END TIM2_Init 1 */
853	htim2.Instance = TIM2;	852	htim2.Instance = TIM2;
854	htim2.Init.Prescaler = 719;	853	htim2.Init.Prescaler = 359;
855	htim2.Init.CounterMode = TIM_COUNTERMODE_UP;	854	htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
856	htim2.Init.Period = 65535;	855	htim2.Init.Period = 65535;
857	htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;	856	htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
858	htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;	857	htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
859	if (HAL_TIM_Base_Init(&htim2) != HAL_OK)	858	if (HAL_TIM_Base_Init(&htim2) != HAL_OK)
Line 907...		Line 906...
907		906
908	/* USER CODE BEGIN TIM3_Init 1 */	907	/* USER CODE BEGIN TIM3_Init 1 */
909		908
910	/* USER CODE END TIM3_Init 1 */	909	/* USER CODE END TIM3_Init 1 */
911	htim3.Instance = TIM3;	910	htim3.Instance = TIM3;
912	htim3.Init.Prescaler = 719;	911	htim3.Init.Prescaler = 359;
913	htim3.Init.CounterMode = TIM_COUNTERMODE_UP;	912	htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
914	htim3.Init.Period = 99;	913	htim3.Init.Period = 99;
915	htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;	914	htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
916	htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;	915	htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
917	if (HAL_TIM_Base_Init(&htim3) != HAL_OK)	916	if (HAL_TIM_Base_Init(&htim3) != HAL_OK)
Line 968...		Line 967...
968		967
969	/* USER CODE BEGIN TIM4_Init 1 */	968	/* USER CODE BEGIN TIM4_Init 1 */
970		969
971	/* USER CODE END TIM4_Init 1 */	970	/* USER CODE END TIM4_Init 1 */
972	htim4.Instance = TIM4;	971	htim4.Instance = TIM4;
973	htim4.Init.Prescaler = 719;	972	htim4.Init.Prescaler = 359;
974	htim4.Init.CounterMode = TIM_COUNTERMODE_UP;	973	htim4.Init.CounterMode = TIM_COUNTERMODE_UP;
975	htim4.Init.Period = 9999;	974	htim4.Init.Period = 9999;
976	htim4.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;	975	htim4.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
977	htim4.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;	976	htim4.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
978	if (HAL_TIM_Base_Init(&htim4) != HAL_OK)	977	if (HAL_TIM_Base_Init(&htim4) != HAL_OK)