瀏覽代碼

ALC / AGC 통합으로 ON OFF 하도록 수정 / Atten Init 추가

LED 색상 오류 수정 /  ADC 계산식 MBIC 프로토콜 형으로 변경 /반올림 함수 추가 / AGC /ALC 기능 보완 / ALC 알람 울리도록 수정
PYJ 5 年之前
父節點
當前提交
eda06d20e7
共有 4 個文件被更改,包括 933 次插入275 次删除
  1. 4 12
      Bluecell_Inc/Bluecell_operate.h
  2. 912 261
      Bluecell_Src/Bluecell_operate.c
  3. 9 1
      Bluecell_Src/eeprom.c
  4. 8 1
      Src/main.c

+ 4 - 12
Bluecell_Inc/Bluecell_operate.h

@@ -431,14 +431,8 @@ enum DATATYPE
431 431
 	ATT_DL4_PATH = 0x42,
432 432
 	ATT_UL4_PATH = 0x46,
433 433
 	ATT_SelfTest4 = 0x48,
434
-	ALC1_EN = 0x51,
435
-	ALC2_EN = 0x52,
436
-	ALC3_EN = 0x53,
437
-	ALC4_EN = 0x54,
438
-    AGC1_EN = 0x61,
439
-    AGC2_EN = 0x62,
440
-    AGC3_EN = 0x63,
441
-    AGC4_EN = 0x64,
434
+	Bluecell_ULO_ALC_ON_OFF = 0x51,
435
+    Bluecell_DLI_AGC_ON_OFF = 0x61,
442 436
     ATT_TableSet = 0x70,
443 437
     ATT_TableGet = 0x71,
444 438
 	Bluecell_StatusReq = 0x77,
@@ -452,8 +446,6 @@ enum DATATYPE
452 446
     Bluecell_UL3_USER = 0x86,
453 447
     Bluecell_UL4_USER = 0x87,    
454 448
     Bluecell_TEMP_USER = 0x88,
455
-    Bluecell_DLI_AGC_ON_OFF,
456
-    Bluecell_ULO_ALC_ON_OFF,
457 449
     Bluecell_DLI_AGC_Threshold,
458 450
     Bluecell_DLI_AGC_Threshold_Default,
459 451
     Bluecell_DLI_Shutdown_ON_OFF,  
@@ -670,8 +662,8 @@ typedef struct{
670 662
     uint8_t BLUECELL_RESERVE13;
671 663
     uint8_t BLUECELL_RESERVE14;
672 664
     uint8_t BLUECELL_RESERVE15;
673
-    uint8_t ATT_ALC_Threshold_H;
674
-    uint8_t ATT_ALC_Threshold_L;
665
+    uint8_t ULO_ALC_Threshold_H;
666
+    uint8_t ULO_ALC_Threshold_L;
675 667
     uint8_t BLUECELL_RESERVE16;
676 668
     uint8_t BLUECELL_RESERVE17;
677 669
     uint8_t BLUECELL_RESERVE18;

文件差異過大導致無法顯示
+ 912 - 261
Bluecell_Src/Bluecell_operate.c


+ 9 - 1
Bluecell_Src/eeprom.c

@@ -5,6 +5,7 @@
5 5
  *      Author: parkyj
6 6
  */
7 7
 #include <stdio.h>
8
+#include <string.h>
8 9
 #include "main.h"
9 10
 #include "eeprom.h"
10 11
 #include "Bluecell_operate.h"
@@ -15,6 +16,7 @@
15 16
 HAL_StatusTypeDef EEPROM_M24C08_ByteRead(uint16_t devid,uint16_t Address,uint8_t* data,uint8_t size);
16 17
 
17 18
 
19
+extern BLUESTATUS_st bluecell_Currdatastatus;
18 20
 
19 21
 
20 22
 
@@ -59,8 +61,14 @@ void EEPROM_M24C08_Init(void){
59 61
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_TEMP_UL3_TABLE_ADDRESDS,&Temp_UL4.Table_10_Temp_H,sizeof(TEMP_TABLE_st) );
60 62
 
61 63
 
64
+    bluecell_Currdatastatus.ALARM_TEMP_HIGH          = 0;
65
+    bluecell_Currdatastatus.ALARM_DLI_Level          = 0;
66
+    bluecell_Currdatastatus.ALARM_DLI_AGC_SHTUTDOWN  = 0;
67
+    bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm      = 0;
68
+    bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm      = 0;
69
+    bluecell_Currdatastatus.ALARM_ULO_Level          = 0;
70
+    bluecell_Currdatastatus.ALARM_ULO_ALC_SHTUTDOWN  = 0;
62 71
 
63
-    
64 72
 //    printf("bluecell_Currdatastatus.ATT_DL1_H : %x\r\n",bluecell_Currdatastatus.ATT_DL1_H);
65 73
 //    printf("bluecell_Currdatastatus.ATT_DL1_L : %x\r\n",bluecell_Currdatastatus.ATT_DL1_L);        
66 74
 //    

+ 8 - 1
Src/main.c

@@ -96,6 +96,8 @@ static void MX_TIM6_Init(void);
96 96
 static void MX_I2C2_Init(void);
97 97
 static void MX_NVIC_Init(void);
98 98
 /* USER CODE BEGIN PFP */
99
+extern void Booting_LedInit(void);
100
+extern void Bluecell_AttenInitialize();
99 101
 
100 102
 /* USER CODE END PFP */
101 103
 
@@ -270,10 +272,12 @@ extern void Booting_LED_Check(void);
270 272
 
271 273
 /**
272 274
   * @brief  The application entry point.
275
+  *
273 276
   * @retval int
274 277
   */
275 278
 int main(void)
276
-{
279
+
280
+  {
277 281
   /* USER CODE BEGIN 1 */
278 282
 
279 283
   /* USER CODE END 1 */
@@ -317,6 +321,7 @@ int main(void)
317 321
   PE43711_PinInit();
318 322
   EEPROM_M24C08_Init();
319 323
   Bluecell_DataInit();
324
+  Bluecell_AttenInitialize();
320 325
 #if 1 // PYJ.2020.05.06_BEGIN -- 
321 326
     printf("****************************************\r\n");
322 327
     printf("MBIC Project\r\n");
@@ -324,6 +329,8 @@ int main(void)
324 329
     printf("Copyright (c) 2020. BLUECELL\r\n");
325 330
     printf("****************************************\r\n");
326 331
 #endif // PYJ.2020.05.06_END --   
332
+  Booting_LedInit();
333
+
327 334
   Booting_LED_Check();
328 335
 #if 0 // PYJ.2020.04.22_BEGIN -- 
329 336
   EEPROM_M24C08_write(0xA0,0,i2cTestData,1);