Diff: EPS.h

Revision:

20:949d13045431

Parent:

19:79e69017c855

Child:

26:c8655e0ec73a

Child:

33:76f2b8735501

--- a/EPS.h	Sat Jun 04 11:29:13 2016 +0000
+++ b/EPS.h	Fri Jul 01 17:55:30 2016 +0000
@@ -43,6 +43,10 @@
 #define BATT_HEAT PIN96
 //#define BATT_HEAT_OUTPUT 
 extern void FCTN_CONVERT_FLOAT(float input, uint8_t* output);
+//PARAMETER VALUE //change
+//#define EPS_BAT_TEMP_LOW 0
+//#define EPS_BAT_TEMP_HIGH 55
+//#define EPS_BAT_TEMP_DEFAULT 20 
 
 void FCTN_EPS_INIT();
 
@@ -95,8 +99,13 @@
     char power_mode;      
     uint8_t faultPoll_status; 
     uint8_t faultIr_status;
-    float AngularSpeed_actual[3];   
-    float Bvalue_actual[3];
+    
+    //changed
+    int16_t bit_data_acs_mm[3];
+    int16_t bit_data_acs_mg[3];
+    
+    float AngularSpeed_actual[3];//required for algo   
+    float Bvalue_actual[3];//required for algo
     float Batt_voltage_actual;
     /*changed 1.0*/
     //uint16_t Batt_voltage_data;   
@@ -110,8 +119,10 @@
     uint8_t Batt_gauge_quant[3];       // why only 3 here??
     float Batt_gauge_alerts;  //why is this float??
     uint8_t BAE_temp_quant;
+
     float AngularSpeed_quant[3];   
     float Bvalue_quant[3];  
+    
     uint8_t Batt_voltage_quant;  
 }BAE_HK_quant;
 
@@ -135,21 +146,37 @@
 typedef struct BAE_HK_min_max{
     uint8_t voltage_max[16];
     uint8_t current_max[12];
-    uint8_t Batt_temp_max[2];
-    uint8_t Batt_gauge_max[3];
-    uint8_t BAE_temp_max;    
-    float AngularSpeed_max[3];   
-    float Bvalue_max[3];    
-    uint8_t Batt_voltage_max;  
+    uint8_t Batt_voltage_max;
+    uint8_t BAE_temp_max;     
+    
+    //battery soc  
+    uint8_t Batt_SOC_max;
+    
+    uint8_t Batt_temp_max[2];//bcn temp also included?
+    //uint8_t Batt_gauge_max[3];//what is the use.
+    
+    uint16_t bit_data_acs_mm_max[3];
+    uint16_t bit_data_acs_mg_max[3];
+    uint8_t BCN_TEMP_max;
+    //below no longer valid
+    /*uint16_t Bvalue_max[3];
+    uint16_t AngularSpeed_max[3];       
+    */  
 
     uint8_t voltage_min[16];
     uint8_t current_min[12];
-    uint8_t Batt_temp_min[2];
-    uint8_t Batt_gauge_min[3];
+    uint8_t Batt_voltage_min;
     uint8_t BAE_temp_min;
-    float AngularSpeed_min[3];   
-    float Bvalue_min[3];    
-    uint8_t Batt_voltage_min;  
+    uint8_t Batt_SOC_min;
+    
+    uint8_t Batt_temp_min[3];//includes bcn temp
+    uint8_t BCN_TEMP_min;
+    
+    //uint8_t Batt_gauge_min[3];
+    
+    uint16_t bit_data_acs_mm_min[3];
+    uint16_t bit_data_acs_mg_min[3];   
+          
 
 }BAE_HK_min_max;