|
@@ -293,6 +293,7 @@ uint8_t PE43711_Calc_NoTable(uint8_t high_bit,uint8_t low_bit){
|
293
|
293
|
PE43711_DataToHexConvert(ret);
|
294
|
294
|
return 0;
|
295
|
295
|
}
|
|
296
|
+/*2 byte Data Double Convert Function*/
|
296
|
297
|
double PE43711_Double(uint8_t high_bit,uint8_t low_bit){
|
297
|
298
|
uint16_t tmp_h = 0,tmp_l = 0;
|
298
|
299
|
double ret = 0;
|
|
@@ -301,6 +302,7 @@ double PE43711_Double(uint8_t high_bit,uint8_t low_bit){
|
301
|
302
|
tmp_l = low_bit;
|
302
|
303
|
ret = ((tmp_h << 8) & 0xFF00);
|
303
|
304
|
ret += (tmp_l & 0x00FF);
|
|
305
|
+ /*Minus Convert*/
|
304
|
306
|
if((((tmp_h << 8) & 0xFF00) & 0xF000) == 0xF000){
|
305
|
307
|
// printf("minus Calc Start\r\n");
|
306
|
308
|
ret = 0xFFFF - ret;
|
|
@@ -315,8 +317,8 @@ double PE43711_Double(uint8_t high_bit,uint8_t low_bit){
|
315
|
317
|
return ret;
|
316
|
318
|
|
317
|
319
|
}
|
318
|
|
-uint8_t GuaranteeData[256];
|
319
|
320
|
double TableAtteGuarantee(uint8_t* Table,double AttenValue){
|
|
321
|
+ int8_t GuaranteeData[256];
|
320
|
322
|
double ret = 0;
|
321
|
323
|
//double ref = 0;
|
322
|
324
|
uint8_t cnt = 0;
|
|
@@ -327,7 +329,8 @@ double TableAtteGuarantee(uint8_t* Table,double AttenValue){
|
327
|
329
|
Bluecell_StructCpy(&GuaranteeData[0],&Table[0],sizeof(ATT_TABLE_st));
|
328
|
330
|
|
329
|
331
|
// printf("H : %x L : %x \r\n",GuaranteeData[cnt * 2],GuaranteeData[cnt * 2 + 1]);
|
330
|
|
- ret = PE43711_Double(GuaranteeData[cnt * 2],GuaranteeData[cnt * 2 + 1]);
|
|
332
|
+ ret = GuaranteeData[cnt] / 2;
|
|
333
|
+//= PE43711_Double(GuaranteeData[cnt * 2],GuaranteeData[cnt * 2 + 1]);
|
331
|
334
|
// printf("ret3 : %f \r\n",ret); //1
|
332
|
335
|
ret += AttenValue;
|
333
|
336
|
// printf("ret4 : %f \r\n",ret);
|
|
@@ -352,7 +355,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
352
|
355
|
bluecell_Prevdatastatus.ATT_DL1_L = bluecell_Currdatastatus.ATT_DL1_L;
|
353
|
356
|
bluecell_Prevdatastatus.bluecell_User_DL1_H = bluecell_Currdatastatus.bluecell_User_DL1_H;
|
354
|
357
|
bluecell_Prevdatastatus.bluecell_User_DL1_L = bluecell_Currdatastatus.bluecell_User_DL1_L;
|
355
|
|
- val = PE43711_Calc(&Att_DL1.Table_0_0_dBm_H,
|
|
358
|
+ val = PE43711_Calc(&Att_DL1.Table_0_0_dBm,
|
356
|
359
|
Curr.ATT_DL1_H,
|
357
|
360
|
Curr.ATT_DL1_L,
|
358
|
361
|
bluecell_Currdatastatus.bluecell_User_DL1_H,
|
|
@@ -373,7 +376,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
373
|
376
|
bluecell_Prevdatastatus.ATT_DL2_L = bluecell_Currdatastatus.ATT_DL2_L;
|
374
|
377
|
bluecell_Prevdatastatus.bluecell_User_DL2_H = bluecell_Currdatastatus.bluecell_User_DL2_H;
|
375
|
378
|
bluecell_Prevdatastatus.bluecell_User_DL2_L = bluecell_Currdatastatus.bluecell_User_DL2_L;
|
376
|
|
- val = PE43711_Calc(&Att_DL2.Table_0_0_dBm_H,
|
|
379
|
+ val = PE43711_Calc(&Att_DL2.Table_0_0_dBm,
|
377
|
380
|
Curr.ATT_DL2_H,
|
378
|
381
|
Curr.ATT_DL2_L,
|
379
|
382
|
bluecell_Currdatastatus.bluecell_User_DL2_H,
|
|
@@ -395,7 +398,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
395
|
398
|
bluecell_Prevdatastatus.ATT_DL3_L = bluecell_Currdatastatus.ATT_DL3_L;
|
396
|
399
|
bluecell_Prevdatastatus.bluecell_User_DL3_H = bluecell_Currdatastatus.bluecell_User_DL3_H;
|
397
|
400
|
bluecell_Prevdatastatus.bluecell_User_DL3_L = bluecell_Currdatastatus.bluecell_User_DL3_L;
|
398
|
|
- val = PE43711_Calc(&Att_DL3.Table_0_0_dBm_H,
|
|
401
|
+ val = PE43711_Calc(&Att_DL3.Table_0_0_dBm,
|
399
|
402
|
Curr.ATT_DL3_H,
|
400
|
403
|
Curr.ATT_DL3_L,
|
401
|
404
|
bluecell_Currdatastatus.bluecell_User_DL3_H,
|
|
@@ -419,7 +422,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
419
|
422
|
bluecell_Prevdatastatus.ATT_DL4_L = bluecell_Currdatastatus.ATT_DL4_L;
|
420
|
423
|
bluecell_Prevdatastatus.bluecell_User_DL4_H = bluecell_Currdatastatus.bluecell_User_DL4_H;
|
421
|
424
|
bluecell_Prevdatastatus.bluecell_User_DL4_L = bluecell_Currdatastatus.bluecell_User_DL4_L;
|
422
|
|
- val = PE43711_Calc(&Att_DL4.Table_0_0_dBm_H,
|
|
425
|
+ val = PE43711_Calc(&Att_DL4.Table_0_0_dBm,
|
423
|
426
|
Curr.ATT_DL4_H,
|
424
|
427
|
Curr.ATT_DL4_L,
|
425
|
428
|
bluecell_Currdatastatus.bluecell_User_DL4_H,
|
|
@@ -442,7 +445,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
442
|
445
|
bluecell_Prevdatastatus.ATT_UL1_L = bluecell_Currdatastatus.ATT_UL1_L;
|
443
|
446
|
bluecell_Prevdatastatus.bluecell_User_UL1_H = bluecell_Currdatastatus.bluecell_User_UL1_H;
|
444
|
447
|
bluecell_Prevdatastatus.bluecell_User_UL1_L = bluecell_Currdatastatus.bluecell_User_UL1_L;
|
445
|
|
- val = PE43711_Calc(&Att_UL1.Table_0_0_dBm_H,
|
|
448
|
+ val = PE43711_Calc(&Att_UL1.Table_0_0_dBm,
|
446
|
449
|
Curr.ATT_UL1_H,
|
447
|
450
|
Curr.ATT_UL1_L,
|
448
|
451
|
bluecell_Currdatastatus.bluecell_User_UL1_H,
|
|
@@ -462,7 +465,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
462
|
465
|
bluecell_Prevdatastatus.ATT_UL2_L = bluecell_Currdatastatus.ATT_UL2_L;
|
463
|
466
|
bluecell_Prevdatastatus.bluecell_User_UL2_H = bluecell_Currdatastatus.bluecell_User_UL2_H;
|
464
|
467
|
bluecell_Prevdatastatus.bluecell_User_UL2_L = bluecell_Currdatastatus.bluecell_User_UL2_L;
|
465
|
|
- val = PE43711_Calc(&Att_UL2.Table_0_0_dBm_H,
|
|
468
|
+ val = PE43711_Calc(&Att_UL2.Table_0_0_dBm,
|
466
|
469
|
Curr.ATT_UL2_H,
|
467
|
470
|
Curr.ATT_UL2_L,
|
468
|
471
|
bluecell_Currdatastatus.bluecell_User_UL2_H,
|
|
@@ -485,7 +488,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
485
|
488
|
bluecell_Prevdatastatus.bluecell_User_UL3_H = bluecell_Currdatastatus.bluecell_User_UL3_H;
|
486
|
489
|
bluecell_Prevdatastatus.bluecell_User_UL3_L = bluecell_Currdatastatus.bluecell_User_UL3_L;
|
487
|
490
|
|
488
|
|
- val = PE43711_Calc(&Att_UL3.Table_0_0_dBm_H,
|
|
491
|
+ val = PE43711_Calc(&Att_UL3.Table_0_0_dBm,
|
489
|
492
|
Curr.ATT_UL3_H,
|
490
|
493
|
Curr.ATT_UL3_L,
|
491
|
494
|
bluecell_Currdatastatus.bluecell_User_UL3_H,
|
|
@@ -506,7 +509,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
506
|
509
|
bluecell_Prevdatastatus.bluecell_User_UL4_H = bluecell_Currdatastatus.bluecell_User_UL4_H;
|
507
|
510
|
bluecell_Prevdatastatus.bluecell_User_UL4_L = bluecell_Currdatastatus.bluecell_User_UL4_L;
|
508
|
511
|
|
509
|
|
- val = PE43711_Calc(&Att_UL4.Table_0_0_dBm_H,
|
|
512
|
+ val = PE43711_Calc(&Att_UL4.Table_0_0_dBm,
|
510
|
513
|
Curr.ATT_UL4_H,
|
511
|
514
|
Curr.ATT_UL4_L,
|
512
|
515
|
bluecell_Currdatastatus.bluecell_User_UL4_H,
|
|
@@ -526,7 +529,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
526
|
529
|
bluecell_Prevdatastatus.ATT_ALC1_MAX_L = bluecell_Currdatastatus.ATT_ALC1_MAX_L;
|
527
|
530
|
bluecell_Prevdatastatus.bluecell_User_UL1_H = bluecell_Currdatastatus.bluecell_User_UL1_H;
|
528
|
531
|
bluecell_Prevdatastatus.bluecell_User_UL1_L = bluecell_Currdatastatus.bluecell_User_UL1_L;
|
529
|
|
- val = PE43711_Calc(&Att_UL1.Table_0_0_dBm_H,
|
|
532
|
+ val = PE43711_Calc(&Att_UL1.Table_0_0_dBm,
|
530
|
533
|
Curr.ATT_ALC1_MAX_H,
|
531
|
534
|
Curr.ATT_ALC1_MAX_L,
|
532
|
535
|
bluecell_Currdatastatus.bluecell_User_DL1_H,
|
|
@@ -543,7 +546,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
543
|
546
|
bluecell_Prevdatastatus.ATT_ALC2_MAX_L = bluecell_Currdatastatus.ATT_ALC2_MAX_L;
|
544
|
547
|
bluecell_Prevdatastatus.bluecell_User_UL2_H = bluecell_Currdatastatus.bluecell_User_UL2_H;
|
545
|
548
|
bluecell_Prevdatastatus.bluecell_User_UL2_L = bluecell_Currdatastatus.bluecell_User_UL2_L;
|
546
|
|
- val = PE43711_Calc(&Att_UL2.Table_0_0_dBm_H,
|
|
549
|
+ val = PE43711_Calc(&Att_UL2.Table_0_0_dBm,
|
547
|
550
|
Curr.ATT_ALC2_MAX_H,
|
548
|
551
|
Curr.ATT_ALC2_MAX_L,
|
549
|
552
|
bluecell_Currdatastatus.bluecell_User_DL2_H,
|
|
@@ -560,7 +563,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
560
|
563
|
bluecell_Prevdatastatus.ATT_ALC3_MAX_L = bluecell_Currdatastatus.ATT_ALC3_MAX_L;
|
561
|
564
|
bluecell_Prevdatastatus.bluecell_User_UL3_H = bluecell_Currdatastatus.bluecell_User_UL3_H;
|
562
|
565
|
bluecell_Prevdatastatus.bluecell_User_UL3_L = bluecell_Currdatastatus.bluecell_User_UL3_L;
|
563
|
|
- val = PE43711_Calc(&Att_UL3.Table_0_0_dBm_H,
|
|
566
|
+ val = PE43711_Calc(&Att_UL3.Table_0_0_dBm,
|
564
|
567
|
Curr.ATT_ALC3_MAX_H,
|
565
|
568
|
Curr.ATT_ALC3_MAX_L,
|
566
|
569
|
bluecell_Currdatastatus.bluecell_User_DL3_H,
|
|
@@ -578,7 +581,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
578
|
581
|
bluecell_Prevdatastatus.ATT_ALC4_MAX_L = bluecell_Currdatastatus.ATT_ALC4_MAX_L;
|
579
|
582
|
bluecell_Prevdatastatus.bluecell_User_UL4_H = bluecell_Currdatastatus.bluecell_User_UL4_H;
|
580
|
583
|
bluecell_Prevdatastatus.bluecell_User_UL4_L = bluecell_Currdatastatus.bluecell_User_UL4_L;
|
581
|
|
- val = PE43711_Calc(&Att_UL4.Table_0_0_dBm_H,
|
|
584
|
+ val = PE43711_Calc(&Att_UL4.Table_0_0_dBm,
|
582
|
585
|
Curr.ATT_ALC4_MAX_H,
|
583
|
586
|
Curr.ATT_ALC4_MAX_L,
|
584
|
587
|
bluecell_Currdatastatus.bluecell_User_DL4_H,
|
|
@@ -589,17 +592,17 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
589
|
592
|
}
|
590
|
593
|
|
591
|
594
|
|
592
|
|
- if((Curr.ATT_ALC1_MIN_H != Prev.ATT_ALC1_MIN_H
|
593
|
|
- ||Curr.ATT_ALC1_MIN_L != Prev.ATT_ALC1_MIN_L)
|
|
595
|
+ if((Curr.ULO_ALC_Threshold_H != Prev.ULO_ALC_Threshold_H
|
|
596
|
+ ||Curr.ULO_ALC_Threshold_L != Prev.ULO_ALC_Threshold_L)
|
594
|
597
|
||(Curr.bluecell_User_UL1_H != Prev.bluecell_User_UL1_H
|
595
|
598
|
||Curr.bluecell_User_UL1_L != Prev.bluecell_User_UL1_L)){
|
596
|
|
- bluecell_Prevdatastatus.ATT_ALC1_MIN_H = bluecell_Currdatastatus.ATT_ALC1_MIN_H;
|
597
|
|
- bluecell_Prevdatastatus.ATT_ALC1_MIN_L = bluecell_Currdatastatus.ATT_ALC1_MIN_L;
|
|
599
|
+ bluecell_Prevdatastatus.ULO_ALC_Threshold_H = bluecell_Currdatastatus.ULO_ALC_Threshold_H;
|
|
600
|
+ bluecell_Prevdatastatus.ULO_ALC_Threshold_L = bluecell_Currdatastatus.ULO_ALC_Threshold_L;
|
598
|
601
|
bluecell_Prevdatastatus.bluecell_User_UL1_H = bluecell_Currdatastatus.bluecell_User_UL1_H;
|
599
|
602
|
bluecell_Prevdatastatus.bluecell_User_UL1_L = bluecell_Currdatastatus.bluecell_User_UL1_L;
|
600
|
|
- val = PE43711_Calc(&Att_DL1.Table_0_0_dBm_H,
|
601
|
|
- Curr.ATT_ALC1_MIN_H,
|
602
|
|
- Curr.ATT_ALC1_MIN_L,
|
|
603
|
+ val = PE43711_Calc(&Att_DL1.Table_0_0_dBm,
|
|
604
|
+ Curr.ULO_ALC_Threshold_H,
|
|
605
|
+ Curr.ULO_ALC_Threshold_L,
|
603
|
606
|
bluecell_Currdatastatus.bluecell_User_UL1_H,
|
604
|
607
|
bluecell_Currdatastatus.bluecell_User_UL1_L);
|
605
|
608
|
|
|
@@ -614,7 +617,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
614
|
617
|
bluecell_Prevdatastatus.ATT_ALC2_MIN_L = bluecell_Currdatastatus.ATT_ALC2_MIN_L;
|
615
|
618
|
bluecell_Prevdatastatus.bluecell_User_UL2_H = bluecell_Currdatastatus.bluecell_User_UL2_H;
|
616
|
619
|
bluecell_Prevdatastatus.bluecell_User_UL2_L = bluecell_Currdatastatus.bluecell_User_UL2_L;
|
617
|
|
- val = PE43711_Calc(&Att_DL2.Table_0_0_dBm_H,
|
|
620
|
+ val = PE43711_Calc(&Att_DL2.Table_0_0_dBm,
|
618
|
621
|
Curr.ATT_ALC2_MIN_H,
|
619
|
622
|
Curr.ATT_ALC2_MIN_L,
|
620
|
623
|
bluecell_Currdatastatus.bluecell_User_UL2_H,
|
|
@@ -631,7 +634,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
631
|
634
|
bluecell_Prevdatastatus.ATT_ALC3_MIN_L = bluecell_Currdatastatus.ATT_ALC3_MIN_L;
|
632
|
635
|
bluecell_Prevdatastatus.bluecell_User_UL3_H = bluecell_Currdatastatus.bluecell_User_UL3_H;
|
633
|
636
|
bluecell_Prevdatastatus.bluecell_User_UL3_L = bluecell_Currdatastatus.bluecell_User_UL3_L;
|
634
|
|
- val = PE43711_Calc(&Att_DL3.Table_0_0_dBm_H,
|
|
637
|
+ val = PE43711_Calc(&Att_DL3.Table_0_0_dBm,
|
635
|
638
|
Curr.ATT_ALC3_MIN_H,
|
636
|
639
|
Curr.ATT_ALC3_MIN_L,
|
637
|
640
|
bluecell_Currdatastatus.bluecell_User_UL3_H,
|
|
@@ -648,7 +651,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
|
648
|
651
|
bluecell_Prevdatastatus.ATT_ALC4_MIN_L = bluecell_Currdatastatus.ATT_ALC4_MIN_L;
|
649
|
652
|
bluecell_Prevdatastatus.bluecell_User_UL4_H = bluecell_Currdatastatus.bluecell_User_UL4_H;
|
650
|
653
|
bluecell_Prevdatastatus.bluecell_User_UL4_L = bluecell_Currdatastatus.bluecell_User_UL4_L;
|
651
|
|
- val = PE43711_Calc(&Att_DL4.Table_0_0_dBm_H,
|
|
654
|
+ val = PE43711_Calc(&Att_DL4.Table_0_0_dBm,
|
652
|
655
|
Curr.ATT_ALC4_MIN_H,
|
653
|
656
|
Curr.ATT_ALC4_MIN_L,
|
654
|
657
|
bluecell_Currdatastatus.bluecell_User_UL4_H,
|
|
@@ -725,44 +728,46 @@ void Bluecell_TableLoad(uint8_t* data){
|
725
|
728
|
// printf("%s : %x \r\n",__func__,tabletype);
|
726
|
729
|
switch(tabletype){
|
727
|
730
|
case Bluecell_Table_ATT_DL1:
|
728
|
|
- EEPROM_M24C08_Read(EEPROM_M24C08_ID ,EEPROM_WINDOW_STATUS_ADDRESDS ,&Att_DL1.Table_0_0_dBm_H,sizeof(ATT_TABLE_st) );
|
729
|
|
- Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_DL1.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
730
|
|
-// Bluecell_structprintf(&Att_DL1.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
731
|
+ EEPROM_M24C08_Read(EEPROM_M24C08_ID ,EEPROM_ATT_BASE ,&Att_DL1.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
|
|
732
|
+// EEPROM_M24C08_Read(EEPROM_M24C08_ID ,EEPROM_WINDOW_STATUS_ADDRESDS ,&Att_DL1.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
|
|
733
|
+
|
|
734
|
+ Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_DL1.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
|
735
|
+// Bluecell_structprintf(&Att_DL1.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
731
|
736
|
data[BLUECELL_LENGTH] = (sizeof(ATT_TABLE_st)) + 7 - 3;
|
732
|
737
|
break;
|
733
|
738
|
case Bluecell_Table_ATT_DL2:
|
734
|
|
- EEPROM_M24C08_Read(EEPROM_M24C08_ID ,(EEPROM_ATT_DL1_TABLE_ADDRESDS),&Att_DL2.Table_0_0_dBm_H,sizeof(ATT_TABLE_st) );
|
735
|
|
- Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_DL2.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
739
|
+ EEPROM_M24C08_Read(EEPROM_M24C08_ID ,(EEPROM_ATT_DL1_TABLE_ADDRESDS),&Att_DL2.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
|
|
740
|
+ Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_DL2.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
736
|
741
|
data[BLUECELL_LENGTH] = (sizeof(ATT_TABLE_st)) + 7 - 3;
|
737
|
742
|
break;
|
738
|
743
|
case Bluecell_Table_ATT_DL3:
|
739
|
|
- EEPROM_M24C08_Read(EEPROM_M24C08_ID ,(EEPROM_ATT_DL2_TABLE_ADDRESDS),&Att_DL3.Table_0_0_dBm_H,sizeof(ATT_TABLE_st) );
|
740
|
|
- Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_DL3.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
744
|
+ EEPROM_M24C08_Read(EEPROM_M24C08_ID ,(EEPROM_ATT_DL2_TABLE_ADDRESDS),&Att_DL3.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
|
|
745
|
+ Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_DL3.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
741
|
746
|
data[BLUECELL_LENGTH] = (sizeof(ATT_TABLE_st)) + 7 - 3;
|
742
|
747
|
break;
|
743
|
748
|
case Bluecell_Table_ATT_DL4:
|
744
|
|
- EEPROM_M24C08_Read(EEPROM_M24C08_ID ,(EEPROM_ATT_DL3_TABLE_ADDRESDS),&Att_DL4.Table_0_0_dBm_H,sizeof(ATT_TABLE_st) );
|
745
|
|
- Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_DL4.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
749
|
+ EEPROM_M24C08_Read(EEPROM_M24C08_ID ,(EEPROM_ATT_DL3_TABLE_ADDRESDS),&Att_DL4.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
|
|
750
|
+ Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_DL4.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
746
|
751
|
data[BLUECELL_LENGTH] = (sizeof(ATT_TABLE_st)) + 7 - 3;
|
747
|
752
|
break;
|
748
|
753
|
case Bluecell_Table_ATT_UL1:
|
749
|
|
- EEPROM_M24C08_Read(EEPROM_M24C08_ID ,(EEPROM_ATT_DL4_TABLE_ADDRESDS),&Att_UL1.Table_0_0_dBm_H,sizeof(ATT_TABLE_st) );
|
750
|
|
- Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_UL1.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
754
|
+ EEPROM_M24C08_Read(EEPROM_M24C08_ID ,(EEPROM_ATT_DL4_TABLE_ADDRESDS),&Att_UL1.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
|
|
755
|
+ Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_UL1.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
751
|
756
|
data[BLUECELL_LENGTH] = (sizeof(ATT_TABLE_st)) + 7 - 3;
|
752
|
757
|
break;
|
753
|
758
|
case Bluecell_Table_ATT_UL2:
|
754
|
|
- EEPROM_M24C08_Read(EEPROM_M24C08_ID ,(EEPROM_ATT_UL1_TABLE_ADDRESDS),&Att_UL2.Table_0_0_dBm_H,sizeof(ATT_TABLE_st) );
|
755
|
|
- Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_UL2.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
759
|
+ EEPROM_M24C08_Read(EEPROM_M24C08_ID ,(EEPROM_ATT_UL1_TABLE_ADDRESDS),&Att_UL2.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
|
|
760
|
+ Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_UL2.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
756
|
761
|
data[BLUECELL_LENGTH] = (sizeof(ATT_TABLE_st)) + 7 - 3;
|
757
|
762
|
break;
|
758
|
763
|
case Bluecell_Table_ATT_UL3:
|
759
|
|
- EEPROM_M24C08_Read(EEPROM_M24C08_ID ,(EEPROM_ATT_UL2_TABLE_ADDRESDS),&Att_UL3.Table_0_0_dBm_H,sizeof(ATT_TABLE_st) );
|
760
|
|
- Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_UL3.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
764
|
+ EEPROM_M24C08_Read(EEPROM_M24C08_ID ,(EEPROM_ATT_UL2_TABLE_ADDRESDS),&Att_UL3.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
|
|
765
|
+ Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_UL3.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
761
|
766
|
data[BLUECELL_LENGTH] = (sizeof(ATT_TABLE_st)) + 7 - 3;
|
762
|
767
|
break;
|
763
|
768
|
case Bluecell_Table_ATT_UL4:
|
764
|
|
- EEPROM_M24C08_Read(EEPROM_M24C08_ID ,(EEPROM_ATT_UL3_TABLE_ADDRESDS),&Att_UL4.Table_0_0_dBm_H,sizeof(ATT_TABLE_st) );
|
765
|
|
- Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_UL4.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
769
|
+ EEPROM_M24C08_Read(EEPROM_M24C08_ID ,(EEPROM_ATT_UL3_TABLE_ADDRESDS),&Att_UL4.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
|
|
770
|
+ Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Att_UL4.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
766
|
771
|
data[BLUECELL_LENGTH] = (sizeof(ATT_TABLE_st)) + 7 - 3;
|
767
|
772
|
break;
|
768
|
773
|
case Bluecell_Table_DET_DL1:
|
|
@@ -866,46 +871,46 @@ void Bluecell_TableSave(uint8_t* data){
|
866
|
871
|
//printf("%s : %x \r\n",__func__,tabletype);
|
867
|
872
|
switch(tabletype){
|
868
|
873
|
case Bluecell_Table_ATT_DL1:
|
869
|
|
- Bluecell_DataCopy(&Att_DL1.Table_0_0_dBm_H,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
870
|
|
- EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_WINDOW_STATUS_ADDRESDS) ,&Att_DL1.Table_0_0_dBm_H,sizeof(ATT_TABLE_st) );
|
871
|
|
-// Bluecell_structprintf(&Att_DL1.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
874
|
+ Bluecell_DataCopy(&Att_DL1.Table_0_0_dBm,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
|
875
|
+ EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_BASE) ,&Att_DL1.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
|
|
876
|
+// Bluecell_structprintf(&Att_DL1.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
872
|
877
|
// printf("ADDRESS : %d \r\n",EEPROM_WINDOW_STATUS_ADDRESDS );
|
873
|
|
-// Bluecell_structprintf(&Att_DL1.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
878
|
+// Bluecell_structprintf(&Att_DL1.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
874
|
879
|
break;
|
875
|
880
|
|
876
|
881
|
case Bluecell_Table_ATT_DL2:
|
877
|
|
- Bluecell_DataCopy(&Att_DL2.Table_0_0_dBm_H,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
878
|
|
- EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_DL1_TABLE_ADDRESDS),&Att_DL2.Table_0_0_dBm_H,sizeof(ATT_TABLE_st) );
|
|
882
|
+ Bluecell_DataCopy(&Att_DL2.Table_0_0_dBm,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
|
883
|
+ EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_DL1_TABLE_ADDRESDS),&Att_DL2.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
|
879
|
884
|
// printf("ADDRESS : %d \r\n",EEPROM_ATT_DL1_TABLE_ADDRESDS );
|
880
|
885
|
|
881
|
886
|
break;
|
882
|
887
|
|
883
|
888
|
case Bluecell_Table_ATT_DL3:
|
884
|
|
- Bluecell_DataCopy(&Att_DL3.Table_0_0_dBm_H,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
885
|
|
- EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_DL2_TABLE_ADDRESDS),&Att_DL3.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
889
|
+ Bluecell_DataCopy(&Att_DL3.Table_0_0_dBm,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
|
890
|
+ EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_DL2_TABLE_ADDRESDS),&Att_DL3.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
886
|
891
|
break;
|
887
|
892
|
|
888
|
893
|
case Bluecell_Table_ATT_DL4:
|
889
|
|
- Bluecell_DataCopy(&Att_DL4.Table_0_0_dBm_H,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
890
|
|
- EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_DL3_TABLE_ADDRESDS),&Att_DL4.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
894
|
+ Bluecell_DataCopy(&Att_DL4.Table_0_0_dBm,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
|
895
|
+ EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_DL3_TABLE_ADDRESDS),&Att_DL4.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
891
|
896
|
break;
|
892
|
897
|
|
893
|
898
|
|
894
|
899
|
case Bluecell_Table_ATT_UL1:
|
895
|
|
- Bluecell_DataCopy(&Att_UL1.Table_0_0_dBm_H,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
896
|
|
- EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_DL4_TABLE_ADDRESDS),&Att_UL1.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
900
|
+ Bluecell_DataCopy(&Att_UL1.Table_0_0_dBm,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
|
901
|
+ EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_DL4_TABLE_ADDRESDS),&Att_UL1.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
897
|
902
|
break;
|
898
|
903
|
case Bluecell_Table_ATT_UL2:
|
899
|
|
- Bluecell_DataCopy(&Att_UL2.Table_0_0_dBm_H,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
900
|
|
- EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_UL1_TABLE_ADDRESDS),&Att_UL2.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
904
|
+ Bluecell_DataCopy(&Att_UL2.Table_0_0_dBm,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
|
905
|
+ EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_UL1_TABLE_ADDRESDS),&Att_UL2.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
901
|
906
|
break;
|
902
|
907
|
case Bluecell_Table_ATT_UL3:
|
903
|
|
- Bluecell_DataCopy(&Att_UL3.Table_0_0_dBm_H,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
904
|
|
- EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_UL2_TABLE_ADDRESDS),&Att_UL3.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
908
|
+ Bluecell_DataCopy(&Att_UL3.Table_0_0_dBm,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
|
909
|
+ EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_UL2_TABLE_ADDRESDS),&Att_UL3.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
905
|
910
|
break;
|
906
|
911
|
case Bluecell_Table_ATT_UL4:
|
907
|
|
- Bluecell_DataCopy(&Att_UL4.Table_0_0_dBm_H,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
908
|
|
- EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_UL3_TABLE_ADDRESDS),&Att_UL4.Table_0_0_dBm_H,sizeof(ATT_TABLE_st));
|
|
912
|
+ Bluecell_DataCopy(&Att_UL4.Table_0_0_dBm,&data[BLUECELL_DATA + 1],sizeof(ATT_TABLE_st));
|
|
913
|
+ EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_UL3_TABLE_ADDRESDS),&Att_UL4.Table_0_0_dBm,sizeof(ATT_TABLE_st));
|
909
|
914
|
break;
|
910
|
915
|
case Bluecell_Table_DET_DL1:
|
911
|
916
|
Bluecell_DataCopy(&Det_DL1.Table_Det5_dBm_H,&data[BLUECELL_DATA + 1],sizeof(DET_TABLEDL_st));
|
|
@@ -984,11 +989,18 @@ void Bluecell_TableSave(uint8_t* data){
|
984
|
989
|
uint8_t Txdata[512];
|
985
|
990
|
extern HAL_StatusTypeDef EEPROM_M24C08_Zerowrite(uint8_t devid,uint16_t Address);
|
986
|
991
|
|
|
992
|
+
|
|
993
|
+
|
|
994
|
+
|
|
995
|
+
|
|
996
|
+
|
|
997
|
+
|
987
|
998
|
bool Bluecell_Operate(uint8_t* data){
|
988
|
999
|
uint8_t datatype = data[BLUECELL_TYPE];
|
989
|
1000
|
|
990
|
1001
|
|
991
|
1002
|
//double ret = 0 ,tmp = 0.1;
|
|
1003
|
+ int16_t tempdata = 0;
|
992
|
1004
|
|
993
|
1005
|
uint8_t i = 0;
|
994
|
1006
|
switch(datatype){
|
|
@@ -1025,8 +1037,8 @@ bool Bluecell_Operate(uint8_t* data){
|
1025
|
1037
|
bluecell_Currdatastatus.ATT_ALC3_MAX_L = data[BLUECELL_DATA + i++];
|
1026
|
1038
|
bluecell_Currdatastatus.ATT_ALC4_MAX_H = data[BLUECELL_DATA + i++];
|
1027
|
1039
|
bluecell_Currdatastatus.ATT_ALC4_MAX_L = data[BLUECELL_DATA + i++];
|
1028
|
|
- bluecell_Currdatastatus.ATT_ALC1_MIN_H = data[BLUECELL_DATA + i++]; // 20
|
1029
|
|
- bluecell_Currdatastatus.ATT_ALC1_MIN_L = data[BLUECELL_DATA + i++];
|
|
1040
|
+ bluecell_Currdatastatus.ULO_ALC_Threshold_H = data[BLUECELL_DATA + i++]; // 20
|
|
1041
|
+ bluecell_Currdatastatus.ULO_ALC_Threshold_L = data[BLUECELL_DATA + i++];
|
1030
|
1042
|
bluecell_Currdatastatus.ATT_ALC2_MIN_H = data[BLUECELL_DATA + i++];
|
1031
|
1043
|
bluecell_Currdatastatus.ATT_ALC2_MIN_L = data[BLUECELL_DATA + i++];
|
1032
|
1044
|
bluecell_Currdatastatus.ATT_ALC3_MIN_H = data[BLUECELL_DATA + i++];
|
|
@@ -1270,9 +1282,9 @@ bool Bluecell_Operate(uint8_t* data){
|
1270
|
1282
|
break;
|
1271
|
1283
|
case ATT_TableSet:
|
1272
|
1284
|
Bluecell_TableSave(data);
|
1273
|
|
- break;
|
1274
|
1285
|
case ATT_TableGet:
|
1275
|
1286
|
Bluecell_TableLoad(data);
|
|
1287
|
+ data[BLUECELL_TYPE] = ATT_TableGet;
|
1276
|
1288
|
data[data[BLUECELL_LENGTH] + 1] = STH30_CreateCrc(&data[BLUECELL_TYPE], data[BLUECELL_LENGTH]);
|
1277
|
1289
|
Bluecell_StructCpy(&Txdata[0],&data[0],data[BLUECELL_LENGTH] + 3);
|
1278
|
1290
|
Uart1_Data_Send(&Txdata[0], Txdata[BLUECELL_LENGTH] + 3);
|
|
@@ -1360,8 +1372,8 @@ bool Bluecell_Operate(uint8_t* data){
|
1360
|
1372
|
#endif // PYJ.2020.05.13_END --
|
1361
|
1373
|
/*******/
|
1362
|
1374
|
case Bluecell_TEMP_USER :
|
1363
|
|
- bluecell_Currdatastatus.bluecell_User_TEMP_OFFSET_H = data[BLUECELL_DATA + i++];
|
1364
|
|
- bluecell_Currdatastatus.bluecell_User_TEMP_OFFSET_L = data[BLUECELL_DATA + i++];
|
|
1375
|
+ bluecell_Currdatastatus.bluecell_User_TEMP_OFFSET = data[BLUECELL_DATA + i++];
|
|
1376
|
+// bluecell_Currdatastatus.bluecell_User_TEMP_OFFSET_L = data[BLUECELL_DATA + i++];
|
1365
|
1377
|
|
1366
|
1378
|
break;
|
1367
|
1379
|
case Bluecell_DLI_AGC_ON_OFF:
|
|
@@ -1380,11 +1392,19 @@ bool Bluecell_Operate(uint8_t* data){
|
1380
|
1392
|
case Bluecell_DLI_AGC_Threshold:
|
1381
|
1393
|
bluecell_Currdatastatus.DLI_AGC_Threshold_H = data[BLUECELL_DATA + i++];
|
1382
|
1394
|
bluecell_Currdatastatus.DLI_AGC_Threshold_L = data[BLUECELL_DATA + i++];
|
|
1395
|
+ tempdata = (( bluecell_Currdatastatus.DLI_AGC_Threshold_H << 8) & 0xFF00) ;
|
|
1396
|
+ tempdata += bluecell_Currdatastatus.DLI_AGC_Threshold_L ;
|
|
1397
|
+ tempdata /= 10;
|
|
1398
|
+ bluecell_Currdatastatus.DLI_AGC_Threshold_H = ((tempdata & 0xFF00) >> 8);
|
|
1399
|
+ bluecell_Currdatastatus.DLI_AGC_Threshold_L = (tempdata & 0x00FF);
|
1383
|
1400
|
|
1384
|
1401
|
break;
|
1385
|
1402
|
case Bluecell_DLI_AGC_Threshold_Default:
|
1386
|
1403
|
bluecell_Currdatastatus.DLI_AGC_Threshold_default = data[BLUECELL_DATA + i++];
|
1387
|
|
-
|
|
1404
|
+ if(bluecell_Currdatastatus.DLI_AGC_Threshold_default == true){
|
|
1405
|
+ bluecell_Currdatastatus.DLI_AGC_Threshold_H = MBIC_DLI_AGC_Threshold_Default_H;
|
|
1406
|
+ bluecell_Currdatastatus.DLI_AGC_Threshold_L = MBIC_DLI_AGC_Threshold_Default_L;
|
|
1407
|
+ }
|
1388
|
1408
|
break;
|
1389
|
1409
|
case Bluecell_DLI_Shutdown_ON_OFF:
|
1390
|
1410
|
bluecell_Currdatastatus.DLI_Shutdown_ON_OFF = data[BLUECELL_DATA + i++];
|
|
@@ -1393,10 +1413,21 @@ bool Bluecell_Operate(uint8_t* data){
|
1393
|
1413
|
case Bluecell_DLI_Shutdown_Threshold:
|
1394
|
1414
|
bluecell_Currdatastatus.DLI_Shutdown_Threshold_H = data[BLUECELL_DATA + i++];
|
1395
|
1415
|
bluecell_Currdatastatus.DLI_Shutdown_Threshold_L = data[BLUECELL_DATA + i++];
|
|
1416
|
+ tempdata = (( bluecell_Currdatastatus.DLI_Shutdown_Threshold_H << 8) & 0xFF00) ;
|
|
1417
|
+ tempdata += bluecell_Currdatastatus.DLI_Shutdown_Threshold_L ;
|
|
1418
|
+ tempdata /= 10;
|
|
1419
|
+ bluecell_Currdatastatus.DLI_Shutdown_Threshold_H = ((tempdata & 0xFF00) >> 8);
|
|
1420
|
+ bluecell_Currdatastatus.DLI_Shutdown_Threshold_L = (tempdata & 0x00FF);
|
|
1421
|
+// printf("tempdata %d \r\n",tempdata);
|
1396
|
1422
|
|
1397
|
1423
|
break;
|
1398
|
1424
|
case Bluecell_DLI_Shutdown_Threshold_Default:
|
1399
|
1425
|
bluecell_Currdatastatus.DLI_Shutdown_Threshold_Default = data[BLUECELL_DATA + i++];
|
|
1426
|
+ if(bluecell_Currdatastatus.DLI_Shutdown_Threshold_Default == true){
|
|
1427
|
+ bluecell_Currdatastatus.DLI_Shutdown_Threshold_H = MBIC_DLI_Shutdown_Threshold_Default_H;
|
|
1428
|
+ bluecell_Currdatastatus.DLI_Shutdown_Threshold_L = MBIC_DLI_Shutdown_Threshold_Default_L;
|
|
1429
|
+ }
|
|
1430
|
+// printf("bluecell_Currdatastatus.DLI_Shutdown_Threshold_Default : %d \r\n",bluecell_Currdatastatus.DLI_Shutdown_Threshold_Default);
|
1400
|
1431
|
break;
|
1401
|
1432
|
case Bluecell_DLI_Shutdown_Count:
|
1402
|
1433
|
/*NOP*/
|
|
@@ -1404,22 +1435,36 @@ bool Bluecell_Operate(uint8_t* data){
|
1404
|
1435
|
case Bluecell_DLI_Level_High_Threshold :
|
1405
|
1436
|
bluecell_Currdatastatus.DLI_Level_High_Threshold_H = data[BLUECELL_DATA + i++];
|
1406
|
1437
|
bluecell_Currdatastatus.DLI_Level_High_Threshold_L = data[BLUECELL_DATA + i++];
|
1407
|
|
-
|
|
1438
|
+ tempdata = (( bluecell_Currdatastatus.DLI_Level_High_Threshold_H << 8) & 0xFF00) ;
|
|
1439
|
+ tempdata += bluecell_Currdatastatus.DLI_Level_High_Threshold_L ;
|
|
1440
|
+ tempdata /= 10;
|
|
1441
|
+ bluecell_Currdatastatus.DLI_Level_High_Threshold_H = ((tempdata & 0xFF00) >> 8);
|
|
1442
|
+ bluecell_Currdatastatus.DLI_Level_High_Threshold_L = (tempdata & 0x00FF);
|
1408
|
1443
|
break;
|
1409
|
1444
|
case Bluecell_DLI_Level_Low_Threshold :
|
1410
|
1445
|
bluecell_Currdatastatus.DLI_Level_Low_Threshold_H = data[BLUECELL_DATA + i++];
|
1411
|
1446
|
bluecell_Currdatastatus.DLI_Level_Low_Threshold_L = data[BLUECELL_DATA + i++];
|
|
1447
|
+ tempdata = (( bluecell_Currdatastatus.DLI_Level_Low_Threshold_H << 8) & 0xFF00) ;
|
|
1448
|
+ tempdata += bluecell_Currdatastatus.DLI_Level_Low_Threshold_L ;
|
|
1449
|
+ tempdata /= 10;
|
|
1450
|
+ bluecell_Currdatastatus.DLI_Level_Low_Threshold_H = ((tempdata & 0xFF00) >> 8);
|
|
1451
|
+ bluecell_Currdatastatus.DLI_Level_Low_Threshold_L = (tempdata & 0x00FF);
|
1412
|
1452
|
|
1413
|
1453
|
break;
|
1414
|
1454
|
case Bluecell_DLI_Level_High_Low_Threshold_default :
|
1415
|
1455
|
bluecell_Currdatastatus.DLI_Level_High_Low_Threshold_default = data[BLUECELL_DATA + i++];
|
|
1456
|
+ if(bluecell_Currdatastatus.DLI_Level_High_Low_Threshold_default == true){
|
|
1457
|
+ bluecell_Currdatastatus.DLI_Level_High_Threshold_H = MBIC_DLI_Level_High_Threshold_default_H;
|
|
1458
|
+ bluecell_Currdatastatus.DLI_Level_High_Threshold_L = MBIC_DLI_Level_High_Threshold_default_L;
|
|
1459
|
+ bluecell_Currdatastatus.DLI_Level_Low_Threshold_H = MBIC_DLI_Level_Low_Threshold_default_H;
|
|
1460
|
+ bluecell_Currdatastatus.DLI_Level_Low_Threshold_L = MBIC_DLI_Level_Low_Threshold_default_L;
|
|
1461
|
+ }
|
1416
|
1462
|
break;
|
1417
|
1463
|
case Bluecell_LED_TEST :
|
1418
|
1464
|
bluecell_Currdatastatus.LED_TEST = data[BLUECELL_DATA + i++];
|
1419
|
1465
|
break;
|
1420
|
1466
|
case Bluecell_Temperature_Offset :
|
1421
|
|
- bluecell_Currdatastatus.bluecell_User_TEMP_OFFSET_H = data[BLUECELL_DATA + i++];
|
1422
|
|
- bluecell_Currdatastatus.bluecell_User_TEMP_OFFSET_L = data[BLUECELL_DATA + i++];
|
|
1467
|
+ bluecell_Currdatastatus.bluecell_User_TEMP_OFFSET = data[BLUECELL_DATA + i++];
|
1423
|
1468
|
|
1424
|
1469
|
break;
|
1425
|
1470
|
case Bluecell_Temp_High_Threshold :
|
|
@@ -1427,6 +1472,9 @@ bool Bluecell_Operate(uint8_t* data){
|
1427
|
1472
|
break;
|
1428
|
1473
|
case Bluecell_Temp_High_Threshold_Default :
|
1429
|
1474
|
bluecell_Currdatastatus.Temp_High_Threshold_Default = data[BLUECELL_DATA + i++];
|
|
1475
|
+ if(bluecell_Currdatastatus.Temp_High_Threshold_Default == true){
|
|
1476
|
+ bluecell_Currdatastatus.Temp_High_Threshold_Default = MBIC_Temp_High_Threshold_Default;
|
|
1477
|
+ }
|
1430
|
1478
|
break;
|
1431
|
1479
|
case Bluecell_ULO_Level_High_Threshold :
|
1432
|
1480
|
bluecell_Currdatastatus.ULO_Level_High_Threshold_H = data[BLUECELL_DATA + i++];
|
|
@@ -1435,14 +1483,27 @@ bool Bluecell_Operate(uint8_t* data){
|
1435
|
1483
|
break;
|
1436
|
1484
|
case Bluecell_ULO_Level_High_Threshold_default :
|
1437
|
1485
|
bluecell_Currdatastatus.ULO_Level_High_Threshold_default = data[BLUECELL_DATA + i++];
|
|
1486
|
+ if(bluecell_Currdatastatus.ULO_Level_High_Threshold_default == true){
|
|
1487
|
+ bluecell_Currdatastatus.ULO_Level_High_Threshold_H = MBIC_ULO_Level_High_Threshold_Default_H;
|
|
1488
|
+ bluecell_Currdatastatus.ULO_Level_High_Threshold_L = MBIC_ULO_Level_High_Threshold_Default_L;
|
|
1489
|
+ }
|
1438
|
1490
|
break;
|
1439
|
1491
|
case Bluecell_ULO_ALC_Threshold :
|
1440
|
1492
|
bluecell_Currdatastatus.ULO_ALC_Threshold_H = data[BLUECELL_DATA + i++];
|
1441
|
1493
|
bluecell_Currdatastatus.ULO_ALC_Threshold_L = data[BLUECELL_DATA + i++];
|
|
1494
|
+ tempdata = (( bluecell_Currdatastatus.ULO_ALC_Threshold_H << 8) & 0xFF00) ;
|
|
1495
|
+ tempdata += bluecell_Currdatastatus.ULO_ALC_Threshold_L ;
|
|
1496
|
+ tempdata /= 10;
|
|
1497
|
+ bluecell_Currdatastatus.ULO_ALC_Threshold_H = ((tempdata & 0xFF00) >> 8);
|
|
1498
|
+ bluecell_Currdatastatus.ULO_ALC_Threshold_L = (tempdata & 0x00FF);
|
1442
|
1499
|
|
1443
|
1500
|
break;
|
1444
|
1501
|
case Bluecell_ULO_ALC_Threshold_Default :
|
1445
|
1502
|
bluecell_Currdatastatus.ULO_ALC_Threshold_Default = data[BLUECELL_DATA + i++];
|
|
1503
|
+ if(bluecell_Currdatastatus.ULO_Level_High_Threshold_default == true){
|
|
1504
|
+ bluecell_Currdatastatus.ULO_ALC_Threshold_H = MBIC_ULO_ALC_Threshold_Default_H;
|
|
1505
|
+ bluecell_Currdatastatus.ULO_ALC_Threshold_L = MBIC_ULO_ALC_Threshold_Default_L;
|
|
1506
|
+ }
|
1446
|
1507
|
|
1447
|
1508
|
break;
|
1448
|
1509
|
case Bluecell_ULO_Shutdown_ON_OFF :
|
|
@@ -1452,18 +1513,26 @@ bool Bluecell_Operate(uint8_t* data){
|
1452
|
1513
|
case Bluecell_ULO_Shutdown_Threshold :
|
1453
|
1514
|
bluecell_Currdatastatus.ULO_Shutdown_Threshold_H = data[BLUECELL_DATA + i++];
|
1454
|
1515
|
bluecell_Currdatastatus.ULO_Shutdown_Threshold_L = data[BLUECELL_DATA + i++];
|
|
1516
|
+ tempdata = (( bluecell_Currdatastatus.ULO_Shutdown_Threshold_H << 8) & 0xFF00) ;
|
|
1517
|
+ tempdata += bluecell_Currdatastatus.ULO_Shutdown_Threshold_L ;
|
|
1518
|
+ tempdata /= 10;
|
|
1519
|
+ bluecell_Currdatastatus.ULO_Shutdown_Threshold_H = ((tempdata & 0xFF00) >> 8);
|
|
1520
|
+ bluecell_Currdatastatus.ULO_Shutdown_Threshold_L = (tempdata & 0x00FF);
|
1455
|
1521
|
|
1456
|
1522
|
break;
|
1457
|
1523
|
case Bluecell_ULO_Shutdown_Threshold_Default :
|
1458
|
1524
|
bluecell_Currdatastatus.ULO_Shutdown_Threshold_Default = data[BLUECELL_DATA + i++];
|
1459
|
|
-
|
|
1525
|
+ if(bluecell_Currdatastatus.ULO_Level_High_Threshold_default == true){
|
|
1526
|
+ bluecell_Currdatastatus.ULO_Shutdown_Threshold_H = MBIC_ULO_Shutdown_Threshold_Default_H;
|
|
1527
|
+ bluecell_Currdatastatus.ULO_Shutdown_Threshold_L = MBIC_ULO_Shutdown_Threshold_Default_L;
|
|
1528
|
+ }
|
1460
|
1529
|
break;
|
1461
|
1530
|
case Bluecell_ULO_Shutdown_Retry_Count :
|
1462
|
1531
|
break;
|
1463
|
1532
|
}
|
1464
|
1533
|
if(datatype != Bluecell_StatusReq){
|
1465
|
1534
|
Bluecell_StructCpy(&DataWrite[0],&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st));
|
1466
|
|
- EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_BASE),&DataWrite[0],sizeof(BLUESTATUS_st));
|
|
1535
|
+ EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_WINDOW_STATUS_ADDRESDS),&DataWrite[0],sizeof(BLUESTATUS_st));
|
1467
|
1536
|
// Bluecell_StructCpy(&Txdata[0],&DataWrite[0],sizeof(BLUESTATUS_st));
|
1468
|
1537
|
// Txdata[sizeof(BLUESTATUS_st) - 2] = STH30_CreateCrc(&Txdata[BLUECELL_TYPE], sizeof(BLUESTATUS_st) - 3);
|
1469
|
1538
|
// Uart1_Data_Send(&Txdata[0], sizeof(BLUESTATUS_st));
|
|
@@ -1473,8 +1542,8 @@ bool Bluecell_Operate(uint8_t* data){
|
1473
|
1542
|
void DataStatusSet(void){
|
1474
|
1543
|
bluecell_Currdatastatus.bluecell_header = 0xbe;
|
1475
|
1544
|
bluecell_Currdatastatus.bluecell_type = Bluecell_StatusReq;
|
1476
|
|
- bluecell_Currdatastatus.bluecell_length = sizeof(bluecell_Currdatastatus) - 3;
|
1477
|
|
- bluecell_Currdatastatus.bluecell_crcindex = sizeof(bluecell_Currdatastatus) - 2 + 1;
|
|
1545
|
+ bluecell_Currdatastatus.bluecell_length = 94 - 3;
|
|
1546
|
+ bluecell_Currdatastatus.bluecell_crcindex = 94 - 2 + 1;
|
1478
|
1547
|
bluecell_Currdatastatus.ATT_DL2_PATH = HAL_GPIO_ReadPin(PATH_EN_DL2_GPIO_Port,PATH_EN_DL2_Pin);//CLOCK;
|
1479
|
1548
|
bluecell_Currdatastatus.ATT_DL3_PATH = HAL_GPIO_ReadPin(PATH_EN_DL3_GPIO_Port,PATH_EN_DL3_Pin);//CLOCK;
|
1480
|
1549
|
bluecell_Currdatastatus.ATT_DL4_PATH = HAL_GPIO_ReadPin(PATH_EN_DL4_GPIO_Port,PATH_EN_DL4_Pin);//CLOCK;
|
|
@@ -1610,10 +1679,6 @@ bool MBIC_Operate(uint8_t* data){
|
1610
|
1679
|
/*ALARM FLAG*/
|
1611
|
1680
|
#if 0
|
1612
|
1681
|
data[MBIC_PAYLOADSTART + 0] = bluecell_Currdatastatus.ALARM_MASK1;
|
1613
|
|
- data[MBIC_PAYLOADSTART + 1] = bluecell_Currdatastatus.ALARM_MASK2;
|
1614
|
|
- data[MBIC_PAYLOADSTART + 2] = bluecell_Currdatastatus.ALARM_MASK3;
|
1615
|
|
- data[MBIC_PAYLOADSTART + 3] = bluecell_Currdatastatus.ALARM_MASK4;
|
1616
|
|
- data[MBIC_PAYLOADSTART + 4] = bluecell_Currdatastatus.ALARM_MASK5;
|
1617
|
1682
|
|
1618
|
1683
|
/*ALARM BIT LIST*/
|
1619
|
1684
|
data[MBIC_PAYLOADSTART + 5] = bluecell_Currdatastatus.ALARM_TEMP_HIGH;
|
|
@@ -1632,10 +1697,6 @@ bool MBIC_Operate(uint8_t* data){
|
1632
|
1697
|
/*ALARM BIT LIST*/
|
1633
|
1698
|
|
1634
|
1699
|
data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK1;
|
1635
|
|
- data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK2;
|
1636
|
|
- data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK3;
|
1637
|
|
- data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK4;
|
1638
|
|
- data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK5;
|
1639
|
1700
|
|
1640
|
1701
|
|
1641
|
1702
|
#endif
|
|
@@ -1684,8 +1745,8 @@ bool MBIC_Operate(uint8_t* data){
|
1684
|
1745
|
data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.S_W_Reset;
|
1685
|
1746
|
data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.Factory_Set_Initialization;
|
1686
|
1747
|
|
1687
|
|
- data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.DET_TEMP_H;
|
1688
|
|
- data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.bluecell_User_TEMP_OFFSET_H;
|
|
1748
|
+ data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.DET_TEMP;
|
|
1749
|
+ data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.bluecell_User_TEMP_OFFSET;
|
1689
|
1750
|
|
1690
|
1751
|
data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.Temp_High_Threshold;
|
1691
|
1752
|
data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.Temp_High_Threshold_Default;
|
|
@@ -1961,10 +2022,6 @@ bool MBIC_Operate(uint8_t* data){
|
1961
|
2022
|
break;
|
1962
|
2023
|
case Alarm_Mask :
|
1963
|
2024
|
bluecell_Currdatastatus.ALARM_MASK1 = data[MBIC_PAYLOADSTART + 0];
|
1964
|
|
- bluecell_Currdatastatus.ALARM_MASK2 = data[MBIC_PAYLOADSTART + 1];
|
1965
|
|
- bluecell_Currdatastatus.ALARM_MASK3 = data[MBIC_PAYLOADSTART + 2];
|
1966
|
|
- bluecell_Currdatastatus.ALARM_MASK4 = data[MBIC_PAYLOADSTART + 3];
|
1967
|
|
- bluecell_Currdatastatus.ALARM_MASK5 = data[MBIC_PAYLOADSTART + 4];
|
1968
|
2025
|
break;
|
1969
|
2026
|
case Alarm_Test_Mode :
|
1970
|
2027
|
bluecell_Currdatastatus.ALARM_TESTMODE = data[MBIC_PAYLOADSTART + 0];
|
|
@@ -2032,10 +2089,10 @@ bool MBIC_Operate(uint8_t* data){
|
2032
|
2089
|
break;
|
2033
|
2090
|
case Temperature :
|
2034
|
2091
|
/*I WILL MODIFY*/
|
2035
|
|
- bluecell_Currdatastatus.DET_TEMP_H = data[MBIC_PAYLOADSTART + 0];
|
|
2092
|
+ bluecell_Currdatastatus.DET_TEMP = data[MBIC_PAYLOADSTART + 0];
|
2036
|
2093
|
break;
|
2037
|
2094
|
case Temperature_Offset :
|
2038
|
|
- bluecell_Currdatastatus.bluecell_User_TEMP_OFFSET_H = data[MBIC_PAYLOADSTART + 0];
|
|
2095
|
+ bluecell_Currdatastatus.bluecell_User_TEMP_OFFSET = data[MBIC_PAYLOADSTART + 0];
|
2039
|
2096
|
break;
|
2040
|
2097
|
case Temp_High_Threshold :
|
2041
|
2098
|
bluecell_Currdatastatus.Temp_High_Threshold = data[MBIC_PAYLOADSTART + 0];
|
|
@@ -2590,11 +2647,12 @@ void ADC_Check(void){
|
2590
|
2647
|
=((ADC1Ret[3] & 0xFF00) >> 8);
|
2591
|
2648
|
bluecell_Currdatastatus.DET_TEMP_L
|
2592
|
2649
|
=((ADC1Ret[3] & 0x00FF) );
|
2593
|
|
-#else
|
2594
|
|
- bluecell_Currdatastatus.DET_TEMP_L
|
2595
|
|
- = ((ADC1Ret[3] * 3.3 / 4095) - 0.5) * 100 ;
|
2596
|
|
-
|
2597
|
|
-
|
|
2650
|
+#else
|
|
2651
|
+/* *
|
|
2652
|
+온도 소수점 제거
|
|
2653
|
+*/
|
|
2654
|
+ bluecell_Currdatastatus.DET_TEMP
|
|
2655
|
+ = ((((ADC1Ret[3] * 3.3 / 4095) - 0.5) * 100) + bluecell_Currdatastatus.bluecell_User_TEMP_OFFSET);
|
2598
|
2656
|
#endif // PYJ.2020.05.14_END --
|
2599
|
2657
|
|
2600
|
2658
|
|
|
@@ -2764,11 +2822,12 @@ void ALC_Function(){ //DL
|
2764
|
2822
|
ret += bluecell_Currdatastatus.DET_UL1_IN_L;
|
2765
|
2823
|
ret *= Volt_Calc_val;
|
2766
|
2824
|
ResdBm = AutoControl_ADC_Compare(ret,&Det_UL1.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st));
|
2767
|
|
-// printf("==================================\r\n");
|
2768
|
|
-// printf("Current UL ADC VALUE : %f \r\n",ret);
|
2769
|
|
-// printf("ResdBm : UL1 : %f \r\n",ResdBm);
|
2770
|
|
-// HAL_Delay(1000);
|
2771
|
2825
|
|
|
2826
|
+#if 0 // PYJ.2020.05.14_BEGIN --
|
|
2827
|
+ // printf("==================================\r\n");
|
|
2828
|
+ // printf("Current UL ADC VALUE : %f \r\n",ret);
|
|
2829
|
+ // printf("ResdBm : UL1 : %f \r\n",ResdBm);
|
|
2830
|
+ // HAL_Delay(1000);
|
2772
|
2831
|
CurrnALC_MAX_SettingValue = bluecell_Currdatastatus.ATT_ALC1_MAX_H << 8;
|
2773
|
2832
|
CurrnALC_MAX_SettingValue += bluecell_Currdatastatus.ATT_ALC1_MAX_L;
|
2774
|
2833
|
CurrnALC_MAX_SettingValue = MinusConvert(bluecell_Currdatastatus.DET_UL1_IN_H,CurrnALC_MAX_SettingValue);
|
|
@@ -2776,6 +2835,7 @@ void ALC_Function(){ //DL
|
2776
|
2835
|
CurrnALC_MIN_SettingValue = bluecell_Currdatastatus.ATT_ALC1_MIN_H << 8;
|
2777
|
2836
|
CurrnALC_MIN_SettingValue += bluecell_Currdatastatus.ATT_ALC1_MIN_L;
|
2778
|
2837
|
CurrnALC_MIN_SettingValue = MinusConvert(bluecell_Currdatastatus.DET_UL1_IN_H,CurrnALC_MIN_SettingValue);
|
|
2838
|
+
|
2779
|
2839
|
// printf("CurrnALC_MAX_SettingValue : %d \r\n",CurrnALC_MAX_SettingValue);
|
2780
|
2840
|
// printf("CurrnALC_MIN_SettingValue : %d \r\n",CurrnALC_MIN_SettingValue);
|
2781
|
2841
|
// printf("I WILL GIVE YOU ATTEN MAX : %d \r\n",ResdBm - CurrnALC_MAX_SettingValue);
|
|
@@ -2790,6 +2850,11 @@ void ALC_Function(){ //DL
|
2790
|
2850
|
CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
|
2791
|
2851
|
}else{
|
2792
|
2852
|
}
|
|
2853
|
+#endif // PYJ.2020.05.14_END --
|
|
2854
|
+ CurrnALC_MIN_SettingValue = bluecell_Currdatastatus.ULO_ALC_Threshold_H << 8;
|
|
2855
|
+ CurrnALC_MIN_SettingValue += bluecell_Currdatastatus.ULO_ALC_Threshold_L;
|
|
2856
|
+ CurrnALC_MIN_SettingValue = MinusConvert(bluecell_Currdatastatus.DET_UL1_IN_H,CurrnALC_MIN_SettingValue);
|
|
2857
|
+
|
2793
|
2858
|
CurrentATTENVALUE = PE43711_Double(bluecell_Currdatastatus.ATT_UL1_H,bluecell_Currdatastatus.ATT_UL1_L);
|
2794
|
2859
|
uint16_t tempValue = 0;
|
2795
|
2860
|
if(CurrnALC_MIN_SettingValue > ResdBm && CurrentATTENVALUE > 0){
|
|
@@ -2816,13 +2881,13 @@ void ALC_Function(){ //DL
|
2816
|
2881
|
ret += bluecell_Currdatastatus.DET_UL2_IN_L;
|
2817
|
2882
|
ret *= Volt_Calc_val;
|
2818
|
2883
|
ResdBm = AutoControl_ADC_Compare(ret,&Det_UL2.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st));
|
|
2884
|
+
|
|
2885
|
+#if 0 // PYJ.2020.05.14_BEGIN --
|
2819
|
2886
|
CurrnALC_MAX_SettingValue = bluecell_Currdatastatus.ATT_ALC2_MAX_H << 8;
|
2820
|
2887
|
CurrnALC_MAX_SettingValue += bluecell_Currdatastatus.ATT_ALC2_MAX_L;
|
2821
|
2888
|
CurrnALC_MAX_SettingValue = MinusConvert(bluecell_Currdatastatus.DET_UL2_IN_H,CurrnALC_MAX_SettingValue);
|
2822
|
|
-
|
2823
|
|
- CurrnALC_MIN_SettingValue = bluecell_Currdatastatus.ATT_ALC2_MIN_H << 8;
|
2824
|
|
- CurrnALC_MIN_SettingValue += bluecell_Currdatastatus.ATT_ALC2_MIN_L;
|
2825
|
2889
|
ALC_Result = ResdBm - CurrnALC_MAX_SettingValue;
|
|
2890
|
+
|
2826
|
2891
|
if(ALC_Result > 0){
|
2827
|
2892
|
ALC_Result *= 100;
|
2828
|
2893
|
ALC_Result += bluecell_Currdatastatus.ATT_UL2_H << 8 | bluecell_Currdatastatus.ATT_UL2_L;
|
|
@@ -2830,6 +2895,9 @@ void ALC_Function(){ //DL
|
2830
|
2895
|
bluecell_Currdatastatus.ATT_UL2_L = ALC_Result & 0x00FF;
|
2831
|
2896
|
CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
|
2832
|
2897
|
}
|
|
2898
|
+#endif // PYJ.2020.05.14_END --
|
|
2899
|
+ CurrnALC_MIN_SettingValue = bluecell_Currdatastatus.ULO_ALC_Threshold_H << 8;
|
|
2900
|
+ CurrnALC_MIN_SettingValue += bluecell_Currdatastatus.ULO_ALC_Threshold_L;
|
2833
|
2901
|
CurrentATTENVALUE = PE43711_Double(bluecell_Currdatastatus.ATT_UL2_H,bluecell_Currdatastatus.ATT_UL2_L);
|
2834
|
2902
|
uint16_t tempValue = 0;
|
2835
|
2903
|
if(CurrnALC_MIN_SettingValue > ResdBm && CurrentATTENVALUE > 0){
|
|
@@ -2852,13 +2920,12 @@ void ALC_Function(){ //DL
|
2852
|
2920
|
ret += bluecell_Currdatastatus.DET_UL3_IN_L;
|
2853
|
2921
|
ret *= Volt_Calc_val;
|
2854
|
2922
|
ResdBm = AutoControl_ADC_Compare(ret,&Det_UL3.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st));
|
|
2923
|
+#if 0 // PYJ.2020.05.14_BEGIN --
|
2855
|
2924
|
CurrnALC_MAX_SettingValue = bluecell_Currdatastatus.ATT_ALC3_MAX_H << 8;
|
2856
|
2925
|
CurrnALC_MAX_SettingValue += bluecell_Currdatastatus.ATT_ALC3_MAX_L;
|
2857
|
2926
|
CurrnALC_MAX_SettingValue = MinusConvert(bluecell_Currdatastatus.DET_UL3_IN_H,CurrnALC_MAX_SettingValue);
|
2858
|
|
-
|
2859
|
|
- CurrnALC_MIN_SettingValue = bluecell_Currdatastatus.ATT_ALC3_MIN_H << 8;
|
2860
|
|
- CurrnALC_MIN_SettingValue += bluecell_Currdatastatus.ATT_ALC3_MIN_L;
|
2861
|
2927
|
ALC_Result = ResdBm - CurrnALC_MAX_SettingValue;
|
|
2928
|
+
|
2862
|
2929
|
if(ALC_Result > 0){
|
2863
|
2930
|
ALC_Result *= 100;
|
2864
|
2931
|
ALC_Result += bluecell_Currdatastatus.ATT_UL3_H << 8 | bluecell_Currdatastatus.ATT_UL3_L;
|
|
@@ -2866,6 +2933,9 @@ void ALC_Function(){ //DL
|
2866
|
2933
|
bluecell_Currdatastatus.ATT_UL3_L = ALC_Result & 0x00FF;
|
2867
|
2934
|
CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
|
2868
|
2935
|
}
|
|
2936
|
+#endif // PYJ.2020.05.14_END --
|
|
2937
|
+ CurrnALC_MIN_SettingValue = bluecell_Currdatastatus.ULO_ALC_Threshold_H << 8;
|
|
2938
|
+ CurrnALC_MIN_SettingValue += bluecell_Currdatastatus.ULO_ALC_Threshold_L;
|
2869
|
2939
|
CurrentATTENVALUE = PE43711_Double(bluecell_Currdatastatus.ATT_UL3_H,bluecell_Currdatastatus.ATT_UL3_L);
|
2870
|
2940
|
uint16_t tempValue = 0;
|
2871
|
2941
|
if(CurrnALC_MIN_SettingValue > ResdBm && CurrentATTENVALUE > 0){
|
|
@@ -2889,12 +2959,10 @@ void ALC_Function(){ //DL
|
2889
|
2959
|
ret += bluecell_Currdatastatus.DET_UL4_IN_L;
|
2890
|
2960
|
ret *= Volt_Calc_val;
|
2891
|
2961
|
ResdBm = AutoControl_ADC_Compare(ret,&Det_UL4.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st));
|
|
2962
|
+#if 0 // PYJ.2020.05.14_BEGIN --
|
2892
|
2963
|
CurrnALC_MAX_SettingValue = bluecell_Currdatastatus.ATT_ALC4_MAX_H << 8;
|
2893
|
2964
|
CurrnALC_MAX_SettingValue += bluecell_Currdatastatus.ATT_ALC4_MAX_L;
|
2894
|
2965
|
CurrnALC_MAX_SettingValue = MinusConvert(bluecell_Currdatastatus.DET_UL4_IN_H,CurrnALC_MAX_SettingValue);
|
2895
|
|
-
|
2896
|
|
- CurrnALC_MIN_SettingValue = bluecell_Currdatastatus.ATT_ALC4_MIN_H << 8;
|
2897
|
|
- CurrnALC_MIN_SettingValue += bluecell_Currdatastatus.ATT_ALC4_MIN_L;
|
2898
|
2966
|
ALC_Result = ResdBm - CurrnALC_MAX_SettingValue;
|
2899
|
2967
|
if(ALC_Result > 0){
|
2900
|
2968
|
ALC_Result *= 100;
|
|
@@ -2903,6 +2971,10 @@ void ALC_Function(){ //DL
|
2903
|
2971
|
bluecell_Currdatastatus.ATT_UL4_L = ALC_Result & 0x00FF;
|
2904
|
2972
|
CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
|
2905
|
2973
|
}
|
|
2974
|
+#endif // PYJ.2020.05.14_END --
|
|
2975
|
+
|
|
2976
|
+ CurrnALC_MIN_SettingValue = bluecell_Currdatastatus.ATT_ALC4_MIN_H << 8;
|
|
2977
|
+ CurrnALC_MIN_SettingValue += bluecell_Currdatastatus.ATT_ALC4_MIN_L;
|
2906
|
2978
|
CurrentATTENVALUE = PE43711_Double(bluecell_Currdatastatus.ATT_UL4_H,bluecell_Currdatastatus.ATT_UL4_L);
|
2907
|
2979
|
uint16_t tempValue = 0;
|
2908
|
2980
|
if(CurrnALC_MIN_SettingValue > ResdBm && CurrentATTENVALUE > 0){
|
|
@@ -3008,3 +3080,9 @@ void AGC_Function(){//DL
|
3008
|
3080
|
AGCTimerCnt = 0;
|
3009
|
3081
|
}
|
3010
|
3082
|
}
|
|
3083
|
+void Alarm_Check(){
|
|
3084
|
+ if(bluecell_Currdatastatus.Temp_High_Threshold > bluecell_Currdatastatus.DET_TEMP){
|
|
3085
|
+ bluecell_Currdatastatus.ALARM_MASK1 = true;
|
|
3086
|
+ }
|
|
3087
|
+// if()
|
|
3088
|
+}
|