WebSVN – DashDisplay – Diff – /trunk/Src/main.c

+  *
   ******************************************************************************
   */
 /* Includes ------------------------------------------------------------------*/
 #include "stm32f1xx_hal.h"
-#include "usb_device.h"
 /* USER CODE BEGIN Includes */
 #include "ap_math.h"
 #include "serial.h"
 #include "SSD1306.h"
 /* Private variables ---------------------------------------------------------*/
 ADC_HandleTypeDef hadc1;
 SPI_HandleTypeDef hspi1;
+UART_HandleTypeDef huart1;
 UART_HandleTypeDef huart2;
-IRDA_HandleTypeDef hirda3;
 /* USER CODE BEGIN PV */
 /* Private variables ---------------------------------------------------------*/
 /* USER CODE END PV */
 void SystemClock_Config(void);
 static void MX_GPIO_Init(void);
 static void MX_ADC1_Init(void);
 static void MX_SPI1_Init(void);
 static void MX_USART2_UART_Init(void);
-static void MX_USART3_IRDA_Init(void);
+static void MX_USART1_UART_Init(void);
 /* USER CODE BEGIN PFP */
 /* Private function prototypes -----------------------------------------------*/
 /* USER CODE END PFP */
         GPIO_InitTypeDef GPIO_InitStruct;
         __HAL_RCC_SPI1_CLK_ENABLE()
+        ;
-        __HAL_RCC_USART2_CLK_ENABLE()
+        __HAL_RCC_USART1_CLK_ENABLE(); // PLX main port
-        ;
-        __HAL_RCC_USART3_CLK_ENABLE();
+        __HAL_RCC_USART2_CLK_ENABLE(); // debug port
   /* USER CODE END 1 */
   /* MCU Configuration----------------------------------------------------------*/
   /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
   MX_ADC1_Init();
   MX_SPI1_Init();
   MX_USART2_UART_Init();
-  MX_USART3_IRDA_Init();
+  MX_USART1_UART_Init();
-  MX_USB_DEVICE_Init();
   /* USER CODE BEGIN 2 */
         /* Need to set AF mode for output pins DURR. */
         /* SPI bus AF pin selects */
         GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
         /* USART2 AF pin selects */
         GPIO_InitStruct.Pin = GPIO_PIN_2;
         GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
         HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-        /* USART3 AF pin selects */
+        /* USART1 AF pin selects */
-        GPIO_InitStruct.Pin = GPIO_PIN_10;
+        GPIO_InitStruct.Pin = GPIO_PIN_9;
-        HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+        HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
         /* Turn on USART2 IRQ  */
         HAL_NVIC_SetPriority(USART2_IRQn, 4, 0);
         HAL_NVIC_EnableIRQ(USART2_IRQn);
-        /* Turn on USART3 IRQ */
+        /* Turn on USART1 IRQ */
-        HAL_NVIC_SetPriority(USART3_IRQn, 2, 0);
+        HAL_NVIC_SetPriority(USART1_IRQn, 2, 0);
-        HAL_NVIC_EnableIRQ(USART3_IRQn);
+        HAL_NVIC_EnableIRQ(USART1_IRQn);
-        /* Setup for IRDA so make USART3 transmission for IRDA inverted - pulses are '0'  */
-        HAL_GPIO_WritePin(USART3_INVERT_GPIO_Port, USART3_INVERT_Pin, GPIO_PIN_SET);
         /* setup the USART control blocks */
-        init_usart_ctl(&uc2, huart2.Instance);
+        init_usart_ctl(&uc1, huart1.Instance);
-        init_usart_ctl(&uc3, hirda3.Instance);
+        init_usart_ctl(&uc2, hirda2.Instance);
+        EnableSerialRxInterrupt(&uc1);
         EnableSerialRxInterrupt(&uc2);
-        EnableSerialRxInterrupt(&uc3);
         ap_init(); // set up the approximate math library
         ssd1306_begin(1, 0);
         clearDisplay();
   RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
   RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
   RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
   HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2);
-  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC|RCC_PERIPHCLK_USB;
+  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC;
   PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6;
-  PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_PLL_DIV1_5;
   HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit);
   HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq()/1000);
   HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
   hspi1.Init.CRCPolynomial = 10;
   HAL_SPI_Init(&hspi1);
+}
+/* USART1 init function */
+void MX_USART1_UART_Init(void)
+{
+  huart1.Instance = USART1;
+  huart1.Init.BaudRate = 115200;
+  huart1.Init.WordLength = UART_WORDLENGTH_8B;
+  huart1.Init.StopBits = UART_STOPBITS_1;
+  huart1.Init.Parity = UART_PARITY_NONE;
+  huart1.Init.Mode = UART_MODE_TX_RX;
+  huart1.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  huart1.Init.OverSampling = UART_OVERSAMPLING_16;
+  HAL_UART_Init(&huart1);
+}
 /* USART2 init function */
 void MX_USART2_UART_Init(void)
+{
   huart2.Instance = USART2;
   huart2.Init.OverSampling = UART_OVERSAMPLING_16;
   HAL_UART_Init(&huart2);
+}
-/* USART3 init function */
-void MX_USART3_IRDA_Init(void)
-{
-  hirda3.Instance = USART3;
-  hirda3.Init.BaudRate = 115200;
-  hirda3.Init.WordLength = IRDA_WORDLENGTH_8B;
-  hirda3.Init.Parity = IRDA_PARITY_NONE;
-  hirda3.Init.Mode = IRDA_MODE_TX_RX;
-  hirda3.Init.Prescaler = 1;
-  hirda3.Init.IrDAMode = IRDA_POWERMODE_NORMAL;
-  HAL_IRDA_Init(&hirda3);
-}
 /** Configure pins as
         * Analog
         * Input
         * Output
         * EVENT_OUT
   HAL_GPIO_WritePin(GPIOC, SPI_RESET_Pin|SPI_NSS2_Pin|USART3_INVERT_Pin|USB_PWR_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pins : SPI1_NSS1_Pin SPI1CD_Pin */
   GPIO_InitStruct.Pin = SPI1_NSS1_Pin|SPI1CD_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-  GPIO_InitStruct.Speed = GPIO_SPEED_LOW;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
   /*Configure GPIO pins : SPI_RESET_Pin SPI_NSS2_Pin USART3_INVERT_Pin USB_PWR_Pin */
   GPIO_InitStruct.Pin = SPI_RESET_Pin|SPI_NSS2_Pin|USART3_INVERT_Pin|USB_PWR_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-  GPIO_InitStruct.Speed = GPIO_SPEED_LOW;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
   /*Configure GPIO pins : SW1_PUSH_Pin SW1_I_Pin SW1_Q_Pin SW2_PUSH_Pin */
   GPIO_InitStruct.Pin = SW1_PUSH_Pin|SW1_I_Pin|SW1_Q_Pin|SW2_PUSH_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;

Subversion Repositories DashDisplay

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