Diff: main.cpp

Revision:

2:5ce2ad0782de

Parent:

1:2c598112756b

Child:

3:609e4be772e0

diff -r 2c598112756b -r 5ce2ad0782de main.cpp
--- a/main.cpp	Mon Jun 21 19:58:00 2021 +0000
+++ b/main.cpp	Tue Jul 20 19:35:55 2021 +0000
@@ -45,12 +45,6 @@
      msg->data[1] = f1_int&0xFF;
      msg->data[2] = f2_int>>8;
      msg->data[3] = f2_int&0xFF;
-     /*
-     msg->data[4] = 0x00;
-     msg->data[5] = 0x00;
-     msg->data[6] = 0x00;
-     msg->data[7] = 0x00;
-     */
      }
 
 int main()
@@ -65,18 +59,18 @@
     statMsg.len = 4;                        //transmit 4 bytes
     
     currMsg.id = 0x1;                       //higher priority                
-    statMsg.id = 0x101;                     //lower priority
+    statMsg.id = 0x2;                     //lower priority
     
     while(1){
-        //wait(1); //GET RID OF THIS WAIT LATER
-        float hv_cur = (hv_current.read()*SYSTEM_VOLTAGE-VCC/2.0) / HV_CURRENT_SCALING;                                     //PUBLISH
-        float lv_cur = (lv_current.read()*SYSTEM_VOLTAGE-VCC/2.0) / LV_CURRENT_SCALING;                                     //PUBLISH
+        wait(0.0003); //MAKE SURE IT's 1-3k rate, higher we will fill the CAN buffer
+        float hv_cur = float((hv_current.read()*SYSTEM_VOLTAGE-VCC/2.0) / HV_CURRENT_SCALING);                                     //PUBLISH
+        float lv_cur = float((lv_current.read()*SYSTEM_VOLTAGE-VCC/2.0) / LV_CURRENT_SCALING);                                     //PUBLISH
         float vol = (voltage_sense.read()*SYSTEM_VOLTAGE)*VOL_SENSE_SCALING; //INACCURATE ON THE HARDWARE SIDE!!!           //PUBLISH
         
         float V_OUT_EXT = (ext_current_A.read()*SYSTEM_VOLTAGE);
         float V_REF_EXT = (ext_current_B.read()*SYSTEM_VOLTAGE);
         
-        float ext_cur = (V_OUT_EXT*SYSTEM_VOLTAGE-V_REF_EXT*SYSTEM_VOLTAGE) / EXT_CURRENT_SCALING;                            //PUBLISH
+        float ext_cur = (V_OUT_EXT-V_REF_EXT) / EXT_CURRENT_SCALING;                            //PUBLISH
         
         //now we have to publish the four floats to the CAN BUS
         pack_cmd(&currMsg, hv_cur, ext_cur);