Penn Electric Racing / Mbed 2 deprecated REVO_Updated_Steering

Dependencies:   CANBuffer KS0108_fork mbed-rtos mbed CAN Addresses

Fork of REVO_Updated_Steering by Penn Electric

Files at this revision

API Documentation at this revision

Comitter:
kiran_mbed
Date:
Mon Mar 23 19:36:37 2015 +0000
Parent:
41:7c5ea411fad2
Child:
44:80d821b5a0e7
Child:
46:28d246b6fe65
Child:
47:5d3c6f85fa29
Commit message:
Removed Blocking of Start CAN Message.; Removed Sending of START Message bug

Changed in this revision

CAN_Address.h Show annotated file Show diff for this revision Revisions of this file
CAN_Filter_LUT.h Show annotated file Show diff for this revision Revisions of this file
Steering.cpp Show annotated file Show diff for this revision Revisions of this file
demo.h Show annotated file Show diff for this revision Revisions of this file
mbed-rtos.lib Show annotated file Show diff for this revision Revisions of this file
--- a/CAN_Address.h	Sun Feb 08 08:53:44 2015 +0000
+++ b/CAN_Address.h	Mon Mar 23 19:36:37 2015 +0000
@@ -11,7 +11,7 @@
 
 // Battery Screen Addresses
 #define VOLTAGE_TX_ID           TX_BASE + 0x08
-#define POWER_TX_ID             TX_BASE + 0x09
+#define POWER_TX_ID             TX_BASE + 0x14
 #define CURRENT_TX_ID           TX_BASE + 0x06
 #define CELLV_MMA_TX_ID_BASE    TX_BASE + 0x16
 #define CELLV_MMA_TX_ID_BASE2   TX_BASE + 0x17
--- a/CAN_Filter_LUT.h	Sun Feb 08 08:53:44 2015 +0000
+++ b/CAN_Filter_LUT.h	Mon Mar 23 19:36:37 2015 +0000
@@ -52,8 +52,6 @@
 
 ( VOLTAGE_TX_ID                     & STDMASK), // 0x308
 
-( POWER_TX_ID                       & STDMASK), // 0x309
-
 ( SOC_TX_ID                         & STDMASK), // 0x30B
 
 ( BOARDTEMP_TX_ID                   & STDMASK), // 0x30E
@@ -78,7 +76,7 @@
 
 ( SYS_IMD_RESIST_ID                 & STDMASK), // 0x541
 
-( SYS_SWITCHES_ID                   & STDMASK), // 0x560
+( SYS_SWITCHES_ID                   & STDMASK) // 0x560
   
 // STANDARD EXPLICIT IDs - CAN CONTROLLER 2
 //( 0xID                              & STDMASK),
--- a/Steering.cpp	Sun Feb 08 08:53:44 2015 +0000
+++ b/Steering.cpp	Mon Mar 23 19:36:37 2015 +0000
@@ -103,15 +103,11 @@
         // printf("Message ID: 0x%x len: %d hex: 0x%x float: %f\r\n", Rxmsg.id, Rxmsg.len, *((int*)((void*)(&Rxmsg.data[0]))), *((float*)((void*)(&Rxmsg.data[0]))));
         // for (int i=0; i < Rxmsg.len; i++) printf("D[%d]: %x ", i, Rxmsg.data[i]);
         if (Rxmsg.id == MODE_TX_ID) {
-            CANFloat = GetFloat;
-            sprintf(&DriveStatus,"%3.2d", int(CANFloat));                       //confirm that I am interpreting this correctly
-            DriveStatusRequestBuffer = !DriveStatus;
-            if (DriveStatus == 1) {
-                BLButtonGreen;
-            } else {
-                BLButtonRed;
+            if(Rxmsg.data[0] != (1<<3))
+                DriveStatusRequestBuffer=1;
+            else
+                DriveStatusRequestBuffer=0;
             }
-        }
 
         if (Rxmsg.id == POWER_TX_ID) {
             CANFloat = GetFloat;
--- a/demo.h	Sun Feb 08 08:53:44 2015 +0000
+++ b/demo.h	Mon Mar 23 19:36:37 2015 +0000
@@ -1,3 +1,4 @@
+/*
 // FORMAT_CODE_START
 // FORMAT_CODE_START
 #include "Steering.h"
@@ -78,4 +79,5 @@
 
 }
 // FORMAT_CODE_END
-// FORMAT_CODE_END
\ No newline at end of file
+// FORMAT_CODE_END
+*/
\ No newline at end of file
--- a/mbed-rtos.lib	Sun Feb 08 08:53:44 2015 +0000
+++ b/mbed-rtos.lib	Mon Mar 23 19:36:37 2015 +0000
@@ -1,1 +1,1 @@
-http://developer.mbed.org/users/mbed_official/code/mbed-rtos/#5448826aa700
+http://developer.mbed.org/users/mbed_official/code/mbed-rtos/#83e169389a69