DCT 주말 수정 사항

1. PE43711 Data 주고 받는 과정의 계산 식 변경
(블루셀 계산 식 모든 데이터에 100을 곱한 후 부호 없는 2바이트 데이터 전송)
(DCT 계산 식 모든 데이터를 계산 없이 부호 있는 2바이트 데이터 전송)

2. 현재 Level 표시 할 수 있도록 수정

3. 모든 Length  각각 Plus 하도록 수정

4.여러개의 프로토콜이 들어왔을 때 한번에 처리 할 수 있도록 수정

.settings/language.settings.xml

@@ -4,7 +4,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1681877287601945682" 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">
+			<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">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -14,7 +14,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1681877287601945682" 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">
+			<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">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

Bluecell_Inc/Bluecell_operate.h

@@ -646,6 +646,25 @@ typedef struct{
     uint8_t ATT_UL3_L;
     uint8_t ATT_UL4_H;
     uint8_t ATT_UL4_L;
+    uint8_t ULO_P1_Level1_H;
+    uint8_t ULO_P1_Level1_L;
+    uint8_t ULO_P2_Level2_H;
+    uint8_t ULO_P2_Level2_L;
+    uint8_t ULO_P3_Level3_H;
+    uint8_t ULO_P3_Level3_L;
+    uint8_t ULO_P4_Level4_H;
+    uint8_t ULO_P4_Level4_L;
+    uint8_t DLI_P1_Level1_H;
+    uint8_t DLI_P1_Level1_L;
+    uint8_t DLI_P2_Level2_H;
+    uint8_t DLI_P2_Level2_L;
+    uint8_t DLI_P3_Level3_H;
+    uint8_t DLI_P3_Level3_L;
+    uint8_t DLI_P4_Level4_H;
+    uint8_t DLI_P4_Level4_L;    
+    uint8_t DET_TEMP;
+    uint8_t DLI_AGC_ON_OFF;
+    uint8_t ULO_ALC_ON_OFF;
     uint8_t ULO_Level1_H;
     uint8_t ULO_Level1_L;
     uint8_t ULO_Level2_H;
@@ -661,28 +680,9 @@ typedef struct{
     uint8_t DLI_Level3_H;
     uint8_t DLI_Level3_L;
     uint8_t DLI_Level4_H;
-    uint8_t DLI_Level4_L;    
-    uint8_t BLUECELL_RESERVE1;
-    uint8_t DET_TEMP;
-    uint8_t DLI_AGC_ON_OFF;
-    uint8_t ULO_ALC_ON_OFF;
-    uint8_t BLUECELL_RESERVE2;
-    uint8_t BLUECELL_RESERVE3;
-    uint8_t BLUECELL_RESERVE4;
-    uint8_t BLUECELL_RESERVE5;
-    uint8_t BLUECELL_RESERVE6;
-    uint8_t BLUECELL_RESERVE7;
-    uint8_t BLUECELL_RESERVE8;
-    uint8_t BLUECELL_RESERVE9;
-    uint8_t BLUECELL_RESERVE10;
-    uint8_t BLUECELL_RESERVE11;
-    uint8_t BLUECELL_RESERVE12;
-    uint8_t BLUECELL_RESERVE13;
-    uint8_t BLUECELL_RESERVE14;
-    uint8_t BLUECELL_RESERVE15;
+    uint8_t DLI_Level4_L; 
     uint8_t ULO_ALC_Threshold_H;
     uint8_t ULO_ALC_Threshold_L;
-    uint8_t BLUECELL_RESERVE16;
     uint8_t BLUECELL_RESERVE17;
     uint8_t BLUECELL_RESERVE18;
     uint8_t BLUECELL_RESERVE19;

Bluecell_Src/uart.c

@@ -22,7 +22,12 @@ void InitUartQueue(pUARTQUEUE pQueue)
 {
   pQueue->data = pQueue->head = pQueue->tail = 0;
   uart_hal_tx.output_p = uart_hal_tx.input_p = 0;
+//  HAL_UART_Receive_IT(&huart2,rxBuf,5);
+
+
+
   if (HAL_UART_Receive_DMA(&hTerminal, TerminalQueue.Buffer, 1) != HAL_OK)
+  //if (HAL_UART_Receive_IT(&hTerminal, TerminalQueue.Buffer, 1) != HAL_OK)
   {
 //    _Error_Handler(__FILE__, __LINE__);
   }  
@@ -92,7 +97,7 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
 //        printf("data cnt zero !!!  \r\n");
         //RF_Ctrl_Main(&uart_buf[Header]);
 //        HAL_UART_Transmit(dst, &temp_buf[BLUECELL_HEADER00], 11, 3000);
-#if 0 // PYJ.2019.07.15_BEGIN --
+#if 1 // PYJ.2019.07.15_BEGIN --
             for(int i = 0; i < cnt; i++){
                 printf("%02x ",uart_buf[i]);
             }
@@ -111,6 +116,8 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
                     CrcChk = ((uart_buf[MBIC_PAYLOADSTART + Length + 1] << 8) | (uart_buf[MBIC_PAYLOADSTART + Length + 2]));
                     if(CRC16_Check(&uart_buf[MBIC_PAYLOADSTART], Length,CrcChk))
                         MBIC_Operate(uart_buf);
+                    else
+                      printf("CRC ERROR \r\n");
                }
                else
                {
@@ -130,12 +137,14 @@ void Uart_Check(void){
 }
 
 void Uart1_Data_Send(uint8_t* data,uint16_t size){
-    HAL_UART_Transmit_DMA(&hTerminal, data,size); 
-    
-//    printf("\r\n [TX]  ");
+    HAL_UART_Transmit(&hTerminal, &data[0],size,0xFFFF);
+  //HAL_UART_Transmit_IT(&hTerminal, &data[0],size);
+//    printf("data[278] : %x \r\n",data[278]);
+////    HAL_Delay(1);   
+//    printf("\r\n [TX] : ");
 //    for(int i = 0; i< size; i++)
-//        printf(" %02x",data[i]);
-//    printf("COUNT : %d",size);
+//        printf(" %02x ",data[i]);
+//    printf("\r\n\tCOUNT : %d",size);
 //    printf("\r\n");
     
 }

STM32F103ZET_JDASMBIC.ioc

@@ -36,67 +36,67 @@ ADC3.SamplingTime-1\#ChannelRegularConversion=ADC_SAMPLETIME_239CYCLES_5
 ADC3.SamplingTime-2\#ChannelRegularConversion=ADC_SAMPLETIME_239CYCLES_5
 ADC3.SamplingTime-3\#ChannelRegularConversion=ADC_SAMPLETIME_239CYCLES_5
 ADC3.SamplingTime-4\#ChannelRegularConversion=ADC_SAMPLETIME_239CYCLES_5
-Dma.ADC1.2.Direction=DMA_PERIPH_TO_MEMORY
-Dma.ADC1.2.Instance=DMA1_Channel1
-Dma.ADC1.2.MemDataAlignment=DMA_MDATAALIGN_HALFWORD
-Dma.ADC1.2.MemInc=DMA_MINC_ENABLE
-Dma.ADC1.2.Mode=DMA_CIRCULAR
-Dma.ADC1.2.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD
-Dma.ADC1.2.PeriphInc=DMA_PINC_DISABLE
-Dma.ADC1.2.Priority=DMA_PRIORITY_LOW
-Dma.ADC1.2.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
-Dma.ADC3.3.Direction=DMA_PERIPH_TO_MEMORY
-Dma.ADC3.3.Instance=DMA2_Channel5
-Dma.ADC3.3.MemDataAlignment=DMA_MDATAALIGN_HALFWORD
-Dma.ADC3.3.MemInc=DMA_MINC_ENABLE
-Dma.ADC3.3.Mode=DMA_CIRCULAR
-Dma.ADC3.3.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD
-Dma.ADC3.3.PeriphInc=DMA_PINC_DISABLE
-Dma.ADC3.3.Priority=DMA_PRIORITY_LOW
-Dma.ADC3.3.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
-Dma.Request0=USART1_RX
-Dma.Request1=USART1_TX
-Dma.Request2=ADC1
-Dma.Request3=ADC3
-Dma.Request4=USART2_RX
-Dma.Request5=USART2_TX
+Dma.ADC1.0.Direction=DMA_PERIPH_TO_MEMORY
+Dma.ADC1.0.Instance=DMA1_Channel1
+Dma.ADC1.0.MemDataAlignment=DMA_MDATAALIGN_HALFWORD
+Dma.ADC1.0.MemInc=DMA_MINC_ENABLE
+Dma.ADC1.0.Mode=DMA_CIRCULAR
+Dma.ADC1.0.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD
+Dma.ADC1.0.PeriphInc=DMA_PINC_DISABLE
+Dma.ADC1.0.Priority=DMA_PRIORITY_LOW
+Dma.ADC1.0.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
+Dma.ADC3.1.Direction=DMA_PERIPH_TO_MEMORY
+Dma.ADC3.1.Instance=DMA2_Channel5
+Dma.ADC3.1.MemDataAlignment=DMA_MDATAALIGN_HALFWORD
+Dma.ADC3.1.MemInc=DMA_MINC_ENABLE
+Dma.ADC3.1.Mode=DMA_CIRCULAR
+Dma.ADC3.1.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD
+Dma.ADC3.1.PeriphInc=DMA_PINC_DISABLE
+Dma.ADC3.1.Priority=DMA_PRIORITY_LOW
+Dma.ADC3.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
+Dma.Request0=ADC1
+Dma.Request1=ADC3
+Dma.Request2=USART2_RX
+Dma.Request3=USART2_TX
+Dma.Request4=USART1_RX
+Dma.Request5=USART1_TX
 Dma.RequestsNb=6
-Dma.USART1_RX.0.Direction=DMA_PERIPH_TO_MEMORY
-Dma.USART1_RX.0.Instance=DMA1_Channel5
-Dma.USART1_RX.0.MemDataAlignment=DMA_MDATAALIGN_BYTE
-Dma.USART1_RX.0.MemInc=DMA_MINC_ENABLE
-Dma.USART1_RX.0.Mode=DMA_NORMAL
-Dma.USART1_RX.0.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
-Dma.USART1_RX.0.PeriphInc=DMA_PINC_DISABLE
-Dma.USART1_RX.0.Priority=DMA_PRIORITY_LOW
-Dma.USART1_RX.0.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
-Dma.USART1_TX.1.Direction=DMA_MEMORY_TO_PERIPH
-Dma.USART1_TX.1.Instance=DMA1_Channel4
-Dma.USART1_TX.1.MemDataAlignment=DMA_MDATAALIGN_BYTE
-Dma.USART1_TX.1.MemInc=DMA_MINC_ENABLE
-Dma.USART1_TX.1.Mode=DMA_NORMAL
-Dma.USART1_TX.1.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
-Dma.USART1_TX.1.PeriphInc=DMA_PINC_DISABLE
-Dma.USART1_TX.1.Priority=DMA_PRIORITY_LOW
-Dma.USART1_TX.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
-Dma.USART2_RX.4.Direction=DMA_PERIPH_TO_MEMORY
-Dma.USART2_RX.4.Instance=DMA1_Channel6
-Dma.USART2_RX.4.MemDataAlignment=DMA_MDATAALIGN_BYTE
-Dma.USART2_RX.4.MemInc=DMA_MINC_ENABLE
-Dma.USART2_RX.4.Mode=DMA_NORMAL
-Dma.USART2_RX.4.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
-Dma.USART2_RX.4.PeriphInc=DMA_PINC_DISABLE
-Dma.USART2_RX.4.Priority=DMA_PRIORITY_LOW
-Dma.USART2_RX.4.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
-Dma.USART2_TX.5.Direction=DMA_MEMORY_TO_PERIPH
-Dma.USART2_TX.5.Instance=DMA1_Channel7
-Dma.USART2_TX.5.MemDataAlignment=DMA_MDATAALIGN_BYTE
-Dma.USART2_TX.5.MemInc=DMA_MINC_ENABLE
-Dma.USART2_TX.5.Mode=DMA_NORMAL
-Dma.USART2_TX.5.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
-Dma.USART2_TX.5.PeriphInc=DMA_PINC_DISABLE
-Dma.USART2_TX.5.Priority=DMA_PRIORITY_LOW
-Dma.USART2_TX.5.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
+Dma.USART1_RX.4.Direction=DMA_PERIPH_TO_MEMORY
+Dma.USART1_RX.4.Instance=DMA1_Channel5
+Dma.USART1_RX.4.MemDataAlignment=DMA_MDATAALIGN_BYTE
+Dma.USART1_RX.4.MemInc=DMA_MINC_ENABLE
+Dma.USART1_RX.4.Mode=DMA_NORMAL
+Dma.USART1_RX.4.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
+Dma.USART1_RX.4.PeriphInc=DMA_PINC_DISABLE
+Dma.USART1_RX.4.Priority=DMA_PRIORITY_LOW
+Dma.USART1_RX.4.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
+Dma.USART1_TX.5.Direction=DMA_MEMORY_TO_PERIPH
+Dma.USART1_TX.5.Instance=DMA1_Channel4
+Dma.USART1_TX.5.MemDataAlignment=DMA_MDATAALIGN_BYTE
+Dma.USART1_TX.5.MemInc=DMA_MINC_ENABLE
+Dma.USART1_TX.5.Mode=DMA_NORMAL
+Dma.USART1_TX.5.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
+Dma.USART1_TX.5.PeriphInc=DMA_PINC_DISABLE
+Dma.USART1_TX.5.Priority=DMA_PRIORITY_LOW
+Dma.USART1_TX.5.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
+Dma.USART2_RX.2.Direction=DMA_PERIPH_TO_MEMORY
+Dma.USART2_RX.2.Instance=DMA1_Channel6
+Dma.USART2_RX.2.MemDataAlignment=DMA_MDATAALIGN_BYTE
+Dma.USART2_RX.2.MemInc=DMA_MINC_ENABLE
+Dma.USART2_RX.2.Mode=DMA_NORMAL
+Dma.USART2_RX.2.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
+Dma.USART2_RX.2.PeriphInc=DMA_PINC_DISABLE
+Dma.USART2_RX.2.Priority=DMA_PRIORITY_LOW
+Dma.USART2_RX.2.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
+Dma.USART2_TX.3.Direction=DMA_MEMORY_TO_PERIPH
+Dma.USART2_TX.3.Instance=DMA1_Channel7
+Dma.USART2_TX.3.MemDataAlignment=DMA_MDATAALIGN_BYTE
+Dma.USART2_TX.3.MemInc=DMA_MINC_ENABLE
+Dma.USART2_TX.3.Mode=DMA_NORMAL
+Dma.USART2_TX.3.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
+Dma.USART2_TX.3.PeriphInc=DMA_PINC_DISABLE
+Dma.USART2_TX.3.Priority=DMA_PRIORITY_LOW
+Dma.USART2_TX.3.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
 I2C2.I2C_Mode=I2C_Fast
@@ -179,14 +179,14 @@ Mcu.UserName=STM32F103ZETx
 MxCube.Version=5.6.1
 MxDb.Version=DB.5.0.60
 NVIC.ADC1_2_IRQn=true\:0\:0\:false\:false\:true\:true\:true
-NVIC.ADC3_IRQn=true\:0\:0\:false\:true\:true\:8\:true\:true
+NVIC.ADC3_IRQn=true\:0\:0\:false\:true\:true\:6\:true\:true
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:true\:true\:1\:false\:true
-NVIC.DMA1_Channel4_IRQn=true\:0\:0\:false\:true\:true\:2\:false\:true
-NVIC.DMA1_Channel5_IRQn=true\:0\:0\:false\:true\:true\:3\:false\:true
-NVIC.DMA1_Channel6_IRQn=true\:0\:0\:false\:true\:true\:9\:false\:true
-NVIC.DMA1_Channel7_IRQn=true\:0\:0\:false\:true\:true\:10\:false\:true
-NVIC.DMA2_Channel4_5_IRQn=true\:0\:0\:false\:true\:true\:6\:false\:true
+NVIC.DMA1_Channel4_IRQn=true\:0\:0\:false\:true\:true\:9\:false\:true
+NVIC.DMA1_Channel5_IRQn=true\:0\:0\:false\:true\:true\:10\:false\:true
+NVIC.DMA1_Channel6_IRQn=true\:0\:0\:false\:true\:true\:7\:false\:true
+NVIC.DMA1_Channel7_IRQn=true\:0\:0\:false\:true\:true\:8\:false\:true
+NVIC.DMA2_Channel4_5_IRQn=true\:0\:0\:false\:true\:true\:4\:false\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.ForceEnableDMAVector=true
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -197,11 +197,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 NVIC.TIM2_IRQn=true\:0\:0\:false\:false\:true\:false\:true
-NVIC.TIM6_IRQn=true\:0\:0\:false\:true\:true\:7\:true\:true
+NVIC.TIM6_IRQn=true\:0\:0\:false\:true\:true\:5\:true\:true
 NVIC.TimeBase=TIM2_IRQn
 NVIC.TimeBaseIP=TIM2
-NVIC.USART1_IRQn=true\:0\:0\:false\:true\:true\:4\:true\:true
-NVIC.USART2_IRQn=true\:0\:0\:false\:true\:true\:5\:true\:true
+NVIC.USART1_IRQn=true\:0\:0\:false\:true\:true\:2\:true\:true
+NVIC.USART2_IRQn=true\:0\:0\:false\:true\:true\:3\:true\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 PA10.GPIOParameters=GPIO_Label
 PA10.GPIO_Label=MBIC_DOWN

STM32F103ZE_FLASH.ld

@@ -62,7 +62,7 @@ _Min_Stack_Size = 0x400; /* required amount of stack */
 MEMORY
 {
 RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 64K
-FLASH (rx)      : ORIGIN = 0x8005000, LENGTH = 64K
+FLASH (rx)      : ORIGIN = 0x8005000, LENGTH = 512K
 }
 
 /* Define output sections */

Src/main.c

@@ -147,7 +147,7 @@ void Pol_Delay_us(volatile uint32_t microseconds)
 
 int _write (int file, uint8_t *ptr, uint16_t len)
 {
-#if 0 // PYJ.2020.06.03_BEGIN -- 
+#if 1 // PYJ.2020.06.03_BEGIN --
     HAL_UART_Transmit(&hTest, ptr, len,10);
 #else
     HAL_UART_Transmit(&hTerminal, ptr, len,10);    
@@ -162,7 +162,7 @@ uint16_t adc3cnt = 0 ;
 void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
 {
 //?��?��?�� 코드 ?��?��
-//諤嵸烄 ?嚙踝蕭?嚙踝蕭 adc?嚙踝蕭嚙??????????? 嚙????????????嚙踝蕭?嚙踝蕭 ?嚙踝蕭 ?嚙踝蕭?嚙踝蕭嚙??????????? ?嚙踝蕭?嚙踝蕭嚙??????????? ?嚙踝蕭?嚙踝蕭?? 穈軤𦚯 魽國探嚙??????????? ?嚙踝蕭?嚙踝蕭
+//諤嵸烄 ?嚙踝蕭?嚙踝蕭 adc?嚙踝蕭嚙???????????? 嚙?????????????嚙踝蕭?嚙踝蕭 ?嚙踝蕭 ?嚙踝蕭?嚙踝蕭嚙???????????? ?嚙踝蕭?嚙踝蕭嚙???????????? ?嚙踝蕭?嚙踝蕭?? 穈軤𦚯 魽國探嚙???????????? ?嚙踝蕭?嚙踝蕭
 
     if(hadc->Instance == hadc1.Instance)
     {
@@ -399,7 +399,7 @@ int main(void)
     AGC_Function();    /*AGC Function*/
     Alarm_Check();     /*Function to check all alarm status variables*/
 //    Uart1_Data_Send("A",1);
-//    HAL_Delay(500);
+//    HAL_Delay(1);
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */
@@ -459,12 +459,6 @@ static void MX_NVIC_Init(void)
   /* DMA1_Channel1_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
-  /* DMA1_Channel4_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel4_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ(DMA1_Channel4_IRQn);
-  /* DMA1_Channel5_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
   /* USART1_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(USART1_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(USART1_IRQn);
@@ -486,6 +480,12 @@ static void MX_NVIC_Init(void)
   /* DMA1_Channel7_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn);
+  /* DMA1_Channel4_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel4_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel4_IRQn);
+  /* DMA1_Channel5_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
 }
 
 /**