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

 // scale for filtered samples
 #define Scale 1024.0
 // storage for ADC
-uint16_t ADC_Samples[ADC_CHANNELS];
+uint16_t ADC_Samples[ADC_CHANNELS] = { [0 ... ADC_CHANNELS-1] = 0 };
-uint32_t FILT_Samples[ADC_CHANNELS]; // filtered ADC samples * Scale
+uint32_t FILT_Samples[ADC_CHANNELS] = { [0 ... ADC_CHANNELS-1] = 0 }; // filtered ADC samples * Scale
 #define NOM_VREF 3.3
 // initial ADC vref
 float  adc_vref   = NOM_VREF;
 unsigned int RPM_Period_Ptr = 0;
 unsigned int Coded_RPM = 0;
 unsigned int Coded_CHT = 0;
-uint32_t Power_CHT_Timer;
+uint32_t PowerTempTimer;
 uint16_t Starter_Debounce = 0;
 /* USER CODE END PV */
   PutCharSerial (&uc1, ((x) >> 6) & 0x3F);
   PutCharSerial (&uc1, (x) & 0x3F);
+}
 void
-init_ADC_filter ()
-{
-  int i;
-  for (i = 0; i < ADC_CHANNELS; i++)
-    {
-      FILT_Samples[i] = 0;
-    }
-}
-void
 filter_ADC_samples ()
+{
   int i;
   for (i = 0; i < ADC_CHANNELS; i++)
+    {
 FunctionalState CHT_Enable = ENABLE;
 #define CORR 3
-uint16_t CHT_Observations[2] =
+uint16_t Temp_Observations[NUM_SPI_TEMP_SENS] = { [0 ... NUM_SPI_TEMP_SENS-1] = 0 };
-  { 0, 0 };
-// look for the trigger pin being high then low - the points
-// are opening, and skip the reading
+/// \param item The array index to send
+/// \param instance The instance to send over the bus
+/// \param type the code to use for this observation
 void
-ProcessCHT (int instance)
+ProcessTemp (char item, int instance, enum PLX_Observations type)
+{
+  if (item > NUM_SPI_TEMP_SENS)
+    return;
-  plx_sendword (PLX_X_CHT);
+  plx_sendword (type);
   PutCharSerial (&uc1, instance);
-  plx_sendword (CHT_Observations[instance]);
+  plx_sendword (Temp_Observations[item]);
+}
+/// \brief Reset the temperature chip select system
+void resetTempCS(void)
+{
+     HAL_GPIO_WritePin (SPI_CS_D_GPIO_Port, SPI_CS_D_Pin, GPIO_PIN_SET);
+     HAL_GPIO_WritePin (SPI_CS_Clk_GPIO_Port, SPI_CS_Clk_Pin,
+                         GPIO_PIN_SET);
+     for (int i = 0 ; i < 4; i++)
+       {
+             HAL_GPIO_WritePin (SPI_CS_Clk_GPIO_Port, SPI_CS_Clk_Pin,
+                                 GPIO_PIN_RESET);
+             HAL_GPIO_WritePin (SPI_CS_Clk_GPIO_Port, SPI_CS_Clk_Pin,
+                                 GPIO_PIN_SET);
+       }
+     // prepare for selecting next pin
+     HAL_GPIO_WritePin (SPI_CS_D_GPIO_Port, SPI_CS_D_Pin, GPIO_PIN_RESET);
+}
+void nextTempCS(void)
+{
+  HAL_GPIO_WritePin (SPI_CS_Clk_GPIO_Port, SPI_CS_Clk_Pin,
+                         GPIO_PIN_RESET);
+  HAL_GPIO_WritePin (SPI_CS_Clk_GPIO_Port, SPI_CS_Clk_Pin,
+                         GPIO_PIN_SET);
+  HAL_GPIO_WritePin (SPI_CS_D_GPIO_Port, SPI_CS_D_Pin, GPIO_PIN_SET);
+}
 void
-EnableCHT (FunctionalState state)
+EnableTempSensors (FunctionalState state)
+{
   GPIO_InitTypeDef GPIO_InitStruct;
   CHT_Enable = state;
   /* enable SPI in live mode : assume it and its GPIOs are already initialised in SPI mode */
   if (state == ENABLE)
+    {
       HAL_GPIO_WritePin (ENA_AUX_5V_GPIO_Port, ENA_AUX_5V_Pin, GPIO_PIN_SET);
-      HAL_GPIO_WritePin (SPI_NS_Temp_GPIO_Port, SPI_NS_Temp_Pin, GPIO_PIN_SET);
-      HAL_GPIO_WritePin (SPI_NS_Temp2_GPIO_Port, SPI_NS_Temp2_Pin,
-                         GPIO_PIN_SET);
+      resetTempCS();
       /* put the SPI pins back into SPI AF mode */
       GPIO_InitStruct.Pin = SPI1_MOSI_Pin | SPI1_MISO_Pin | SPI1_SCK_Pin;
       GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
       GPIO_InitStruct.Pull = GPIO_NOPULL;
+    }
   else
+    {
       /*  Power down the SPI interface taking signals all low */
       HAL_GPIO_WritePin (ENA_AUX_5V_GPIO_Port, ENA_AUX_5V_Pin, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin (SPI_NS_Temp_GPIO_Port, SPI_NS_Temp_Pin,
-                         GPIO_PIN_RESET);
-      HAL_GPIO_WritePin (SPI_NS_Temp2_GPIO_Port, SPI_NS_Temp2_Pin,
-                         GPIO_PIN_RESET);
       HAL_GPIO_WritePin (SPI1_SCK_GPIO_Port,
                          SPI1_MOSI_Pin | SPI1_MISO_Pin | SPI1_SCK_Pin,
                          GPIO_PIN_RESET);
   HAL_TIM_Base_MspInit (&htim3);
   __HAL_TIM_ENABLE_IT(&htim3, TIM_IT_UPDATE);
   uint32_t Ticks = HAL_GetTick () + 100;
   int CalCounter = 0;
-  Power_CHT_Timer = HAL_GetTick () + 1000; /* wait 10 seconds before powering up the CHT sensor */
+  PowerTempTimer = HAL_GetTick () + 1000; /* wait 10 seconds before powering up the CHT sensor */
   /* USER CODE END 2 */
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
+            }
+        }
       if (Starter_Debounce == STARTER_LIMIT)
+        {
-          EnableCHT (DISABLE);
+          EnableTempSensors (DISABLE);
-          Power_CHT_Timer = HAL_GetTick () + 1000;
+          PowerTempTimer = HAL_GetTick () + 1000;
+        }
       else
-      /* if the Power_CHT_Timer is set then wait for it to timeout, then power up CHT */
+      /* if the PowerTempTimer is set then wait for it to timeout, then power up CHT */
+        {
-          if ((Power_CHT_Timer > 0) && (HAL_GetTick () > Power_CHT_Timer))
+          if ((PowerTempTimer > 0) && (HAL_GetTick () > PowerTempTimer))
+            {
-              EnableCHT (ENABLE);
+              EnableTempSensors (ENABLE);
-              Power_CHT_Timer = 0;
+              PowerTempTimer = 0;
+            }
+        }
       // check to see if we have any incoming data, copy and append if so, if no data then create our own frames.
       int c;
+        {
           send = 0;
           // send the observations
           ProcessRPM (0);
+          ProcessTemp (0,0,PLX_X_CHT);
+          ProcessTemp (1,1,PLX_X_CHT);
-          ProcessCHT (0);
+          ProcessTemp (2,0,PLX_AIT);
-          ProcessCHT (1);
+          ProcessTemp (3,1,PLX_AIT);
           ProcessBatteryVoltage (0); // Batt 1
           ProcessBatteryVoltage (1); // Batt 2
           ProcessCPUTemperature (0); //  built in temperature sensor
           ProcessMAP (0);
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(LED_Blink_GPIO_Port, LED_Blink_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOB, SPI_NS_Temp_Pin|SPI_NS_Temp2_Pin|ENA_AUX_5V_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(GPIOB, SPI_CS_D_Pin|SPI_CS_Clk_Pin|ENA_AUX_5V_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin : LED_Blink_Pin */
   GPIO_InitStruct.Pin = LED_Blink_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(LED_Blink_GPIO_Port, &GPIO_InitStruct);
-  /*Configure GPIO pins : SPI_NS_Temp_Pin SPI_NS_Temp2_Pin ENA_AUX_5V_Pin */
+  /*Configure GPIO pins : SPI_CS_D_Pin SPI_CS_Clk_Pin ENA_AUX_5V_Pin */
-  GPIO_InitStruct.Pin = SPI_NS_Temp_Pin|SPI_NS_Temp2_Pin|ENA_AUX_5V_Pin;
+  GPIO_InitStruct.Pin = SPI_CS_D_Pin|SPI_CS_Clk_Pin|ENA_AUX_5V_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);

Subversion Repositories EngineBay2

(root)/branches/stm32f103/Core/Src/main.c – Rev 41 → 42