Bläddra i källkod

ALARM Check 부분 추가 AGC 기능 수정및 보완/EEPROM 주소 값 32byte 배수 형태로 변경/ DL UL Table INDEX MBIC와 동일하게 변경

PYJ 5 år sedan
förälder
incheckning
99fdc0cce5
4 ändrade filer med 625 tillägg och 253 borttagningar
  1. 49 10
      Bluecell_Inc/Bluecell_operate.h
  2. 1 1
      Bluecell_Inc/eeprom.h
  3. 574 242
      Bluecell_Src/Bluecell_operate.c
  4. 1 0
      Src/main.c

+ 49 - 10
Bluecell_Inc/Bluecell_operate.h

@@ -86,7 +86,7 @@ typedef enum{
86
 
86
 
87
 	MBIC_HEADERCHECKSUM_0,
87
 	MBIC_HEADERCHECKSUM_0,
88
 	MBIC_PAYLOADSTART,
88
 	MBIC_PAYLOADSTART,
89
-	/*
89
+    /*
90
 	 * PayLoadSTART
90
 	 * PayLoadSTART
91
 	 */
91
 	 */
92
 }MBICProt_st;
92
 }MBICProt_st;
@@ -163,6 +163,10 @@ DLI_Level_Low_Alarm1,
163
 DLI_Level_Low_Alarm2,
163
 DLI_Level_Low_Alarm2,
164
 DLI_Level_Low_Alarm3,
164
 DLI_Level_Low_Alarm3,
165
 DLI_Level_Low_Alarm4,
165
 DLI_Level_Low_Alarm4,
166
+SERIAL_DL_NULL0,
167
+DLI_FRBT_Atten,
168
+DLI_FRBT_D_Day,
169
+DLI_FRBT_Status,
166
 DLI_AGC_ON_OFF=0xE050,
170
 DLI_AGC_ON_OFF=0xE050,
167
 DLI_AGC_Threshold,
171
 DLI_AGC_Threshold,
168
 DLI_AGC_Threshold_Default,
172
 DLI_AGC_Threshold_Default,
@@ -308,7 +312,33 @@ enum DATATYPE
308
     Bluecell_Reset,
312
     Bluecell_Reset,
309
 
313
 
310
 };
314
 };
311
-
315
+typedef enum{    
316
+	DLI_P1_Level_Table_Number = 0x00,
317
+	DLI_P2_Level_Table_Number = 0x01,
318
+	DLI_P3_Level_Table_Number = 0x02,
319
+	DLI_P4_Level_Table_Number = 0x03,
320
+	ULO_P1_Level_Table_Number = 0x10,
321
+	ULO_P2_Level_Table_Number = 0x11,
322
+	ULO_P3_Level_Table_Number = 0x12,
323
+	ULO_P4_Level_Table_Number = 0x13,
324
+	DLI_P1_ATT_Temp_guarantee_Table_Number = 0x20,
325
+	DLI_P2_ATT_Temp_guarantee_Table_Number = 0x21,
326
+	DLI_P3_ATT_Temp_guarantee_Table_Number = 0x22,
327
+	DLI_P4_ATT_Temp_guarantee_Table_Number = 0x23,
328
+	ULO_P1_ATT_Temp_guarantee_Table_Number = 0x30,
329
+	ULO_P2_ATT_Temp_guarantee_Table_Number = 0x31,
330
+	ULO_P3_ATT_Temp_guarantee_Table_Number = 0x32,
331
+	ULO_P4_ATT_Temp_guarantee_Table_Number = 0x33,
332
+	DLI_P1_ATT_Accuracy_Table_Number = 0x40,
333
+	DLI_P2_ATT_Accuracy_Table_Number = 0x41,
334
+	DLI_P3_ATT_Accuracy_Table_Number = 0x42,
335
+	DLI_P4_ATT_Accuracy_Table_Number = 0x43,
336
+	ULO_P1_ATT_Accuracy_Table_Number = 0x50,
337
+	ULO_P2_ATT_Accuracy_Table_Number = 0x51,
338
+	ULO_P3_ATT_Accuracy_Table_Number = 0x52,
339
+	ULO_P4_ATT_Accuracy_Table_Number = 0x53,
340
+}MBIC_Table_Number;
341
+#define UNIT_TYPE_MBIC 0x01
312
 /*FLAG BIT START */
342
 /*FLAG BIT START */
313
 #define ENVIRONMENT_TEMPHIGH 0x80
343
 #define ENVIRONMENT_TEMPHIGH 0x80
314
 #define ALARM_DLI_P4_LEVEL_LOW 0x80
344
 #define ALARM_DLI_P4_LEVEL_LOW 0x80
@@ -369,7 +399,7 @@ enum DATATYPE
369
 #define MBIC_ULO_Shutdown_Threshold_Default_H 0xFF
399
 #define MBIC_ULO_Shutdown_Threshold_Default_H 0xFF
370
 #define MBIC_ULO_Shutdown_Threshold_Default_L 0xF0
400
 #define MBIC_ULO_Shutdown_Threshold_Default_L 0xF0
371
 
401
 
372
-
402
+#define HIDDENATTEN 5 * 10
373
 typedef enum{
403
 typedef enum{
374
 	ENVIRONMENT = 0,
404
 	ENVIRONMENT = 0,
375
 	DL1,
405
 	DL1,
@@ -442,7 +472,7 @@ typedef struct{
442
     uint8_t DET_UL4_IN_L;//ADC3   4
472
     uint8_t DET_UL4_IN_L;//ADC3   4
443
     uint8_t BLUECELL_RESERVE1;
473
     uint8_t BLUECELL_RESERVE1;
444
     uint8_t DET_TEMP;
474
     uint8_t DET_TEMP;
445
-    uint8_t ATT_AGC1_ONOFF;
475
+    uint8_t DLI_AGC_ON_OFF;
446
     uint8_t ATT_ALC1_ONOFF;
476
     uint8_t ATT_ALC1_ONOFF;
447
     uint8_t ATT_AGC2_ONOFF;
477
     uint8_t ATT_AGC2_ONOFF;
448
     uint8_t ATT_ALC2_ONOFF;
478
     uint8_t ATT_ALC2_ONOFF;
@@ -458,8 +488,8 @@ typedef struct{
458
     uint8_t ATT_ALC3_MAX_L;
488
     uint8_t ATT_ALC3_MAX_L;
459
     uint8_t ATT_ALC4_MAX_H;
489
     uint8_t ATT_ALC4_MAX_H;
460
     uint8_t ATT_ALC4_MAX_L;
490
     uint8_t ATT_ALC4_MAX_L;
461
-    uint8_t ULO_ALC_Threshold_H;
462
-    uint8_t ULO_ALC_Threshold_L;
491
+    uint8_t ATT_ALC_Threshold_H;
492
+    uint8_t ATT_ALC_Threshold_L;
463
     uint8_t ATT_ALC2_MIN_H;
493
     uint8_t ATT_ALC2_MIN_H;
464
     uint8_t ATT_ALC2_MIN_L;
494
     uint8_t ATT_ALC2_MIN_L;
465
     uint8_t ATT_ALC3_MIN_H;
495
     uint8_t ATT_ALC3_MIN_H;
@@ -496,7 +526,7 @@ typedef struct{
496
     uint8_t ALARM_DLI_Level;
526
     uint8_t ALARM_DLI_Level;
497
     uint8_t ALARM_DLI_AGC_SHTUTDOWN;
527
     uint8_t ALARM_DLI_AGC_SHTUTDOWN;
498
     uint8_t ALARM_ULO_Level;
528
     uint8_t ALARM_ULO_Level;
499
-    uint8_t ALARM_ULO_AGC_SHTUTDOWN;
529
+    uint8_t ALARM_ULO_ALC_SHTUTDOWN;
500
     uint8_t ALARM_MASK1;
530
     uint8_t ALARM_MASK1;
501
     uint8_t ALARM_TESTMODE;
531
     uint8_t ALARM_TESTMODE;
502
     uint8_t ALARM_Test_Dummy1;
532
     uint8_t ALARM_Test_Dummy1;
@@ -569,7 +599,6 @@ typedef struct{
569
     
599
     
570
     uint8_t DLI_FRBT_Status;
600
     uint8_t DLI_FRBT_Status;
571
     
601
     
572
-    uint8_t DLI_AGC_ON_OFF;
573
     uint8_t DLI_AGC_Threshold_H;
602
     uint8_t DLI_AGC_Threshold_H;
574
     uint8_t DLI_AGC_Threshold_L;
603
     uint8_t DLI_AGC_Threshold_L;
575
     uint8_t DLI_AGC_Threshold_default;
604
     uint8_t DLI_AGC_Threshold_default;
@@ -618,8 +647,6 @@ typedef struct{
618
     uint8_t ULO_Level_High_Alarm3;
647
     uint8_t ULO_Level_High_Alarm3;
619
     uint8_t ULO_Level_High_Alarm4;
648
     uint8_t ULO_Level_High_Alarm4;
620
     uint8_t ULO_ALC_ON_OFF;
649
     uint8_t ULO_ALC_ON_OFF;
621
-//    uint8_t ULO_ALC_Threshold_H;
622
-//    uint8_t ULO_ALC_Threshold_L;    
623
     uint8_t ULO_ALC_Threshold_Default;
650
     uint8_t ULO_ALC_Threshold_Default;
624
     uint8_t ULO_Shutdown_ON_OFF;
651
     uint8_t ULO_Shutdown_ON_OFF;
625
     uint8_t ULO_Shutdown_Threshold_H;
652
     uint8_t ULO_Shutdown_Threshold_H;
@@ -637,6 +664,18 @@ typedef struct{
637
     uint8_t ULO_Shutdown_Alarm2;
664
     uint8_t ULO_Shutdown_Alarm2;
638
     uint8_t ULO_Shutdown_Alarm3;
665
     uint8_t ULO_Shutdown_Alarm3;
639
     uint8_t ULO_Shutdown_Alarm4;
666
     uint8_t ULO_Shutdown_Alarm4;
667
+
668
+    uint8_t Reserve0;
669
+    uint8_t Reserve1;
670
+    uint8_t Reserve2;
671
+    uint8_t Reserve3;
672
+    uint8_t Reserve4;
673
+    uint8_t Reserve5;
674
+    uint8_t Reserve6;
675
+    uint8_t Reserve7;    
676
+    uint8_t Reserve8;
677
+    uint8_t Reserve9;
678
+
640
     uint8_t bluecell_crc;
679
     uint8_t bluecell_crc;
641
     uint8_t bluecell_etx;
680
     uint8_t bluecell_etx;
642
 
681
 

+ 1 - 1
Bluecell_Inc/eeprom.h

@@ -15,7 +15,7 @@
15
 
15
 
16
 #if 1 // PYJ.2020.04.25_BEGIN -- 
16
 #if 1 // PYJ.2020.04.25_BEGIN -- 
17
 
17
 
18
-#define EEPROM_ATT_DL1_TABLE_ADDRESDS	 (( EEPROM_ATT_BASE                 +(sizeof(ATT_TABLE_st))   )  & 0xFFFF) //128
18
+#define EEPROM_ATT_DL1_TABLE_ADDRESDS	 (( EEPROM_ATT_BASE                 + (sizeof(ATT_TABLE_st))   )  & 0xFFFF) //128
19
 #define EEPROM_ATT_DL2_TABLE_ADDRESDS	 (( EEPROM_ATT_DL1_TABLE_ADDRESDS  + (sizeof(ATT_TABLE_st))  ) & 0xFFFF) 
19
 #define EEPROM_ATT_DL2_TABLE_ADDRESDS	 (( EEPROM_ATT_DL1_TABLE_ADDRESDS  + (sizeof(ATT_TABLE_st))  ) & 0xFFFF) 
20
 #define EEPROM_ATT_DL3_TABLE_ADDRESDS	 (( EEPROM_ATT_DL2_TABLE_ADDRESDS  + (sizeof(ATT_TABLE_st))  ) & 0xFFFF)
20
 #define EEPROM_ATT_DL3_TABLE_ADDRESDS	 (( EEPROM_ATT_DL2_TABLE_ADDRESDS  + (sizeof(ATT_TABLE_st))  ) & 0xFFFF)
21
 #define EEPROM_ATT_DL4_TABLE_ADDRESDS	 (( EEPROM_ATT_DL3_TABLE_ADDRESDS  + (sizeof(ATT_TABLE_st))  ) & 0xFFFF)
21
 #define EEPROM_ATT_DL4_TABLE_ADDRESDS	 (( EEPROM_ATT_DL3_TABLE_ADDRESDS  + (sizeof(ATT_TABLE_st))  ) & 0xFFFF)

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 574 - 242
Bluecell_Src/Bluecell_operate.c


+ 1 - 0
Src/main.c

@@ -346,6 +346,7 @@ int main(void)
346
     ADC_Check();
346
     ADC_Check();
347
     ALC_Function();
347
     ALC_Function();
348
     AGC_Function();
348
     AGC_Function();
349
+    Alarm_Check();
349
     /* USER CODE END WHILE */
350
     /* USER CODE END WHILE */
350
 
351
 
351
     /* USER CODE BEGIN 3 */
352
     /* USER CODE BEGIN 3 */