Diff: EPS.cpp

Revision:

53:459b71b1861c

Parent:

52:daa685b0e390

Child:

56:32b1fb074138

--- a/EPS.cpp	Fri Jul 22 22:21:05 2016 +0000
+++ b/EPS.cpp	Fri Aug 05 19:33:09 2016 +0000
@@ -522,22 +522,23 @@
     }
     for(Iteration=0;Iteration<12;Iteration++){
         if(Iteration<8)
-            quant_data.current_quant[Iteration] = float_to_uint8(0.0,5,actual_data.current_actual[Iteration]);//quantiz(cstart,cstep,actual_data.current_actual[Iteration]);
+            quant_data.current_quant[Iteration] = float_to_uint8(0.0,2,actual_data.current_actual[Iteration]);//quantiz(cstart,cstep,actual_data.current_actual[Iteration]);
         else
-            quant_data.current_quant[Iteration] = float_to_uint8(0.0,5,actual_data.current_actual[Iteration]);//quantiz(tstart_thermistor,tstep_thermistor,actual_data.current_actual[Iteration]);
+            quant_data.current_quant[Iteration] = float_to_uint8(0.0,2,actual_data.current_actual[Iteration]);//quantiz(tstart_thermistor,tstep_thermistor,actual_data.current_actual[Iteration]);
      }       
     for(Iteration=0;Iteration<2;Iteration++){
         
-        quant_data.Batt_temp_quant[Iteration] = float_to_uint8(0.0,5,actual_data.Batt_temp_actual[Iteration]);//quantiz(tstart,tstep,actual_data.Batt_temp_actual[Iteration]);
+        quant_data.Batt_temp_quant[Iteration] = float_to_uint8(-50,100,actual_data.Batt_temp_actual[Iteration]);//quantiz(tstart,tstep,actual_data.Batt_temp_actual[Iteration]);
     }
     
-    //to be changed
-    quant_data.Batt_gauge_quant[0] = quantiz(vcell_start,vcell_step,actual_data.Batt_gauge_actual[0]);
-    quant_data.Batt_gauge_quant[1]=quantiz(soc_start,soc_step,actual_data.Batt_gauge_actual[1]);
-    quant_data.Batt_gauge_quant[2]=quantiz(crate_start,crate_step,actual_data.Batt_gauge_actual[2]);
-    quant_data.Batt_gauge_alerts=actual_data.Batt_gauge_actual[3];
+    //to be changed no need to quantized
     
-    quant_data.BAE_temp_quant=quantiz(tstart,tstep,actual_data.BAE_temp_actual);
+    /*no need*/// ->> quant_data.Batt_gauge_quant[0] = quantiz(vcell_start,vcell_step,actual_data.Batt_gauge_actual[0]);
+    /*no need*/// ->> quant_data.Batt_gauge_quant[1]=quantiz(soc_start,soc_step,actual_data.Batt_gauge_actual[1]);
+    /*no need*/// ->> quant_data.Batt_gauge_quant[2]=quantiz(crate_start,crate_step,actual_data.Batt_gauge_actual[2]);
+    /*no need*/// ->> quant_data.Batt_gauge_alerts=actual_data.Batt_gauge_actual[3];
+    
+    quant_data.BAE_temp_quant= float_to_uint8(-50,100,actual_data.BAE_temp_actual);
     
 ////    for(Iteration=0;Iteration<3;Iteration++){
 ////        quant_data.AngularSpeed_quant[Iteration]=actual_data.AngularSpeed_actual[Iteration];
@@ -549,13 +550,13 @@
 ////        printf("\n\r b value %f",quant_data.Bvalue_quant[Iteration]);
 ////    }
     
-    quant_data.Batt_voltage_quant=quantiz(vstart,vstep,actual_data.Batt_voltage_actual);
+    quant_data.Batt_voltage_quant= float_to_uint8(0,5.0,actual_data.Batt_voltage_actual);
     
-    
+    //?? WHAT DO here
     arch_data.Batt_1_temp=quant_data.Batt_temp_quant[0];
     arch_data.Batt_2_temp=quant_data.Batt_temp_quant[1];
     arch_data.EPS_PCB_temp=quant_data.voltage_quant[14];
-    arch_data.Batt_SOC=quant_data.Batt_gauge_quant[1];
+    //arch_data.Batt_SOC=quant_data.Batt_gauge_quant[1];
     arch_data.power_mode=actual_data.power_mode;
     arch_data.faultPoll_status=actual_data.faultPoll_status;
     arch_data.faultIr_status=actual_data.faultIr_status;
@@ -790,11 +791,11 @@
         bae_HK_minmax.Batt_gauge_max[i] = quant_data.Batt_gauge_quant[i];
         }
         */
-        bae_HK_minmax.Batt_SOC_min = quant_data.Batt_gauge_quant[1];
-        bae_HK_minmax.Batt_SOC_max = quant_data.Batt_gauge_quant[1];
+        bae_HK_minmax.Batt_SOC_min = (uint8_t)(actual_data.Batt_gauge_actual[1]);
+        bae_HK_minmax.Batt_SOC_max = (uint8_t)(actual_data.Batt_gauge_actual[1]);
         
         bae_HK_minmax.BCN_TEMP_min = BCN_TMP;
-        bae_HK_minmax.BCN_TEMP_min = BCN_TMP;
+        bae_HK_minmax.BCN_TEMP_max = BCN_TMP;
         
         for (int i = 0; i < 3; ++i){    
         bae_HK_minmax.bit_data_acs_mg_min[i] = actual_data.bit_data_acs_mg[i];
@@ -834,8 +835,8 @@
             saveMax(bae_HK_minmax.Batt_gauge_max[i], quant_data.Batt_gauge_quant[i]);
         }
         */
-        saveMin(bae_HK_minmax.Batt_SOC_min, quant_data.Batt_gauge_quant[1]);
-        saveMax(bae_HK_minmax.Batt_SOC_max, quant_data.Batt_gauge_quant[1]);
+        saveMin(bae_HK_minmax.Batt_SOC_min, ((uint8_t)(actual_data.Batt_gauge_actual[1])) );
+        saveMax(bae_HK_minmax.Batt_SOC_max, ((uint8_t)(actual_data.Batt_gauge_actual[1])) );
         
         saveMin(bae_HK_minmax.BCN_TEMP_min, BCN_TMP);
         saveMin(bae_HK_minmax.BCN_TEMP_max, BCN_TMP);