WebSVN – DashDisplay – Diff – /branches/Dashboard_L152_v2/Src/main.c

 #include "libPLX/plx.h"
 #include "libSerial/serial.H"
 #include "libSmallPrintf/small_printf.h"
 #include "libNMEA/nmea.h"
 #include "switches.h"
-#include<string.h>
+#include <string.h>
 /* USER CODE END Includes */
 /* Private typedef -----------------------------------------------------------*/
 /* USER CODE BEGIN PTD */
 /* USER CODE BEGIN PM */
 /* USER CODE END PM */
 /* Private variables ---------------------------------------------------------*/
+I2C_HandleTypeDef hi2c1;
 SPI_HandleTypeDef hspi1;
 TIM_HandleTypeDef htim2;
 TIM_HandleTypeDef htim3;
 TIM_HandleTypeDef htim9;
 context_t contexts[MAX_DISPLAYS];
 /* timeout when the ignition is switched off */
 #define IGNITION_OFF_TIMEOUT 30000UL
 // 500mS per logger period.
 #define LOGGER_INTERVAL 500UL
 const int DialTimeout = 10000; // about 10 seconds after twiddle, save the dial position.
 nvram_info_t dial_nvram[MAX_DISPLAYS] __attribute__((section(".NVRAM_Data")));
 static void MX_USART3_UART_Init(void);
 static void MX_TIM3_Init(void);
 static void MX_TIM9_Init(void);
 static void MX_TIM2_Init(void);
 static void MX_UART4_Init(void);
+static void MX_I2C1_Init(void);
 /* USER CODE BEGIN PFP */
 // the dial is the switch number we are using.
 // suppress is the ItemIndex we wish to suppress on this display
 int DisplayCurrent(int dial, int suppress)
   rmc_length = length < sizeof(rmc_buff) ? length : sizeof(rmc_buff);
   memcpy(rmc_buff, data, length);
   return 0;
+}
 // check if bluetooth connected
 uint8_t btConnected()
+{
-  return  HAL_GPIO_ReadPin(BT_STATE_GPIO_Port, BT_STATE_Pin) == GPIO_PIN_SET;
+  return HAL_GPIO_ReadPin(BT_STATE_GPIO_Port, BT_STATE_Pin) == GPIO_PIN_SET;
+}
 /* USER CODE END PFP */
 /* Private user code ---------------------------------------------------------*/
   MX_USART3_UART_Init();
   MX_TIM3_Init();
   MX_TIM9_Init();
   MX_TIM2_Init();
   MX_UART4_Init();
+  MX_I2C1_Init();
   /* USER CODE BEGIN 2 */
   /* Turn on USART1 IRQ */
   HAL_NVIC_SetPriority(USART1_IRQn, 2, 0);
   HAL_NVIC_EnableIRQ(USART1_IRQn);
   cc_init();
   int i;
   for (i = 0; i < 2; i++)
+  {
-    dial_pos[i] = 0; // default to items 0 and 1
+    dial_pos[i] = 0;            // default to items 0 and 1
-    contexts[i].knobPos = -1;
+    contexts[i].knobPos = -1;   // set the knob position
+    contexts[i].dial_timer = 1; // timeout immediately
+  }
   /* reset the display timeout, latch on power from accessories */
   Latch_Timer = IGNITION_OFF_TIMEOUT;
   HAL_GPIO_WritePin(POWER_LATCH_GPIO_Port, POWER_LATCH_Pin, GPIO_PIN_RESET);
     char PLXPacket = 0;
     for (i = 0; i < MAXRDG; i++)
+    {
       Info[i].Max = 0;
       Info[i].Min = 0xFFF; // 12 bit max value
-      Info[i].sum = 0; //
+      Info[i].sum = 0;     //
-      Info[i].count=0;
+      Info[i].count = 0;
+    }
     int PLXPtr = 0;
     while (1)
         rmc_length = 0;
         nextTick = HAL_GetTick() + LOGGER_INTERVAL;
         logCount = 0;
         log = 1;
+      }
       // time several counted logger intervals after RMC recieved, enable logger each timeout.
-      if (logCount < ((1000 / LOGGER_INTERVAL)-1) && HAL_GetTick() > nextTick)
+      if (logCount < ((1000 / LOGGER_INTERVAL) - 1) && HAL_GetTick() > nextTick)
+      {
         nextTick = HAL_GetTick() + LOGGER_INTERVAL;
         ++logCount;
         log = 1;
+      }
           // do turn off screen
+        }
+      }
       for (chr = 0; chr < cc; chr++)
+      {
         char c = GetCharSerial(&uc1);
         if (c == PLX_Start) // at any time if the start byte appears, reset the pointers
+              }
               if (Info[i].data < Info[i].Min)
+              {
                 Info[i].Min = Info[i].data;
+              }
-  // take an avarage
+              // take an avarage
               Info[i].sum += Info[i].data;
-              Info[i].count ++;
+              Info[i].count++;
               // Send items  to BT if it is in connected state
               if (log && btConnected())
+              {
                 int cnt = small_sprintf(outbuff,
                                         "$PLLOG,%d,%d,%d,%ld",
                                         logCount,
                                         Info[i].observation,
                                         Info[i].instance,
-                                        Info[i].count==0? 0: Info[i].sum/Info[i].count);
+                                        Info[i].count == 0 ? 0 : Info[i].sum / Info[i].count);
                 // NMEA style checksum
                 int ck;
                 int sum = 0;
                 for (ck = 1; ck < cnt; ck++)
                 cnt += small_sprintf(outbuff + cnt, "*%02X\n",
                                      sum & 0xFF);
                 sendString(&uc3, outbuff, cnt);
+              }
+            }
             log = 0;
-             // now to display the information
+            // now to display the information
             int suppress = DisplayCurrent(0, -1);
             DisplayCurrent(1, suppress);
+          }
           PLXPtr = 0;
           PLXPacket = 0;
     Error_Handler();
+  }
+}
 /**
+ * @brief I2C1 Initialization Function
+ * @param None
+ * @retval None
+ */
+static void MX_I2C1_Init(void)
+{
+  /* USER CODE BEGIN I2C1_Init 0 */
+  /* USER CODE END I2C1_Init 0 */
+  /* USER CODE BEGIN I2C1_Init 1 */
+  /* USER CODE END I2C1_Init 1 */
+  hi2c1.Instance = I2C1;
+  hi2c1.Init.ClockSpeed = 100000;
+  hi2c1.Init.DutyCycle = I2C_DUTYCYCLE_2;
+  hi2c1.Init.OwnAddress1 = 0;
+  hi2c1.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT;
+  hi2c1.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
+  hi2c1.Init.OwnAddress2 = 0;
+  hi2c1.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
+  hi2c1.Init.NoStretchMode = I2C_NOSTRETCH_DISABLE;
+  if (HAL_I2C_Init(&hi2c1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN I2C1_Init 2 */
+  /* USER CODE END I2C1_Init 2 */
+}
+/**
  * @brief SPI1 Initialization Function
  * @param None
  * @retval None
  */
 static void MX_SPI1_Init(void)

Subversion Repositories DashDisplay

(root)/branches/Dashboard_L152_v2/Src/main.c – Rev 63 → 65