Marta Avramovic / Mbed OS MSPDFW

by MARTA RADI

Dependencies:   GPSM bno055 SDcardM

Files at this revision

API Documentation at this revision

Revision 3:835df5760305, committed 2019-10-03

Comitter:
renemagrit
Date:
Thu Oct 03 20:21:37 2019 +0000
Parent:
2:57920a59c050
Commit message:
MSPD ispravak

Changed in this revision

CANlibrary.lib Show annotated file Show diff for this revision Revisions of this file
CANlibraryApril.lib Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file 
diff -r 57920a59c050 -r 835df5760305 CANlibrary.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CANlibrary.lib	Thu Oct 03 20:21:37 2019 +0000
@@ -0,0 +1,1 @@
+https://os.mbed.com/users/renemagrit/code/CANlibrary1_1/#a142cf0e7c37

diff -r 57920a59c050 -r 835df5760305 CANlibraryApril.lib
--- a/CANlibraryApril.lib	Wed Jun 12 21:54:01 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://os.mbed.com/users/renemagrit/code/CANlibraryApril/#dade5cf64d0e

diff -r 57920a59c050 -r 835df5760305 main.cpp
--- a/main.cpp	Wed Jun 12 21:54:01 2019 +0000
+++ b/main.cpp	Thu Oct 03 20:21:37 2019 +0000
@@ -9,7 +9,7 @@
 #include <string>
 /*---------------DATA TYPES---------------*/
 
-CAN can(PA_11, PA_12);
+CAN can(PA_11, PA_12,1000000);
 
 //10DOF
 BNO055 imu(PB_14, PB_13);
@@ -48,7 +48,7 @@
     imu.write_calibration_data();
 
     pc.printf("CAN...\r\n");
-    can.frequency(100000);
+    //can.frequency(1000000); //10hz???
     can_initRX();
 
     pc.printf("SD...\r\n");
@@ -92,12 +92,19 @@
             pc.printf("LON: %f, LAT: %f\r\n", GPSM::get_dec_longitude(), GPSM::get_dec_latitude());
 
 
-        if(check_flag(0xA)) {
-            pc.printf("ASAD1: %d", get_data(10, 0));
+        if(check_flag(10)) {
+            pc.printf("ASAD1: %d\n", get_data(10, 0));
         }
         if(check_flag(12)) {
-            pc.printf("ASAD2: %d", get_data(12, 0));
+            pc.printf("ASAD2: %d\n", get_data(12, 0));
         }
+        pc.printf(" - - - - - - -  DTA  - - - - - - - \n");
+        pc.printf("DTA1: RPM - %d TPS - %d WaterTemp - %d AirTemp - %d\n", get_data(DTA1_RPM), get_data(DTA1_TPS), get_data(DTA1_WaterTemp), get_data(DTA1_AirTemp));
+        pc.printf("DTA2: MAP - %d Lambda - %d Speed - %d OilPres - %d\n", get_data(DTA2_MAP), get_data(DTA2_Lambda), get_data(DTA2_Speed), get_data(DTA2_OilPres));
+        pc.printf("DTA3: OilTemp - %d Volts - %d\n", get_data(DTA3_OilTemp), get_data(DTA3_Volts));
+        pc.printf("DTA4: Gear - %d\n", get_data(DTA4_Gear));
+        pc.printf("DTA6: Crank - %d\n", get_data(DTA6_Crank));
+        
 
     }
 }
\ No newline at end of file