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

 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
+#include "display.h"
 #include "string.h"
 #include "base64.h"
 #include "libSerial/serial.H"
+#include "libSerial/serialUtils.H"
 #include "libSmallPrintf/small_printf.h"
 /* USER CODE END Includes */
 /* Private typedef -----------------------------------------------------------*/
 /* USER CODE END PM */
 /* Private variables ---------------------------------------------------------*/
 CAN_HandleTypeDef hcan;
+SPI_HandleTypeDef hspi1;
 UART_HandleTypeDef huart1;
 /* USER CODE BEGIN PV */
 /* USER CODE END PV */
 /* Private function prototypes -----------------------------------------------*/
 void SystemClock_Config(void);
 static void MX_GPIO_Init(void);
 static void MX_CAN_Init(void);
 static void MX_USART1_UART_Init(void);
+static void MX_SPI1_Init(void);
 /* USER CODE BEGIN PFP */
 /* USER CODE END PFP */
 /* Private user code ---------------------------------------------------------*/
   /* Configure the system clock */
   SystemClock_Config();
   /* USER CODE BEGIN SysInit */
+  cc_init();
   /* USER CODE END SysInit */
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
   MX_CAN_Init();
   MX_USART1_UART_Init();
+  MX_SPI1_Init();
   /* USER CODE BEGIN 2 */
   HAL_CAN_Start(&hcan);
   init_usart_ctl(&uc1, &huart1);
   // send out a version string on the serial port
   sendString(&uc1, (char *)version, sizeof(version));
   uint32_t sendTime = HAL_GetTick() + 1000;
   char cmdBuff[100];
+  // serial utils library command editor
-  int cmdPos = 0;
+  editBuffer cmdEdit;
+  initReadLine( &cmdEdit, cmdBuff, 100, READLINES_CR);
   for (int i = 0; i < CONTEXTS; ++i)
     resetContext(&contexts[i]);
   /* USER CODE END 2 */
   while (1)
+  {
     /* USER CODE END WHILE */
     /* USER CODE BEGIN 3 */
-    if (SerialCharsReceived(&uc1))
-    {
-      cmdBuff[cmdPos] = GetCharSerial(&uc1);
+ editBufferReturn ret = readLine(&uc1, &cmdEdit);
-      if (cmdBuff[cmdPos] == '\n')
+  if (ret == EDIT_CR)
-      {
+  {
-        processCmd(cmdBuff, cmdPos);
+      processCmd (cmdBuff,charCount(&cmdEdit));
-        cmdPos = 0;
-      }
-      else
-        cmdPos++;
-    }
+  }
     if (HAL_GetTick() > sendTime)
+    {
       sendTime += 1000;
       heartBeat();
+      cc_display(2);
+    }
-    uint32_t old = HAL_GetTick() - 750;
     for (int i = 0; i < CONTEXTS; ++i)
+    {
       contextType *ctx = &contexts[i];
       /// check for too old
       //   if (ctx->status == ACCEPT && ctx->payloadTimestamp < old)
   /* USER CODE END CAN_Init 2 */
+}
 /**
+ * @brief SPI1 Initialization Function
+ * @param None
+ * @retval None
+ */
+static void MX_SPI1_Init(void)
+{
+  /* USER CODE BEGIN SPI1_Init 0 */
+  /* USER CODE END SPI1_Init 0 */
+  /* USER CODE BEGIN SPI1_Init 1 */
+  /* USER CODE END SPI1_Init 1 */
+  /* SPI1 parameter configuration*/
+  hspi1.Instance = SPI1;
+  hspi1.Init.Mode = SPI_MODE_MASTER;
+  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_8;
+  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)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN SPI1_Init 2 */
+  /* USER CODE END SPI1_Init 2 */
+}
+/**
  * @brief USART1 Initialization Function
  * @param None
  * @retval None
  */
 static void MX_USART1_UART_Init(void)
  * @retval None
  */
 static void MX_GPIO_Init(void)
+{
   GPIO_InitTypeDef GPIO_InitStruct = {0};
+  /* USER CODE BEGIN MX_GPIO_Init_1 */
+  /* USER CODE END MX_GPIO_Init_1 */
   /* GPIO Ports Clock Enable */
   __HAL_RCC_GPIOC_CLK_ENABLE();
   __HAL_RCC_GPIOD_CLK_ENABLE();
   __HAL_RCC_GPIOA_CLK_ENABLE();
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(LED_GPIO_Port, LED_Pin, GPIO_PIN_RESET);
+  /*Configure GPIO pin Output Level */
+  HAL_GPIO_WritePin(GPIOA, SPI1_CS_Pin | SPI1_CD_Pin | SPI1_RESET_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin : LED_Pin */
   GPIO_InitStruct.Pin = LED_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
   HAL_GPIO_Init(LED_GPIO_Port, &GPIO_InitStruct);
+  /*Configure GPIO pins : SPI1_CS_Pin SPI1_CD_Pin SPI1_RESET_Pin */
+  GPIO_InitStruct.Pin = SPI1_CS_Pin | SPI1_CD_Pin | SPI1_RESET_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  /* USER CODE BEGIN MX_GPIO_Init_2 */
+  /* USER CODE END MX_GPIO_Init_2 */
+}
 /* USER CODE BEGIN 4 */
 /* USER CODE END 4 */

Subversion Repositories canSerial

(root)/trunk/Core/Src/main.c – Rev 2 → 3