소스 검색

Warning 수정

박영준 5 년 전
부모
커밋
12b56f838c
6개의 변경된 파일90개의 추가작업 그리고 85개의 파일을 삭제
  1. 2 2
      .settings/language.settings.xml
  2. 1 0
      .settings/org.eclipse.core.resources.prefs
  3. 11 11
      Bluecell_Inc/Bluecell_operate.h
  4. 74 71
      Bluecell_Src/Bluecell_operate.c
  5. 1 0
      Bluecell_Src/uart.c
  6. 1 1
      Src/main.c

+ 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="564629063996780829" 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="564629063996780829" 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>

+ 1 - 0
.settings/org.eclipse.core.resources.prefs

@@ -1,2 +1,3 @@
1 1
 eclipse.preferences.version=1
2
+encoding//Bluecell_Inc/Bluecell_operate.h=UTF-8
2 3
 encoding//Bluecell_Src/Bluecell_operate.c=UTF-8

+ 11 - 11
Bluecell_Inc/Bluecell_operate.h

@@ -19,7 +19,7 @@ TR-ID
19 19
 Seq-Num
20 20
 TTL
21 21
 Time
22
-���� ����
22
+占쏙옙占쏙옙 占쏙옙占쏙옙
23 23
 CMD
24 24
 Length
25 25
 Header Checksum
@@ -31,17 +31,17 @@ ETX
31 31
 
32 32
 /*
33 33
  *
34
-0	80	��ü ���� ��ȸ	��� AID �׸� ���� ���� ��û �� ���� (��û Frame�� SUB-DATA �� ���̴� 0)
35
-1	81	���� ��û	���� ��û�� REQ�� 0x01 �̰� ������ ��ü ������ ���¸� ����
34
+0	80	占쏙옙체 占쏙옙占쏙옙 占쏙옙회	占쏙옙占� AID 占쌓몌옙 占쏙옙占쏙옙 占쏙옙占쏙옙 占쏙옙청 占쏙옙 占쏙옙占쏙옙 (占쏙옙청 Frame占쏙옙 SUB-DATA 占쏙옙 占쏙옙占싱댐옙 0)
35
+1	81	占쏙옙占쏙옙 占쏙옙청	占쏙옙占쏙옙 占쏙옙청占쏙옙 REQ占쏙옙 0x01 占싱곤옙 占쏙옙占쏙옙占쏙옙 占쏙옙체 占쏙옙占쏙옙占쏙옙 占쏙옙占승몌옙 占쏙옙占쏙옙
36 36
 
37
-10	90	Download Notification	�ٿ�ε� ����
38
-11	91	Download Data	�ٿ�ε� data
39
-12	92	Download Confirm	�ٿ�ε� Ȯ��
37
+10	90	Download Notification	占쌕울옙琯占� 占쏙옙占쏙옙
38
+11	91	Download Data	占쌕울옙琯占� data
39
+12	92	Download Confirm	占쌕울옙琯占� 확占쏙옙
40 40
 13	93	Download Complete	Download Complete Command
41 41
 14	94	System-Reboot	System Rebooting Command
42 42
 
43
-40	C0	���̺� ��ȸ �� ����
44
-41	C1	���̺� ���� �� ����
43
+40	C0	占쏙옙占싱븝옙 占쏙옙회 占쏙옙 占쏙옙占쏙옙
44
+41	C1	占쏙옙占싱븝옙 占쏙옙占쏙옙 占쏙옙 占쏙옙占쏙옙
45 45
 
46 46
  *
47 47
  *
@@ -492,7 +492,7 @@ typedef enum{
492 492
     MBIC_Shutdown_UL3,
493 493
     MBIC_Shutdown_UL4,
494 494
     MBIC_Shutdown_MaxIndex,        
495
-};
495
+}MBIC_ShutdownIndex_t;
496 496
 enum DATATYPE
497 497
 {
498 498
     BLUECELL_SOFTWARERESET = 0,
@@ -1445,14 +1445,14 @@ typedef enum{
1445 1445
     DET_Alarm_DL3_Shutdown_Index,
1446 1446
     DET_Alarm_DL4_Shutdown_Index,
1447 1447
     DET_Alarm_DL_Shutdown_Index_MAX,
1448
-};
1448
+}MBIC_Shutdown_DL_Index_t;
1449 1449
 typedef enum{
1450 1450
     DET_Alarm_UL1_Shutdown_Index = 0,
1451 1451
     DET_Alarm_UL2_Shutdown_Index,
1452 1452
     DET_Alarm_UL3_Shutdown_Index,
1453 1453
     DET_Alarm_UL4_Shutdown_Index,
1454 1454
     DET_Alarm_UL_Shutdown_Index_MAX,
1455
-};
1455
+}MBIC_Shutdown_UL_Index_t;
1456 1456
 #define ADC1_EA Bluecell_ADC1_MaxLength /2
1457 1457
 #define ADC3_EA Bluecell_ADC3_MaxLength /2
1458 1458
 

+ 74 - 71
Bluecell_Src/Bluecell_operate.c

@@ -1,5 +1,6 @@
1 1
 #include <stdio.h>
2 2
 #include <stdlib.h>
3
+#include <stdint.h>
3 4
 #include <math.h>
4 5
 
5 6
 #include "main.h"
@@ -17,6 +18,8 @@ extern void ShutdownCnt_Set(uint8_t index,uint8_t val);
17 18
 extern void PE43711_atten_ctrl(PE43711_st ATT ,uint8_t data);
18 19
 extern void Uart1_Data_Send(uint8_t* data,uint16_t size);
19 20
 extern HAL_StatusTypeDef EEPROM_M24C08_Zerowrite(uint8_t devid,uint16_t Address);
21
+extern uint8_t Chksum_Create(uint8_t *data);
22
+extern uint16_t CRC16_Generate(uint8_t* buf_ptr, int len);
20 23
 /***************************************************************************************/
21 24
 /*                                  Extern Valuable                                    */
22 25
 /***************************************************************************************/
@@ -298,7 +301,7 @@ uint8_t PE43711_Calc_NoTable(uint8_t high_bit,uint8_t low_bit){
298 301
 
299 302
 
300 303
 double PE43711_Double(uint8_t high_bit,uint8_t low_bit){
301
-    uint16_t tmp_h = 0,tmp_l = 0;
304
+    //uint16_t tmp_h = 0,tmp_l = 0;
302 305
     double ret = 0;
303 306
 
304 307
 #if 0 // PYJ.2020.05.22_BEGIN -- 
@@ -546,9 +549,9 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
546 549
             bluecell_Prevdatastatus.bluecell_User_DL4_H = bluecell_Currdatastatus.bluecell_User_DL4_H;
547 550
             bluecell_Prevdatastatus.bluecell_User_DL4_L = bluecell_Currdatastatus.bluecell_User_DL4_L;
548 551
             MBIC_Val = (Curr.ATT_DL4_H << 8 | Curr.ATT_DL4_L);
549
-                 printf("\r\nCurr.ATT_DL4_H : %x \r\Curr.ATT_DL4_L : %x \r\n",Curr.ATT_DL4_H,Curr.ATT_DL4_L);
552
+            printf("\r\nCurr.ATT_DL4_H : %x \rCurr.ATT_DL4_L : %x \r\n",Curr.ATT_DL4_H,Curr.ATT_DL4_L);
550 553
             MBIC_UserVal = (((Curr.bluecell_User_DL4_H & 0x00FF)<< 8) | Curr.bluecell_User_DL4_L);
551
-            printf("\r\nCurr.bluecell_User_DL4_H : %x \r\Curr.bluecell_User_DL4_L : %x \r\n",Curr.bluecell_User_DL4_H,Curr.bluecell_User_DL4_L);
554
+            printf("\r\nCurr.bluecell_User_DL4_H : %x \rCurr.bluecell_User_DL4_L : %x \r\n",Curr.bluecell_User_DL4_H,Curr.bluecell_User_DL4_L);
552 555
             printf("MBIC_UserVal : %x \r\n",MBIC_UserVal); // 2
553 556
             val = MBIC_DL_PE43711_Calc(&Att_DL4.Table_0_0_dBm,// Table Offset
554 557
                                 MBIC_Val,// Hidden Atten Low bit
@@ -1565,7 +1568,7 @@ void MBIC_TableLoad(uint8_t* data,uint8_t type){
1565 1568
             data[MBIC_PAYLOADSTART + MBIC_TableIndex_Length] = Temp_UL4.Table_Length;                
1566 1569
             break;
1567 1570
     }
1568
-     printf("\r\Load MBIC_TableIndex_Number : %x \r\n",data[MBIC_PAYLOADSTART + MBIC_TableIndex_Number]);   
1571
+     printf("\rLoad MBIC_TableIndex_Number : %x \r\n",data[MBIC_PAYLOADSTART + MBIC_TableIndex_Number]);
1569 1572
     
1570 1573
 }
1571 1574
 
@@ -1774,7 +1777,7 @@ void MBIC_TableSave(uint8_t* data,uint8_t type){
1774 1777
 
1775 1778
             break;
1776 1779
     }
1777
-    printf("\r\Setting MBIC_TableIndex_Number : %x \r\n",data[MBIC_PAYLOADSTART + MBIC_TableIndex_Number]);   
1780
+    printf("\rSetting MBIC_TableIndex_Number : %x \r\n",data[MBIC_PAYLOADSTART + MBIC_TableIndex_Number]);
1778 1781
 }
1779 1782
 
1780 1783
 
@@ -2149,7 +2152,7 @@ bool Bluecell_Operate(uint8_t* data){
2149 2152
 
2150 2153
         /*******/
2151 2154
 #if 0 // PYJ.2020.05.13_BEGIN -- 
2152
-    수정 및 추가 
2155
+    수정 및 추가
2153 2156
 #endif // PYJ.2020.05.13_END -- 
2154 2157
         /*******/
2155 2158
     case Bluecell_TEMP_USER                               :
@@ -2410,19 +2413,19 @@ typedef enum{
2410 2413
    bluecell_Currdatastatus.Type +=  HAL_GPIO_ReadPin(UNIT_ID2_GPIO_Port,UNIT_ID2_Pin) << 2;
2411 2414
    bluecell_Currdatastatus.Type +=  HAL_GPIO_ReadPin(UNIT_ID3_GPIO_Port,UNIT_ID3_Pin) << 3;
2412 2415
     switch(bluecell_Currdatastatus.Type){
2413
-     case BLUECELL_3_7G: bluecell_Currdatastatus.Type = 0x80;bluecell_Currdatastatus.Carrier_ID = 0x01 ;printf("Type BLUECELL_3_7G  Ready....\r\n",bluecell_Currdatastatus.Type); break;
2414
-     case BLUECELL_3_8G: bluecell_Currdatastatus.Type = 0x81;bluecell_Currdatastatus.Carrier_ID = 0x02; printf("Type BLUECELL_3_8G  Ready....\r\n",bluecell_Currdatastatus.Type);break;
2415
-     case BLUECELL_3_9G: bluecell_Currdatastatus.Type = 0x82;bluecell_Currdatastatus.Carrier_ID = 0x04;printf("Type BLUECELL_3_9G  Ready....\r\n",bluecell_Currdatastatus.Type); break;
2416
-     case BLUECELL_4_0G: bluecell_Currdatastatus.Type = 0x83;bluecell_Currdatastatus.Carrier_ID = 0x03; printf("Type BLUECELL_4_0G  Ready....\r\n",bluecell_Currdatastatus.Type);break;
2417
-     case BLUECELL_4_1G: bluecell_Currdatastatus.Type = 0x84;bluecell_Currdatastatus.Carrier_ID = 0x02; printf("Type BLUECELL_4_1G  Ready....\r\n",bluecell_Currdatastatus.Type);break;
2418
-     case BLUECELL_4_6G: bluecell_Currdatastatus.Type = 0x85;bluecell_Currdatastatus.Carrier_ID = 0x01; printf("Type BLUECELL_4_6G  Ready....\r\n",bluecell_Currdatastatus.Type);break;
2419
-     case BLUECELL_4_7G: bluecell_Currdatastatus.Type = 0x86;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_4_7G  Ready....\r\n",bluecell_Currdatastatus.Type);break;
2420
-     case BLUECELL_4_8G: bluecell_Currdatastatus.Type = 0x87;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_3_7G  Ready....\r\n",bluecell_Currdatastatus.Type);break;
2421
-     case BLUECELL_4_9G: bluecell_Currdatastatus.Type = 0x88;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_4_9G  Ready....\r\n",bluecell_Currdatastatus.Type);break;
2422
-     case BLUECELL_5_0G: bluecell_Currdatastatus.Type = 0x89;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_5_0G  Ready....\r\n",bluecell_Currdatastatus.Type);break;
2423
-     case BLUECELL_DCM : bluecell_Currdatastatus.Type = 0x8A;bluecell_Currdatastatus.Carrier_ID = 0x01;printf("Type BLUECELL_DCM  Ready....\r\n",bluecell_Currdatastatus.Type); break;
2424
-     case BLUECELL_SBM : bluecell_Currdatastatus.Type = 0x8B;bluecell_Currdatastatus.Carrier_ID = 0x03; printf("Type BLUECELL_SBM  Ready....\r\n",bluecell_Currdatastatus.Type);break;
2425
-     case BLUECELL_KDDI: bluecell_Currdatastatus.Type = 0x8C;bluecell_Currdatastatus.Carrier_ID = 0x02;printf("Type BLUECELL_KDDI  Ready....\r\n",bluecell_Currdatastatus.Type); break;
2416
+     case BLUECELL_3_7G: bluecell_Currdatastatus.Type = 0x80;bluecell_Currdatastatus.Carrier_ID = 0x01 ;printf("Type BLUECELL_3_7G  Ready....\r\n"); break;
2417
+     case BLUECELL_3_8G: bluecell_Currdatastatus.Type = 0x81;bluecell_Currdatastatus.Carrier_ID = 0x02; printf("Type BLUECELL_3_8G  Ready....\r\n");break;
2418
+     case BLUECELL_3_9G: bluecell_Currdatastatus.Type = 0x82;bluecell_Currdatastatus.Carrier_ID = 0x04;printf("Type BLUECELL_3_9G  Ready....\r\n"); break;
2419
+     case BLUECELL_4_0G: bluecell_Currdatastatus.Type = 0x83;bluecell_Currdatastatus.Carrier_ID = 0x03; printf("Type BLUECELL_4_0G  Ready....\r\n");break;
2420
+     case BLUECELL_4_1G: bluecell_Currdatastatus.Type = 0x84;bluecell_Currdatastatus.Carrier_ID = 0x02; printf("Type BLUECELL_4_1G  Ready....\r\n");break;
2421
+     case BLUECELL_4_6G: bluecell_Currdatastatus.Type = 0x85;bluecell_Currdatastatus.Carrier_ID = 0x01; printf("Type BLUECELL_4_6G  Ready....\r\n");break;
2422
+     case BLUECELL_4_7G: bluecell_Currdatastatus.Type = 0x86;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_4_7G  Ready....\r\n");break;
2423
+     case BLUECELL_4_8G: bluecell_Currdatastatus.Type = 0x87;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_3_7G  Ready....\r\n");break;
2424
+     case BLUECELL_4_9G: bluecell_Currdatastatus.Type = 0x88;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_4_9G  Ready....\r\n");break;
2425
+     case BLUECELL_5_0G: bluecell_Currdatastatus.Type = 0x89;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_5_0G  Ready....\r\n");break;
2426
+     case BLUECELL_DCM : bluecell_Currdatastatus.Type = 0x8A;bluecell_Currdatastatus.Carrier_ID = 0x01;printf("Type BLUECELL_DCM  Ready....\r\n"); break;
2427
+     case BLUECELL_SBM : bluecell_Currdatastatus.Type = 0x8B;bluecell_Currdatastatus.Carrier_ID = 0x03; printf("Type BLUECELL_SBM  Ready....\r\n");break;
2428
+     case BLUECELL_KDDI: bluecell_Currdatastatus.Type = 0x8C;bluecell_Currdatastatus.Carrier_ID = 0x02;printf("Type BLUECELL_KDDI  Ready....\r\n"); break;
2426 2429
      default : printf("Type %x  Ready....\r\n",bluecell_Currdatastatus.Type);break;
2427 2430
     }
2428 2431
 
@@ -3256,19 +3259,19 @@ bool MBIC_Operate(uint8_t* data){
3256 3259
    // uint8_t Length = (data[MBIC_PROT_SUB_DATA_INDEX + 2]);
3257 3260
     uint8_t cmd = data[MBIC_PROT_CMD_INDEX];
3258 3261
 
3259
-    uint16_t Temp_ADC = 0;
3260
-    uint16_t i = 0;
3261
-    double temp = 0;
3262
-    int16_t Level = 0;
3263
-    int16_t tmpdata = 0;
3262
+    //uint16_t Temp_ADC = 0;
3263
+    //uint16_t i = 0;
3264
+    //double temp = 0;
3265
+    //int16_t Level = 0;
3266
+    //int16_t tmpdata = 0;
3264 3267
     uint16_t Length = data[MBIC_LENGTH_0] << 8 | data[MBIC_LENGTH_1];
3265
-    uint8_t* Tempdata;
3268
+    //uint8_t* Tempdata;
3266 3269
     uint16_t occurlen = Length;
3267 3270
     /*AID*/
3268 3271
   /* for(int i = 0; i < Length; i++){
3269 3272
         SubData[i] = (data[MBIC_PROT_SUB_DATA_INDEX + 3 + i]);
3270 3273
     }*/
3271
-    //    SubData     임시 데이터 변수 선언 Subdata로 데이터 전송 
3274
+    //    SubData     임시 데이터 변수 선언 Subdata로 데이터 전송
3272 3275
 
3273 3276
 
3274 3277
 	data[MBIC_PREAMBLE_0] = MBIC_PREAMBLE0;
@@ -3668,7 +3671,7 @@ bool MBIC_Operate(uint8_t* data){
3668 3671
     else if(cmd == MBIC_Table_Get){
3669 3672
         /*Table Get */
3670 3673
 //            data[MBIC_PAYLOADSTART + 1] //Reserve Data
3671
-        protocolTableLoadReplay:
3674
+        //protocolTableLoadReplay:
3672 3675
 
3673 3676
         switch(data[MBIC_PAYLOADSTART + 2]){
3674 3677
         	case DLI_P1_Level_Table_Number                 :
@@ -3732,7 +3735,7 @@ bool MBIC_Operate(uint8_t* data){
3732 3735
 //        }        
3733 3736
     }
3734 3737
     else if(cmd == MBIC_Table_Set){
3735
-            protocolTableSaveReplay:
3738
+           // protocolTableSaveReplay:
3736 3739
 //            data[MBIC_PAYLOADSTART + 1] //Reserve Data
3737 3740
             switch(data[MBIC_PAYLOADSTART + 2]){
3738 3741
                 case DLI_P1_Level_Table_Number                 :
@@ -3759,7 +3762,7 @@ bool MBIC_Operate(uint8_t* data){
3759 3762
                 case ULO_P2_ATT_Accuracy_Table_Number          :
3760 3763
                 case ULO_P3_ATT_Accuracy_Table_Number          :
3761 3764
                 case ULO_P4_ATT_Accuracy_Table_Number          :
3762
-              //Header 문장 + sizeof(ATT_TABLE_st) + EXT 문장 Length 추가 
3765
+              //Header 문장 + sizeof(ATT_TABLE_st) + EXT 문장 Length 추가
3763 3766
                 MBIC_TableSave(data,data[MBIC_PAYLOADSTART + 2]);
3764 3767
                 if(data[MBIC_PAYLOADSTART + MBIC_TableIndex_Number] >= DLI_P1_ATT_Accuracy_Table_Number
3765 3768
                  &&data[MBIC_TableIndex_Number] <= ULO_P4_ATT_Accuracy_Table_Number ){                
@@ -3865,8 +3868,8 @@ bool ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL_Shutdown_Index_MAX] = {false,} ;
3865 3868
 bool ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL_Shutdown_Index_MAX] = {false,} ;
3866 3869
 
3867 3870
 void DET_LevelAlarmCheck(){
3868
-    int16_t DL[DET_Alarm_DL_Index_MAX] = {0,};
3869
-    int16_t UL[DET_Alarm_UL_Index_MAX] = {0,};
3871
+    //int16_t DL[DET_Alarm_DL_Index_MAX] = {0,};
3872
+    //int16_t UL[DET_Alarm_UL_Index_MAX] = {0,};
3870 3873
     int16_t LimitData_UL_High = 0;
3871 3874
     
3872 3875
     int16_t LimitData_DL_High = 0;    
@@ -3889,14 +3892,14 @@ void DET_LevelAlarmCheck(){
3889 3892
     LimitData_DL_Shutdown = ConvertTo2byte(bluecell_Currdatastatus.DLI_Shutdown_Threshold_H,bluecell_Currdatastatus.DLI_Shutdown_Threshold_L)/ 10;
3890 3893
     LimitData_UL_Shutdown = ConvertTo2byte(bluecell_Currdatastatus.ULO_Shutdown_Threshold_H,bluecell_Currdatastatus.ULO_Shutdown_Threshold_L)/ 10;
3891 3894
     
3892
-    DL[DET_Alarm_DL1_Index] = ConvertTo2byte(bluecell_Currdatastatus.DLI_P1_Level1_H,bluecell_Currdatastatus.DLI_P1_Level1_L);
3895
+    /*DL[DET_Alarm_DL1_Index] = ConvertTo2byte(bluecell_Currdatastatus.DLI_P1_Level1_H,bluecell_Currdatastatus.DLI_P1_Level1_L);
3893 3896
     DL[DET_Alarm_DL2_Index] = ConvertTo2byte(bluecell_Currdatastatus.DLI_P2_Level2_H,bluecell_Currdatastatus.DLI_P2_Level2_L);
3894 3897
     DL[DET_Alarm_DL3_Index] = ConvertTo2byte(bluecell_Currdatastatus.DLI_P3_Level3_H,bluecell_Currdatastatus.DLI_P3_Level3_L);
3895 3898
     DL[DET_Alarm_DL4_Index] = ConvertTo2byte(bluecell_Currdatastatus.DLI_P4_Level4_H,bluecell_Currdatastatus.DLI_P4_Level4_L);
3896 3899
     UL[DET_Alarm_UL1_Index] = ConvertTo2byte(bluecell_Currdatastatus.ULO_P1_Level1_H,bluecell_Currdatastatus.ULO_P1_Level1_L);
3897 3900
     UL[DET_Alarm_UL2_Index] = ConvertTo2byte(bluecell_Currdatastatus.ULO_P2_Level2_H,bluecell_Currdatastatus.ULO_P2_Level2_L);
3898 3901
     UL[DET_Alarm_UL3_Index] = ConvertTo2byte(bluecell_Currdatastatus.ULO_P3_Level3_H,bluecell_Currdatastatus.ULO_P3_Level3_L);
3899
-    UL[DET_Alarm_UL4_Index] = ConvertTo2byte(bluecell_Currdatastatus.ULO_P4_Level4_H,bluecell_Currdatastatus.ULO_P4_Level4_L);
3902
+    UL[DET_Alarm_UL4_Index] = ConvertTo2byte(bluecell_Currdatastatus.ULO_P4_Level4_H,bluecell_Currdatastatus.ULO_P4_Level4_L);*/
3900 3903
 
3901 3904
     ret  = bluecell_Currdatastatus.DLI_P1_Level1_H << 8;
3902 3905
     ret += bluecell_Currdatastatus.DLI_P1_Level1_L;   
@@ -4166,7 +4169,7 @@ void ADC_Check(void){
4166 4169
             =((ADC1Ret[3] & 0x00FF) );
4167 4170
 #else    
4168 4171
 /* *
4169
-온도 소수점 제거  
4172
+온도 소수점 제거
4170 4173
 */
4171 4174
     temp = (ADC1Ret[3] * 0.001);
4172 4175
 //    printf("DetEnd");
@@ -4308,7 +4311,7 @@ double AutoControl_ADC_Compare(double CurrentAdc,uint8_t* CompareAdc,uint8_t siz
4308 4311
 //        printf("TableAdc[%d] : %f \r\n",i,TableAdc);
4309 4312
         CurrRet = TableAdc - CurrentAdc;
4310 4313
         
4311
-        if(CurrRet < 0){ // plus 공식 
4314
+        if(CurrRet < 0){ // plus 공식
4312 4315
             CurrRet = (CurrRet * -2) + CurrRet;
4313 4316
         }
4314 4317
         if(ret > CurrRet){
@@ -4551,8 +4554,8 @@ double ALC_Calc(uint8_t num,double CurrAtten ,int8_t threshold,double CurrDet){
4551 4554
 }
4552 4555
 
4553 4556
 void ALC_Function(){ //DL 
4554
-    double Volt_Calc_val = 3.3 / 4095;
4555
-    double tempret = 0;
4557
+    //double Volt_Calc_val = 3.3 / 4095;
4558
+    //double tempret = 0;
4556 4559
     double ret = 0;
4557 4560
    // double CurrnALCValue = 0;
4558 4561
     double CurrentATTENVALUE = 0;
@@ -4583,8 +4586,8 @@ void ALC_Function(){ //DL
4583 4586
             /***************************************************************************************************************/
4584 4587
             /*                                             ALC 1                                                           */
4585 4588
             /***************************************************************************************************************/            
4586
-            //ret 현재 Voltage 값 출력 
4587
-            //ret 에 따른 현재 DBM 구현 
4589
+            //ret 현재 Voltage 값 출력
4590
+            //ret 에 따른 현재 DBM 구현
4588 4591
             
4589 4592
             ret  = bluecell_Currdatastatus.ULO_P1_Level1_H << 8;
4590 4593
             ret += bluecell_Currdatastatus.ULO_P1_Level1_L;   
@@ -4659,8 +4662,8 @@ void ALC_Function(){ //DL
4659 4662
              /*                                             ALC 2                                                           */
4660 4663
              /***************************************************************************************************************/  
4661 4664
 
4662
-            //ret 현재 Voltage 값 출력 
4663
-            //ret 에 따른 현재 DBM 구현 
4665
+            //ret 현재 Voltage 값 출력
4666
+            //ret 에 따른 현재 DBM 구현
4664 4667
             
4665 4668
             ret  = bluecell_Currdatastatus.ULO_P2_Level2_H << 8;
4666 4669
             ret += bluecell_Currdatastatus.ULO_P2_Level2_L;   
@@ -4692,8 +4695,8 @@ void ALC_Function(){ //DL
4692 4695
             /***************************************************************************************************************/
4693 4696
             /*                                             ALC 3                                                           */
4694 4697
             /***************************************************************************************************************/              
4695
-            //ret 현재 Voltage 값 출력 
4696
-            //ret 에 따른 현재 DBM 구현 
4698
+            //ret 현재 Voltage 값 출력
4699
+            //ret 에 따른 현재 DBM 구현
4697 4700
             
4698 4701
             ret  = bluecell_Currdatastatus.ULO_P3_Level3_H << 8;
4699 4702
             ret += bluecell_Currdatastatus.ULO_P3_Level3_L;   
@@ -4728,8 +4731,8 @@ void ALC_Function(){ //DL
4728 4731
             /*                                             ALC 4                                                           */
4729 4732
             /***************************************************************************************************************/  
4730 4733
 
4731
-            //ret 현재 Voltage 값 출력 
4732
-            //ret 에 따른 현재 DBM 구현 
4734
+            //ret 현재 Voltage 값 출력
4735
+            //ret 에 따른 현재 DBM 구현
4733 4736
             
4734 4737
             ret  = bluecell_Currdatastatus.ULO_P4_Level4_H << 8;
4735 4738
             ret += bluecell_Currdatastatus.ULO_P4_Level4_L;   
@@ -4883,8 +4886,8 @@ void AGC_Function(){//DL
4883 4886
              bluecell_Currdatastatus.DLI_Level1_H = ((int16_t)ResdBm & 0xFF00) >> 8;
4884 4887
              bluecell_Currdatastatus.DLI_Level1_L = ((int16_t)ResdBm & 0x00FF);
4885 4888
 
4886
-                        //ret 현재 Voltage 값 출력 
4887
-            //ret 에 따른 현재 DBM 구현 
4889
+                        //ret 현재 Voltage 값 출력
4890
+            //ret 에 따른 현재 DBM 구현
4888 4891
             for(i = 0; i < sizeof(AGC_dBm_t); i++){
4889 4892
                 if(AGC_Table_ref[i] == ResdBm)
4890 4893
                     break;
@@ -5061,9 +5064,9 @@ void AGC_Function(){//DL
5061 5064
 }
5062 5065
 
5063 5066
 void DLI_LevelAlarmCheck(){
5064
-    double temp = 0;
5065
-    double ret = 0;
5066
-    int8_t ResdBm[4] = {0,};
5067
+    //double temp = 0;
5068
+    //double ret = 0;
5069
+    //int8_t ResdBm[4] = {0,};
5067 5070
 
5068 5071
     /*********************DL LEVEL LOW START****************************/
5069 5072
     if(DET_DL_Low_On_AlarmTimerCnt[DET_Alarm_DL1_Index] >= MBIC_ON_MAINTAIN_SEC
@@ -5168,9 +5171,9 @@ void DLI_LevelAlarmCheck(){
5168 5171
 
5169 5172
 }
5170 5173
 void ULO_LevelAlarmCheck(){
5171
-    double temp = 0;
5172
-    double ret = 0;
5173
-    int8_t ResdBm[4] = {0,};
5174
+    //double temp = 0;
5175
+    //double ret = 0;
5176
+    //int8_t ResdBm[4] = {0,};
5174 5177
 #if 1 // PYJ.2020.05.27_BEGIN -- 
5175 5178
         if(DET_UL_On_AlarmTimerCnt[DET_Alarm_UL1_Index] >= MBIC_ON_MAINTAIN_SEC
5176 5179
          &&ADC_Alarm_UL_Set[DET_Alarm_UL1_Index] == true){
@@ -5261,9 +5264,9 @@ void ULO_LevelAlarmCheck(){
5261 5264
 
5262 5265
 }
5263 5266
 void DLI_ShutdownAlarmCheck(){
5264
-    double temp = 0;
5265
-    double ret = 0;
5266
-    int8_t ResdBm[4] = {0,};
5267
+    //double temp = 0;
5268
+    //double ret = 0;
5269
+    //int8_t ResdBm[4] = {0,};
5267 5270
     /*DLI Shutdown On*/
5268 5271
     if(bluecell_Currdatastatus.DLI_Shutdown_ON_OFF == true){    
5269 5272
        if(DET_DL_Shutdown_On_AlarmTimerCnt[DET_Alarm_DL1_Shutdown_Index] >= MBIC_ON_SHUTDOWN_MAINTAIN_SEC)
@@ -5429,9 +5432,9 @@ void DLI_ShutdownAlarmCheck(){
5429 5432
 
5430 5433
 
5431 5434
 void ULO_ShutdownAlarmCheck(){
5432
-    double temp = 0;
5433
-    double ret = 0;
5434
-    int8_t ResdBm[4] = {0,};
5435
+   // double temp = 0;
5436
+    //double ret = 0;
5437
+   // int8_t ResdBm[4] = {0,};
5435 5438
 
5436 5439
 
5437 5440
 //        if(ALC_AlarmSet[ALC_Alarm_UL1_Index] == true
@@ -5610,9 +5613,9 @@ void ULO_ShutdownAlarmCheck(){
5610 5613
 
5611 5614
 
5612 5615
 void ULO_ALCAlarmCheck(){
5613
-    double temp = 0;
5614
-    double ret = 0;
5615
-    int8_t ResdBm[4] = {0,};
5616
+    //double temp = 0;
5617
+    //double ret = 0;
5618
+    //int8_t ResdBm[4] = {0,};
5616 5619
     if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
5617 5620
         if(ALC_AlarmSet[ALC_Alarm_UL1_Index] == true
5618 5621
          &&ALC_On_AlarmTimerCnt[ALC_Alarm_UL1_Index] >= MBIC_ON_MAINTAIN_SEC){
@@ -5663,9 +5666,9 @@ void ULO_ALCAlarmCheck(){
5663 5666
 
5664 5667
 }
5665 5668
 void DLI_AGCAlarmCheck(){
5666
-    double temp = 0;
5667
-    double ret = 0;
5668
-    int8_t ResdBm[4] = {0,};
5669
+    //double temp = 0;
5670
+    //double ret = 0;
5671
+    //int8_t ResdBm[4] = {0,};
5669 5672
 
5670 5673
 
5671 5674
 //    if(DET_DL_Low_On_AlarmTimerCnt[DET_Alarm_DL1_Index] >= MBIC_ON_MAINTAIN_SEC
@@ -5728,9 +5731,9 @@ void DLI_AGCAlarmCheck(){
5728 5731
     }
5729 5732
 }
5730 5733
 void Temp_HighAlarmCheck(){
5731
-    double temp = 0;
5732
-    double ret = 0;
5733
-    int8_t ResdBm[4] = {0,};
5734
+    //double temp = 0;
5735
+    //double ret = 0;
5736
+    //int8_t ResdBm[4] = {0,};
5734 5737
     if(bluecell_Currdatastatus.Temp_High_Threshold < (bluecell_Currdatastatus.DET_TEMP )){
5735 5738
         bluecell_Currdatastatus.ALARM_TEMP_HIGH |= ENVIRONMENT_TEMPHIGH;
5736 5739
         bluecell_Currdatastatus.Temp_High_Alarm = true;
@@ -5744,9 +5747,9 @@ void Temp_HighAlarmCheck(){
5744 5747
 }
5745 5748
 
5746 5749
 void Alarm_Check(){
5747
-    double temp = 0;
5748
-    double ret = 0;
5749
-    int8_t ResdBm[4] = {0,};
5750
+   // double temp = 0;
5751
+   // double ret = 0;
5752
+   // int8_t ResdBm[4] = {0,};
5750 5753
     if(bluecell_Currdatastatus.ALARM_MASK1 == false){
5751 5754
         bluecell_Currdatastatus.ALARM_TEMP_HIGH             = 0;
5752 5755
         bluecell_Currdatastatus.ALARM_DLI_Level             = 0;

+ 1 - 0
Bluecell_Src/uart.c

@@ -5,6 +5,7 @@
5 5
  *      Author: parkyj
6 6
  */
7 7
 #include <stdio.h>
8
+#include <stdint.h>
8 9
 #include "main.h"
9 10
 #include "uart.h"
10 11
 

+ 1 - 1
Src/main.c

@@ -134,7 +134,7 @@ static void MX_NVIC_Init(void);
134 134
 extern void Booting_LedInit(void);
135 135
 extern void Bluecell_AttenInitialize();
136 136
 extern void DET_LevelAlarmCheck();
137
-
137
+extern void Alarm_Check();
138 138
 /* USER CODE END PFP */
139 139
 
140 140
 /* Private user code ---------------------------------------------------------*/