WebSVN – EDIS_Ignition – Diff – /trunk/Core/Src/main.c

 // compensated pressure in mb * 100
 uint32_t comp_pres = 0;
 // compensated temperature
 int32_t comp_temp = -10000;
+int32_t timing = 0;
 /* USER CODE END PV */
 /* Private function prototypes -----------------------------------------------*/
 void SystemClock_Config(void);
 static void MX_GPIO_Init(void);
   ConvToPLXAddr(PLX_MAP, &info);
   ConvToPLXReading(ConveriMFDData2Raw(PLX_MAP, PRESSURE_kPa, comp_pres / 1000.0), &info);
   int i;
   for (i = 0; i < sizeof(PLX_SensorInfo); ++i)
     PutCharSerial(&uc2, info.bytes[i]);
+  ConvToPLXInstance(0, &info);
+  ConvToPLXAddr(PLX_Timing, &info);
+  ConvToPLXReading(ConveriMFDData2Raw(PLX_Timing, 0, timing / TIMING_SCALE), &info);
+  for (i = 0; i < sizeof(PLX_SensorInfo); ++i)
+    PutCharSerial(&uc2, info.bytes[i]);
+}
 void triggerSAW()
+{
-  // trigger SAW timer, timer 1
+  // trigger SAW timer, timer 1##pragma endregion
   __HAL_TIM_ENABLE(&htim1);
+}
 /* USER CODE END PFP */
   MX_SPI1_Init();
   MX_USART2_UART_Init();
   MX_TIM3_Init();
   MX_IWDG_Init();
   /* USER CODE BEGIN 2 */
+  init_usart_ctl(&uc2, &huart2);
   cc_init();
+  HAL_TIM_Base_MspInit(&htim1);
   HAL_TIM_Base_Start(&htim1);
+  HAL_TIM_OC_Start(&htim1, TIM_CHANNEL_1);
+  // initialise all the STMCubeMX stuff
+  HAL_TIM_Base_MspInit(&htim2);
+  // Start the counter
+  HAL_TIM_Base_Start(&htim2);
+  // Start the input capture and the rising edge interrupt
+  HAL_TIM_IC_Start_IT(&htim2, TIM_CHANNEL_1);
+  // Start the input capture and the falling edge interrupt
+  HAL_TIM_IC_Start_IT(&htim2, TIM_CHANNEL_2);
   __HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, 5); // delay of 5 uS
   HAL_I2C_ClearBusyFlagErrata_2_14_7(&hi2c1);
   MX_I2C1_Init();
   // used to store data
   PLX_SensorInfo info;
   int infoCount = -1;
-  HAL_IWDG_Init(&hiwdg);
+  // HAL_IWDG_Init(&hiwdg);
   /* USER CODE END 2 */
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
   while (1)
       break;
     case 1:
       if (HAL_GetTick() > displayOff)
+      {
-        intensity = 0;
+        intensity = 1; // was 0
+      }
     default:
       break;
+    }
     cc_display(0, intensity);
-    if (HAL_GetTick() - lastTick > 200)
+    if (HAL_GetTick() - lastTick > T100MS)
+    {
       lastTick = HAL_GetTick();
       /* Reading the raw data from sensor */
       struct bmp280_uncomp_data ucomp_data;
       uint8_t rslt = bmp280_get_uncomp_data(&ucomp_data, &bmp);
-      uint32_t comp_pres = 0;
-      int32_t comp_temp = -10000;
       if (rslt == 0)
+      {
         uint8_t rslt2 = bmp280_get_comp_pres_32bit(&comp_pres, ucomp_data.uncomp_press, &bmp);
         uint8_t rslt3 = bmp280_get_comp_temp_32bit(&comp_temp, ucomp_data.uncomp_temp, &bmp);
         if (rslt2 == 0 && rslt3 == 0)
           cc_feed_env(comp_pres, comp_temp);
+      }
-    }
-    // compute RPM value, feed to display
+      // compute RPM value, feed to display
-    int rpm = CalculateRPM();
+      int rpm = CalculateRPM();
-    if (rpm > 0)
+      if (rpm > 0)
-    {
+      {
-      cc_feed_rpm(rpm);
+        cc_feed_rpm(rpm);
-      // compute timing value, feed to display
+        // compute timing value, feed to display
-      int timing = mapTiming(rpm, 1000 - comp_pres / 100);
+        timing = mapTiming(rpm, 1000 - comp_pres / 100);
-      cc_feed_timing(timing);
+        cc_feed_timing(timing);
-      int microsecs = mapTimingToMicroseconds(timing, 0);
+        int microsecs = mapTimingToMicroseconds(timing, 0);
-      __HAL_TIM_SET_AUTORELOAD(&htim1, microsecs + SAW_DELAY);
+        __HAL_TIM_SET_AUTORELOAD(&htim1, microsecs + SAW_DELAY);
+      }
+    }
     // Handle PLX
     // poll the  input for a stop bit or timeout
     if (PollSerial(&uc2))
+    {
+      HAL_IWDG_Refresh(&hiwdg);
       timeout = HAL_GetTick() + T100MS * 2;
       char c = GetCharSerial(&uc2);
       if (c != PLX_Stop)
+      {
         PutCharSerial(&uc2, c); // echo all but the stop bit
+      }
       else
+    }
     // sort out auto-sending
     if (HAL_GetTick() > timeout)
+    {
+      PutCharSerial(&uc2, PLX_Start);
       timeout = HAL_GetTick() + T100MS;
       send = 1;
+    }
     if (send)
   /* USER CODE BEGIN IWDG_Init 1 */
   /* USER CODE END IWDG_Init 1 */
   hiwdg.Instance = IWDG;
   hiwdg.Init.Prescaler = IWDG_PRESCALER_4;
-  hiwdg.Init.Reload = 819;
+  hiwdg.Init.Reload = 1000;
   if (HAL_IWDG_Init(&hiwdg) != HAL_OK)
+  {
     Error_Handler();
+  }
   /* USER CODE BEGIN IWDG_Init 2 */
   sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
   if (HAL_TIM_ConfigClockSource(&htim1, &sClockSourceConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
-  if (HAL_TIM_OC_Init(&htim1) != HAL_OK)
+  if (HAL_TIM_PWM_Init(&htim1) != HAL_OK)
+  {
     Error_Handler();
+  }
   if (HAL_TIM_OnePulse_Init(&htim1, TIM_OPMODE_SINGLE) != HAL_OK)
+  {
   sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
   if (HAL_TIMEx_MasterConfigSynchronization(&htim1, &sMasterConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
-  sConfigOC.OCMode = TIM_OCMODE_ACTIVE;
+  sConfigOC.OCMode = TIM_OCMODE_PWM1;
   sConfigOC.Pulse = SAW_DELAY;
-  sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
+  sConfigOC.OCPolarity = TIM_OCPOLARITY_LOW;
   sConfigOC.OCNPolarity = TIM_OCNPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
   sConfigOC.OCIdleState = TIM_OCIDLESTATE_RESET;
   sConfigOC.OCNIdleState = TIM_OCNIDLESTATE_RESET;
-  if (HAL_TIM_OC_ConfigChannel(&htim1, &sConfigOC, TIM_CHANNEL_1) != HAL_OK)
+  if (HAL_TIM_PWM_ConfigChannel(&htim1, &sConfigOC, TIM_CHANNEL_1) != HAL_OK)
+  {
     Error_Handler();
+  }
-  __HAL_TIM_ENABLE_OCxPRELOAD(&htim1, TIM_CHANNEL_1);
   sBreakDeadTimeConfig.OffStateRunMode = TIM_OSSR_DISABLE;
   sBreakDeadTimeConfig.OffStateIDLEMode = TIM_OSSI_DISABLE;
   sBreakDeadTimeConfig.LockLevel = TIM_LOCKLEVEL_OFF;
   sBreakDeadTimeConfig.DeadTime = 0;
   sBreakDeadTimeConfig.BreakState = TIM_BREAK_DISABLE;
   /* USER CODE BEGIN TIM2_Init 0 */
   /* USER CODE END TIM2_Init 0 */
   TIM_ClockConfigTypeDef sClockSourceConfig = {0};
-  TIM_SlaveConfigTypeDef sSlaveConfig = {0};
   TIM_MasterConfigTypeDef sMasterConfig = {0};
+  TIM_IC_InitTypeDef sConfigIC = {0};
   /* USER CODE BEGIN TIM2_Init 1 */
   /* USER CODE END TIM2_Init 1 */
   htim2.Instance = TIM2;
-  htim2.Init.Prescaler = 71;
+  htim2.Init.Prescaler = 719;
   htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim2.Init.Period = 9;
+  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)
+  {
     Error_Handler();
   sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
   if (HAL_TIM_ConfigClockSource(&htim2, &sClockSourceConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
-  if (HAL_TIM_OnePulse_Init(&htim2, TIM_OPMODE_SINGLE) != HAL_OK)
+  if (HAL_TIM_IC_Init(&htim2) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  sSlaveConfig.SlaveMode = TIM_SLAVEMODE_TRIGGER;
-  sSlaveConfig.InputTrigger = TIM_TS_ETRF;
-  sSlaveConfig.TriggerPolarity = TIM_TRIGGERPOLARITY_INVERTED;
-  sSlaveConfig.TriggerPrescaler = TIM_TRIGGERPRESCALER_DIV1;
-  sSlaveConfig.TriggerFilter = 15;
-  if (HAL_TIM_SlaveConfigSynchro(&htim2, &sSlaveConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
   sMasterConfig.MasterOutputTrigger = TIM_TRGO_UPDATE;
   sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
   if (HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
+  sConfigIC.ICPolarity = TIM_INPUTCHANNELPOLARITY_RISING;
+  sConfigIC.ICSelection = TIM_ICSELECTION_DIRECTTI;
+  sConfigIC.ICPrescaler = TIM_ICPSC_DIV1;
+  sConfigIC.ICFilter = 0;
+  if (HAL_TIM_IC_ConfigChannel(&htim2, &sConfigIC, TIM_CHANNEL_1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sConfigIC.ICPolarity = TIM_INPUTCHANNELPOLARITY_FALLING;
+  sConfigIC.ICSelection = TIM_ICSELECTION_INDIRECTTI;
+  if (HAL_TIM_IC_ConfigChannel(&htim2, &sConfigIC, TIM_CHANNEL_2) != HAL_OK)
+  {
+    Error_Handler();
+  }
   /* USER CODE BEGIN TIM2_Init 2 */
   /* USER CODE END TIM2_Init 2 */
+}

Subversion Repositories EDIS_Ignition

(root)/trunk/Core/Src/main.c – Rev 4 → 5