Просмотр исходного кода

HFR 검수 전 날 수정 사항

1.Carrier 동작
2. EEPROM INIT D day 초기화
3. Shutdown 시 30분으로 변경
4.Factory Set 동작 기능 구현
PYJ лет назад: 5
Родитель
Сommit
d6bc8c80f5
4 измененных файлов с 771 добавлено и 150 удалено
  1. 2 0
      Bluecell_Inc/Bluecell_operate.h
  2. 765 146
      Bluecell_Src/Bluecell_operate.c
  3. 3 3
      Bluecell_Src/eeprom.c
  4. 1 1
      Inc/main.h

+ 2 - 0
Bluecell_Inc/Bluecell_operate.h

@@ -620,6 +620,8 @@ enum DATATYPE
620 620
     BLuecell_ATT_ALC4,   
621 621
     Bluecell_BankSelect,
622 622
     Bluecell_TimeSetting,
623
+    Bluecell_Factory_Set,
624
+    Bluecell_CarrierOnOff,
623 625
 };
624 626
 typedef enum{    
625 627
 	DLI_P1_Level_Table_Number = 0x00,

Разница между файлами не показана из-за своего большого размера
+ 765 - 146
Bluecell_Src/Bluecell_operate.c


+ 3 - 3
Bluecell_Src/eeprom.c

@@ -215,9 +215,9 @@ void EEPROM_M24C08_Init(void){
215 215
     bluecell_Currdatastatus.DLI_FRBT_Atten2_L = 0;    
216 216
     bluecell_Currdatastatus.DLI_FRBT_Atten3_L = 0;    
217 217
     bluecell_Currdatastatus.DLI_FRBT_Atten4_L = 0;
218
-    bluecell_Currdatastatus.DLI_FRBT_D_Day = 0;
219
-    bluecell_Currdatastatus.DLI_FRBT_Status = 0;
220
-    
218
+//    bluecell_Currdatastatus.DLI_FRBT_D_Day = 0;
219
+//    bluecell_Currdatastatus.DLI_FRBT_Status = 0;
220
+    bluecell_Currdatastatus.ALARM_TESTMODE = 0;
221 221
 //    bluecell_Currdatastatus.CPUVERSION1 =  0;
222 222
 //    bluecell_Currdatastatus.CPUVERSION2 = 0;
223 223
 //    bluecell_Currdatastatus.CPUVERSION3 = 8;

+ 1 - 1
Inc/main.h

@@ -185,7 +185,7 @@ extern I2C_HandleTypeDef hi2c2;
185 185
 #define MBIC_ON_MAINTAIN_SEC 3000
186 186
 #define MBIC_ON_SHUTDOWN_MAINTAIN_SEC 5000//5
187 187
 #define MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC 30000//30
188
-#define MBIC_RECOVERY_LAST_SHUTDOWN_MAINTAIN_SEC 60000//60000 * 5 //5min
188
+#define MBIC_RECOVERY_LAST_SHUTDOWN_MAINTAIN_SEC 60000 * 5 //5min
189 189
 
190 190
 
191 191
 #define MBIC_OFF_MAINTAIN_SEC 10000