Преглед на файлове

HFR Uart 문제 수정
- Uart DMA Rx -> Uart IT Rx로변경
- Usart 2 Rx 삭제
-Data Rx 할 때 마다 TypePrintf 문 제거

PYJ преди 5 години
родител
ревизия
43293db55e
променени са 9 файла, в които са добавени 275 реда и са изтрити 318 реда
  1. 207 207
      .cproject
  2. 2 2
      .settings/language.settings.xml
  3. 13 13
      Bluecell_Src/Bluecell_operate.c
  4. 7 7
      Bluecell_Src/uart.c
  5. 0 1
      Inc/stm32f1xx_it.h
  6. 31 42
      STM32F103ZET_JDASMBIC.ioc
  7. 15 12
      Src/main.c
  8. 0 19
      Src/stm32f1xx_hal_msp.c
  9. 0 15
      Src/stm32f1xx_it.c

Файловите разлики са ограничени, защото са твърде много
+ 207 - 207
.cproject


+ 2 - 2
.settings/language.settings.xml

@@ -4,7 +4,7 @@
4 4
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
5 5
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
6 6
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
7
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="800489075853895203" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
7
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1395387303521902045" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8 8
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
9 9
 				<language-scope id="org.eclipse.cdt.core.g++"/>
10 10
 			</provider>
@@ -14,7 +14,7 @@
14 14
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
15 15
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
16 16
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
17
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="800489075853895203" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
17
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1395387303521902045" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
18 18
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
19 19
 				<language-scope id="org.eclipse.cdt.core.g++"/>
20 20
 			</provider>

+ 13 - 13
Bluecell_Src/Bluecell_operate.c

@@ -3460,19 +3460,19 @@ void HFR_TypeInit(){
3460 3460
 //    printf("2: %d \r\n",HAL_GPIO_ReadPin(UNIT_ID2_GPIO_Port,UNIT_ID2_Pin));
3461 3461
 //    printf("3: %d \r\n",HAL_GPIO_ReadPin(UNIT_ID3_GPIO_Port,UNIT_ID3_Pin));   
3462 3462
     switch(bluecell_Currdatastatus.Type){
3463
-        case BLUECELL_3_7G: bluecell_Currdatastatus.Type = 0x80;bluecell_Currdatastatus.Carrier_ID = 0x01 ;printf("Type BLUECELL_3_7G  Ready....\r\n"); break;
3464
-        case BLUECELL_3_8G: bluecell_Currdatastatus.Type = 0x81;bluecell_Currdatastatus.Carrier_ID = 0x02; printf("Type BLUECELL_3_8G  Ready....\r\n");break;
3465
-        case BLUECELL_3_9G: bluecell_Currdatastatus.Type = 0x82;bluecell_Currdatastatus.Carrier_ID = 0x04;printf("Type BLUECELL_3_9G  Ready....\r\n"); break;
3466
-        case BLUECELL_4_0G: bluecell_Currdatastatus.Type = 0x83;bluecell_Currdatastatus.Carrier_ID = 0x03; printf("Type BLUECELL_4_0G  Ready....\r\n");break;
3467
-        case BLUECELL_4_1G: bluecell_Currdatastatus.Type = 0x84;bluecell_Currdatastatus.Carrier_ID = 0x02; printf("Type BLUECELL_4_1G  Ready....\r\n");break;
3468
-        case BLUECELL_4_6G: bluecell_Currdatastatus.Type = 0x85;bluecell_Currdatastatus.Carrier_ID = 0x01; printf("Type BLUECELL_4_6G  Ready....\r\n");break;
3469
-        case BLUECELL_4_7G: bluecell_Currdatastatus.Type = 0x86;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_4_7G  Ready....\r\n");break;
3470
-        case BLUECELL_4_8G: bluecell_Currdatastatus.Type = 0x87;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_4_8G  Ready....\r\n");break;
3471
-        case BLUECELL_4_9G: bluecell_Currdatastatus.Type = 0x88;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_4_9G  Ready....\r\n");break;
3472
-        case BLUECELL_5_0G: bluecell_Currdatastatus.Type = 0x89;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_5_0G  Ready....\r\n");break;
3473
-        case BLUECELL_DCM : bluecell_Currdatastatus.Type = 0x8A;bluecell_Currdatastatus.Carrier_ID = 0x01;printf("Type BLUECELL_DCM  Ready....\r\n"); break;
3474
-        case BLUECELL_SBM : bluecell_Currdatastatus.Type = 0x8B;bluecell_Currdatastatus.Carrier_ID = 0x03; printf("Type BLUECELL_SBM  Ready....\r\n");break;
3475
-        case BLUECELL_KDDI: bluecell_Currdatastatus.Type = 0x8C;bluecell_Currdatastatus.Carrier_ID = 0x02;printf("Type BLUECELL_KDDI  Ready....\r\n"); break;
3463
+        case BLUECELL_3_7G: bluecell_Currdatastatus.Type = 0x80;bluecell_Currdatastatus.Carrier_ID = 0x01 ;break;//printf("Type BLUECELL_3_7G  Ready....\r\n"); break;
3464
+        case BLUECELL_3_8G: bluecell_Currdatastatus.Type = 0x81;bluecell_Currdatastatus.Carrier_ID = 0x02;break;// printf("Type BLUECELL_3_8G  Ready....\r\n");break;
3465
+        case BLUECELL_3_9G: bluecell_Currdatastatus.Type = 0x82;bluecell_Currdatastatus.Carrier_ID = 0x04;break;//printf("Type BLUECELL_3_9G  Ready....\r\n"); break;
3466
+        case BLUECELL_4_0G: bluecell_Currdatastatus.Type = 0x83;bluecell_Currdatastatus.Carrier_ID = 0x03;break;// printf("Type BLUECELL_4_0G  Ready....\r\n");break;
3467
+        case BLUECELL_4_1G: bluecell_Currdatastatus.Type = 0x84;bluecell_Currdatastatus.Carrier_ID = 0x02;break; //printf("Type BLUECELL_4_1G  Ready....\r\n");break;
3468
+        case BLUECELL_4_6G: bluecell_Currdatastatus.Type = 0x85;bluecell_Currdatastatus.Carrier_ID = 0x01;break;// printf("Type BLUECELL_4_6G  Ready....\r\n");break;
3469
+        case BLUECELL_4_7G: bluecell_Currdatastatus.Type = 0x86;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_4_7G  Ready....\r\n");break;
3470
+        case BLUECELL_4_8G: bluecell_Currdatastatus.Type = 0x87;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_4_8G  Ready....\r\n");break;
3471
+        case BLUECELL_4_9G: bluecell_Currdatastatus.Type = 0x88;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_4_9G  Ready....\r\n");break;
3472
+        case BLUECELL_5_0G: bluecell_Currdatastatus.Type = 0x89;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_5_0G  Ready....\r\n");break;
3473
+        case BLUECELL_DCM : bluecell_Currdatastatus.Type = 0x8A;bluecell_Currdatastatus.Carrier_ID = 0x01;break;//printf("Type BLUECELL_DCM  Ready....\r\n"); break;
3474
+        case BLUECELL_SBM : bluecell_Currdatastatus.Type = 0x8B;bluecell_Currdatastatus.Carrier_ID = 0x03;break;// printf("Type BLUECELL_SBM  Ready....\r\n");break;
3475
+        case BLUECELL_KDDI: bluecell_Currdatastatus.Type = 0x8C;bluecell_Currdatastatus.Carrier_ID = 0x02;break;//printf("Type BLUECELL_KDDI  Ready....\r\n"); break;
3476 3476
 //        default : printf("Type %x  Ready....\r\n",bluecell_Currdatastatus.Type);break;
3477 3477
     }
3478 3478
 //    printf("Type %x  Ready....\r\n",bluecell_Currdatastatus.Type);

+ 7 - 7
Bluecell_Src/uart.c

@@ -34,10 +34,10 @@ void InitUartQueue(pUARTQUEUE pQueue)
34 34
   {
35 35
 //    _Error_Handler(__FILE__, __LINE__);
36 36
   }  
37
-  if (HAL_UART_Receive_DMA(&hTest, TerminalQueue.Buffer, 1) != HAL_OK)
38
-  {
39
-//    _Error_Handler(__FILE__, __LINE__);
40
-  }
37
+//  if (HAL_UART_Receive_DMA(&hTest, TerminalQueue.Buffer, 1) != HAL_OK)
38
+//  {
39
+////    _Error_Handler(__FILE__, __LINE__);
40
+//  }
41 41
   //HAL_UART_Receive_DMA(&hTerminal,  TerminalQueue.Buffer, 1);
42 42
   //HAL_UART_Receive_IT(hTerminal, pQueue->Buffer + pQueue->head, 1);
43 43
 }
@@ -55,8 +55,8 @@ void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
55 55
     pQueue->data++;
56 56
     if (pQueue->data >= QUEUE_BUFFER_LENGTH)
57 57
         GetDataFromUartQueue(huart);
58
-    HAL_UART_Receive_DMA(&hTerminal, pQueue->Buffer + pQueue->head, 1);
59
-    HAL_UART_Receive_DMA(&hTest, pQueue->Buffer + pQueue->head, 1);
58
+    HAL_UART_Receive_IT(&hTerminal, pQueue->Buffer + pQueue->head, 1);
59
+//    HAL_UART_Receive_DMA(&hTest, pQueue->Buffer + pQueue->head, 1);
60 60
    // Set_UartRcv(true);
61 61
 }
62 62
 
@@ -131,7 +131,7 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
131 131
                     printf("CHECK SUM ERR \r\n");
132 132
                }
133 133
             }
134
-            memset(uart_buf,0x00,cnt);
134
+            memset(uart_buf,0x00,QUEUE_BUFFER_LENGTH);
135 135
 //        for(int i  = 0; i < cnt; i++)
136 136
 //            uart_buf[i] = 0;
137 137
         cnt = 0;

+ 0 - 1
Inc/stm32f1xx_it.h

@@ -59,7 +59,6 @@ void SysTick_Handler(void);
59 59
 void DMA1_Channel1_IRQHandler(void);
60 60
 void DMA1_Channel4_IRQHandler(void);
61 61
 void DMA1_Channel5_IRQHandler(void);
62
-void DMA1_Channel6_IRQHandler(void);
63 62
 void DMA1_Channel7_IRQHandler(void);
64 63
 void ADC1_2_IRQHandler(void);
65 64
 void TIM2_IRQHandler(void);

+ 31 - 42
STM32F103ZET_JDASMBIC.ioc

@@ -56,47 +56,37 @@ Dma.ADC3.1.Priority=DMA_PRIORITY_LOW
56 56
 Dma.ADC3.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
57 57
 Dma.Request0=ADC1
58 58
 Dma.Request1=ADC3
59
-Dma.Request2=USART2_RX
60
-Dma.Request3=USART2_TX
61
-Dma.Request4=USART1_RX
62
-Dma.Request5=USART1_TX
63
-Dma.RequestsNb=6
64
-Dma.USART1_RX.4.Direction=DMA_PERIPH_TO_MEMORY
65
-Dma.USART1_RX.4.Instance=DMA1_Channel5
66
-Dma.USART1_RX.4.MemDataAlignment=DMA_MDATAALIGN_BYTE
67
-Dma.USART1_RX.4.MemInc=DMA_MINC_ENABLE
68
-Dma.USART1_RX.4.Mode=DMA_NORMAL
69
-Dma.USART1_RX.4.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
70
-Dma.USART1_RX.4.PeriphInc=DMA_PINC_DISABLE
71
-Dma.USART1_RX.4.Priority=DMA_PRIORITY_LOW
72
-Dma.USART1_RX.4.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
73
-Dma.USART1_TX.5.Direction=DMA_MEMORY_TO_PERIPH
74
-Dma.USART1_TX.5.Instance=DMA1_Channel4
75
-Dma.USART1_TX.5.MemDataAlignment=DMA_MDATAALIGN_BYTE
76
-Dma.USART1_TX.5.MemInc=DMA_MINC_ENABLE
77
-Dma.USART1_TX.5.Mode=DMA_NORMAL
78
-Dma.USART1_TX.5.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
79
-Dma.USART1_TX.5.PeriphInc=DMA_PINC_DISABLE
80
-Dma.USART1_TX.5.Priority=DMA_PRIORITY_LOW
81
-Dma.USART1_TX.5.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
82
-Dma.USART2_RX.2.Direction=DMA_PERIPH_TO_MEMORY
83
-Dma.USART2_RX.2.Instance=DMA1_Channel6
84
-Dma.USART2_RX.2.MemDataAlignment=DMA_MDATAALIGN_BYTE
85
-Dma.USART2_RX.2.MemInc=DMA_MINC_ENABLE
86
-Dma.USART2_RX.2.Mode=DMA_NORMAL
87
-Dma.USART2_RX.2.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
88
-Dma.USART2_RX.2.PeriphInc=DMA_PINC_DISABLE
89
-Dma.USART2_RX.2.Priority=DMA_PRIORITY_LOW
90
-Dma.USART2_RX.2.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
91
-Dma.USART2_TX.3.Direction=DMA_MEMORY_TO_PERIPH
92
-Dma.USART2_TX.3.Instance=DMA1_Channel7
93
-Dma.USART2_TX.3.MemDataAlignment=DMA_MDATAALIGN_BYTE
94
-Dma.USART2_TX.3.MemInc=DMA_MINC_ENABLE
95
-Dma.USART2_TX.3.Mode=DMA_NORMAL
96
-Dma.USART2_TX.3.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
97
-Dma.USART2_TX.3.PeriphInc=DMA_PINC_DISABLE
98
-Dma.USART2_TX.3.Priority=DMA_PRIORITY_LOW
99
-Dma.USART2_TX.3.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
59
+Dma.Request2=USART2_TX
60
+Dma.Request3=USART1_RX
61
+Dma.Request4=USART1_TX
62
+Dma.RequestsNb=5
63
+Dma.USART1_RX.3.Direction=DMA_PERIPH_TO_MEMORY
64
+Dma.USART1_RX.3.Instance=DMA1_Channel5
65
+Dma.USART1_RX.3.MemDataAlignment=DMA_MDATAALIGN_BYTE
66
+Dma.USART1_RX.3.MemInc=DMA_MINC_ENABLE
67
+Dma.USART1_RX.3.Mode=DMA_NORMAL
68
+Dma.USART1_RX.3.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
69
+Dma.USART1_RX.3.PeriphInc=DMA_PINC_DISABLE
70
+Dma.USART1_RX.3.Priority=DMA_PRIORITY_LOW
71
+Dma.USART1_RX.3.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
72
+Dma.USART1_TX.4.Direction=DMA_MEMORY_TO_PERIPH
73
+Dma.USART1_TX.4.Instance=DMA1_Channel4
74
+Dma.USART1_TX.4.MemDataAlignment=DMA_MDATAALIGN_BYTE
75
+Dma.USART1_TX.4.MemInc=DMA_MINC_ENABLE
76
+Dma.USART1_TX.4.Mode=DMA_NORMAL
77
+Dma.USART1_TX.4.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
78
+Dma.USART1_TX.4.PeriphInc=DMA_PINC_DISABLE
79
+Dma.USART1_TX.4.Priority=DMA_PRIORITY_LOW
80
+Dma.USART1_TX.4.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
81
+Dma.USART2_TX.2.Direction=DMA_MEMORY_TO_PERIPH
82
+Dma.USART2_TX.2.Instance=DMA1_Channel7
83
+Dma.USART2_TX.2.MemDataAlignment=DMA_MDATAALIGN_BYTE
84
+Dma.USART2_TX.2.MemInc=DMA_MINC_ENABLE
85
+Dma.USART2_TX.2.Mode=DMA_NORMAL
86
+Dma.USART2_TX.2.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
87
+Dma.USART2_TX.2.PeriphInc=DMA_PINC_DISABLE
88
+Dma.USART2_TX.2.Priority=DMA_PRIORITY_LOW
89
+Dma.USART2_TX.2.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
100 90
 File.Version=6
101 91
 GPIO.groupedBy=Group By Peripherals
102 92
 I2C2.I2C_Mode=I2C_Fast
@@ -188,7 +178,6 @@ NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
188 178
 NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:true\:true\:1\:false\:true
189 179
 NVIC.DMA1_Channel4_IRQn=true\:0\:0\:false\:true\:true\:9\:false\:true
190 180
 NVIC.DMA1_Channel5_IRQn=true\:0\:0\:false\:true\:true\:10\:false\:true
191
-NVIC.DMA1_Channel6_IRQn=true\:0\:0\:false\:true\:true\:7\:false\:true
192 181
 NVIC.DMA1_Channel7_IRQn=true\:0\:0\:false\:true\:true\:8\:false\:true
193 182
 NVIC.DMA2_Channel4_5_IRQn=true\:0\:0\:false\:true\:true\:4\:false\:true
194 183
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false

+ 15 - 12
Src/main.c

@@ -59,7 +59,6 @@ UART_HandleTypeDef huart1;
59 59
 UART_HandleTypeDef huart2;
60 60
 DMA_HandleTypeDef hdma_usart1_rx;
61 61
 DMA_HandleTypeDef hdma_usart1_tx;
62
-DMA_HandleTypeDef hdma_usart2_rx;
63 62
 DMA_HandleTypeDef hdma_usart2_tx;
64 63
 
65 64
 /* USER CODE BEGIN PV */
@@ -234,11 +233,8 @@ uint8_t MBICTest_Firmdata[8]  = {1,2,3,4,5,6,7,8};
234 233
   * @brief  The application entry point.
235 234
   * @retval int
236 235
   */
237
-extern const uint16_t crc16_tab[256];
238
-
239
-
240
-
241
-int main(void)  {
236
+int main(void)
237
+{
242 238
   /* USER CODE BEGIN 1 */
243 239
 
244 240
 
@@ -253,7 +249,6 @@ int main(void)  {
253 249
 
254 250
   /* USER CODE END Init */
255 251
 
256
-
257 252
   /* Configure the system clock */
258 253
   SystemClock_Config();
259 254
 
@@ -472,9 +467,6 @@ static void MX_NVIC_Init(void)
472 467
   /* ADC3_IRQn interrupt configuration */
473 468
   HAL_NVIC_SetPriority(ADC3_IRQn, 0, 0);
474 469
   HAL_NVIC_EnableIRQ(ADC3_IRQn);
475
-  /* DMA1_Channel6_IRQn interrupt configuration */
476
-  HAL_NVIC_SetPriority(DMA1_Channel6_IRQn, 0, 0);
477
-  HAL_NVIC_EnableIRQ(DMA1_Channel6_IRQn);
478 470
   /* DMA1_Channel7_IRQn interrupt configuration */
479 471
   HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 0, 0);
480 472
   HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn);
@@ -648,13 +640,12 @@ static void MX_I2C2_Init(void)
648 640
 
649 641
   /* USER CODE END I2C2_Init 1 */
650 642
   hi2c2.Instance = I2C2;
651
-  hi2c2.Init.ClockSpeed = 100000;
643
+  hi2c2.Init.ClockSpeed = 400000;
652 644
   hi2c2.Init.DutyCycle = I2C_DUTYCYCLE_2;
653 645
   hi2c2.Init.OwnAddress1 = 0;
654 646
   hi2c2.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT;
655 647
   hi2c2.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
656 648
   hi2c2.Init.OwnAddress2 = 0;
657
-  
658 649
   hi2c2.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
659 650
   hi2c2.Init.NoStretchMode = I2C_NOSTRETCH_DISABLE;
660 651
   if (HAL_I2C_Init(&hi2c2) != HAL_OK)
@@ -869,6 +860,18 @@ static void MX_GPIO_Init(void)
869 860
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
870 861
   HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
871 862
 
863
+  /*Configure GPIO pins : UNIT_ID0_Pin UNIT_ID1_Pin UNIT_ID2_Pin */
864
+  GPIO_InitStruct.Pin = UNIT_ID0_Pin|UNIT_ID1_Pin|UNIT_ID2_Pin;
865
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
866
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
867
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
868
+
869
+  /*Configure GPIO pin : UNIT_ID3_Pin */
870
+  GPIO_InitStruct.Pin = UNIT_ID3_Pin;
871
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
872
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
873
+  HAL_GPIO_Init(UNIT_ID3_GPIO_Port, &GPIO_InitStruct);
874
+
872 875
 }
873 876
 
874 877
 /* USER CODE BEGIN 4 */

+ 0 - 19
Src/stm32f1xx_hal_msp.c

@@ -32,8 +32,6 @@ extern DMA_HandleTypeDef hdma_usart1_rx;
32 32
 
33 33
 extern DMA_HandleTypeDef hdma_usart1_tx;
34 34
 
35
-extern DMA_HandleTypeDef hdma_usart2_rx;
36
-
37 35
 extern DMA_HandleTypeDef hdma_usart2_tx;
38 36
 
39 37
 /* Private typedef -----------------------------------------------------------*/
@@ -462,22 +460,6 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart)
462 460
     HAL_GPIO_Init(RFU_RX_GPIO_Port, &GPIO_InitStruct);
463 461
 
464 462
     /* USART2 DMA Init */
465
-    /* USART2_RX Init */
466
-    hdma_usart2_rx.Instance = DMA1_Channel6;
467
-    hdma_usart2_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
468
-    hdma_usart2_rx.Init.PeriphInc = DMA_PINC_DISABLE;
469
-    hdma_usart2_rx.Init.MemInc = DMA_MINC_ENABLE;
470
-    hdma_usart2_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
471
-    hdma_usart2_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
472
-    hdma_usart2_rx.Init.Mode = DMA_NORMAL;
473
-    hdma_usart2_rx.Init.Priority = DMA_PRIORITY_LOW;
474
-    if (HAL_DMA_Init(&hdma_usart2_rx) != HAL_OK)
475
-    {
476
-      Error_Handler();
477
-    }
478
-
479
-    __HAL_LINKDMA(huart,hdmarx,hdma_usart2_rx);
480
-
481 463
     /* USART2_TX Init */
482 464
     hdma_usart2_tx.Instance = DMA1_Channel7;
483 465
     hdma_usart2_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
@@ -548,7 +530,6 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
548 530
     HAL_GPIO_DeInit(GPIOA, RFU_TX_Pin|RFU_RX_Pin);
549 531
 
550 532
     /* USART2 DMA DeInit */
551
-    HAL_DMA_DeInit(huart->hdmarx);
552 533
     HAL_DMA_DeInit(huart->hdmatx);
553 534
 
554 535
     /* USART2 interrupt DeInit */

+ 0 - 15
Src/stm32f1xx_it.c

@@ -63,7 +63,6 @@ extern ADC_HandleTypeDef hadc3;
63 63
 extern TIM_HandleTypeDef htim6;
64 64
 extern DMA_HandleTypeDef hdma_usart1_rx;
65 65
 extern DMA_HandleTypeDef hdma_usart1_tx;
66
-extern DMA_HandleTypeDef hdma_usart2_rx;
67 66
 extern DMA_HandleTypeDef hdma_usart2_tx;
68 67
 extern UART_HandleTypeDef huart1;
69 68
 extern UART_HandleTypeDef huart2;
@@ -251,20 +250,6 @@ void DMA1_Channel5_IRQHandler(void)
251 250
   /* USER CODE END DMA1_Channel5_IRQn 1 */
252 251
 }
253 252
 
254
-/**
255
-  * @brief This function handles DMA1 channel6 global interrupt.
256
-  */
257
-void DMA1_Channel6_IRQHandler(void)
258
-{
259
-  /* USER CODE BEGIN DMA1_Channel6_IRQn 0 */
260
-
261
-  /* USER CODE END DMA1_Channel6_IRQn 0 */
262
-  HAL_DMA_IRQHandler(&hdma_usart2_rx);
263
-  /* USER CODE BEGIN DMA1_Channel6_IRQn 1 */
264
-
265
-  /* USER CODE END DMA1_Channel6_IRQn 1 */
266
-}
267
-
268 253
 /**
269 254
   * @brief This function handles DMA1 channel7 global interrupt.
270 255
   */