Team Fox / Mbed 2 deprecated workinQM_10thDec

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   FreescaleIAP mbed-rtos mbed

Fork of RAJANGAM_REVIEW_BAE_CODE by Team Fox

Diff: EPS.cpp

Revision:
65:d1b12729fcdc
Parent:
64:241406992336
Child:
66:a5d2b8dc6b9e
Child:
69:85317ed6717f
--- a/EPS.cpp	Fri Oct 28 17:50:49 2016 +0000
+++ b/EPS.cpp	Thu Nov 24 09:45:08 2016 +0000
@@ -466,7 +466,7 @@
     for(Iteration=0; Iteration<16; Iteration++)
     {
             actual_data.voltage_actual[Iteration]=VoltageInput.read();
-            wait_ms(100); //remove
+            //wait_ms(100); //remove
             actual_data.current_actual[Iteration]=CurrentInput.read();
            
             SelectLinea0=!(SelectLinea0);
@@ -500,6 +500,16 @@
         {
             actual_data.current_actual[Iteration]= actual_data.current_actual[Iteration]*3.3/(50*rsens);
         }
+        
+        else if(Iteration==8)
+        {
+            actual_data.current_actual[Iteration]= (-90.7*3.3*actual_data.current_actual[Iteration])+190.1543;//Temperature
+        }
+        
+        else if(Iteration==9)
+        {
+            actual_data.current_actual[Iteration]= actual_data.current_actual[Iteration])*3.3*62/11;//Load BUS voltage
+        }
         else if(Iteration<12)
         {
             actual_data.current_actual[Iteration]= 0;