Penn Electric Racing / Mbed 2 deprecated REVO_Updated_Steering

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:   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

Revision 38:d04a430d7fe3, committed 2015-02-08

Comitter:
tmccurbin
Date:
Sun Feb 08 02:47:05 2015 +0000
Parent:
37:c9b9057079d9
Child:
39:e6aa6dcf3f75
Commit message:
Implemented Filters

Changed in this revision

CANBuffer.lib Show annotated file Show diff for this revision Revisions of this file
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
Steering.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/CANBuffer.lib	Thu Jan 29 04:33:10 2015 +0000
+++ b/CANBuffer.lib	Sun Feb 08 02:47:05 2015 +0000
@@ -1,1 +1,1 @@
-http://developer.mbed.org/teams/Penn-Electric-Racing/code/CANBuffer/#55f8413e1bd6
+http://developer.mbed.org/teams/Penn-Electric-Racing/code/CANBuffer/#bf7adaf90781

--- a/CAN_Address.h	Thu Jan 29 04:33:10 2015 +0000
+++ b/CAN_Address.h	Sun Feb 08 02:47:05 2015 +0000
@@ -1,7 +1,7 @@
 #define TX_BASE                 0x300       // TX IDs start at 0x300
 #define TX_DUMP_OFFSET          0x100       // Bulk data dumps start at ID 0x300+0x100 = 0x400 for dumping current RAM and freezeFrames
 
-//Home Screen Addresses
+// Home Screen Addresses
 #define SOC_TX_ID               TX_BASE + 0x0B
 #define SYS_GLV_SOC_ID          0x513
 #define PCM_FRPM_ID             0x222
@@ -9,7 +9,7 @@
 #define TEMP_MMA_TX_ID_BASE2    TX_BASE + 0x19 
 #define MOC_MOTEMP_ID           0x212
 
-//Battery Screen Addresses
+// Battery Screen Addresses
 #define VOLTAGE_TX_ID           TX_BASE + 0x08
 #define POWER_TX_ID             TX_BASE + 0x09
 #define CURRENT_TX_ID           TX_BASE + 0x06
@@ -19,14 +19,14 @@
 #define TEMP_MMA_TX_ID_BASE2    TX_BASE + 0x19
 #define BOARDTEMP_TX_ID         TX_BASE + 0x0E
 
-//Motor Screen Addresses
+// Motor Screen Addresses
 #define MOC_MOTEMP_ID           0x212
 #define MOC_AIRTEMP_ID          0x213
 #define MOC_IGBTTEMP_ID         0x214
 #define MOC_RPM_ID              0x211
 #define PCM_TORQUERQ_ID         0x231     
 
-//System Management Addresses
+// System Management Addresses
 #define SYS_GLV_CURRENT_ID      0x510
 #define SYS_SWITCHES_ID         0x560
 #define SYS_PWM_FAN_ID          0x530
@@ -34,10 +34,60 @@
 #define SYS_DCDC_STATUS_ID      0x521
 #define SYS_IMD_RESIST_ID       0x541
 
-//Charger Addresses
+// Charger Addresses
 #define CHARGECURR_TX_ID        TX_BASE + 0x07
 
-//Other Addresses
+// Faults, Flags, & Errors (CURRENTLY BEING FILTERED)
+#define PCM_FLAGS_ID            0x202
+#define MOC_FAULTS_ID           0x210
+#define PCM_FAULTS_ID           0x221
 #define FAULTCODE_TX_ID         TX_BASE + 0x00
+#define CELLFLAGS_TX_ID_BASE    TX_BASE + 0x47
+#define TEMPFLAGS_TX_ID_BASE    TX_BASE + 0x5B
+#define DIETEMPFLAGS_TX_ID_BASE TX_BASE + 0x74
+
+
+// Filtered Addresses
+#define SIGNALS_TX_ID           TX_BASE + 0x03
+#define PROFILE_TX_ID           TX_BASE + 0x04
+#define PACKERRS_TX_ID          TX_BASE + 0x05
+#define AH_TX_ID                TX_BASE + 0x0C
+#define SUPPLY_TX_ID            TX_BASE + 0x0D
+#define VMISMATCH_TX_ID         TX_BASE + 0x0F
+#define FANSPEED_TX_ID          TX_BASE + 0x10
+#define STACK_OPDATA_TX_ID      TX_BASE + 0x15
+#define INTREF_MMA_TX_ID_BASE   TX_BASE + 0x1A
+#define DIETEMP_MMA_TX_ID_BASE  TX_BASE + 0x1C
+#define VA_MMA_TX_ID_BASE       TX_BASE + 0x1C
+#define VDD_MMA_TX_ID_BASE      TX_BASE + 0x20
+#define SOC_MMA_TX_ID_BASE      TX_BASE + 0x22
+#define CELLV_TX_ID_BASE        TX_BASE + 0x23
+#define TEMP_TX_ID_BASE         TX_BASE + 0x4B
+#define IC_REF_SOC_TX_ID_BASE   TX_BASE + 0x5C
+#define IC_VA_VDD_TX_ID_BASE    TX_BASE + 0x64
+#define IC_DIETEMP_TX_ID_BASE   TX_BASE + 0x6C
+#define IC_OPDATA_TX_ID_BASE    TX_BASE + 0x7C
+#define PCM_ERROR_ID            0x200
+#define PCM_MODE_ID             0x201
+#define LEFT_MOC_TXID           0x205
+#define RIGHT_MOC_TXID          0x206
+#define MOC_CURRENT_ID          0x215
+#define MOC_VBUS_ID             0x216
+#define PCM_DIGIOUT_ID          0x230
+#define SYSMGMT_PUMPCMD_ID      0x580
+#define SYSMGMT_FANCMD_ID       0x581
+#define SYS_ERROR_ID            0x500
+#define SYS_XBEE1_ID            0x501
+#define SYS_XBEE2_ID            0x502
+#define SYS_TEMP_ID             0x503
+#define SYS_GLV_CAPACITY_ID     0x511
+#define SYS_GLV_AH_ID           0x512
+#define SYS_DCDC_CURRENT_ID     0x520
+#define SYS_IMD_STATUS_ID       0x521
+#define SYS_IMD_LATCH_ID        0x550
+#define SYS_AMS_LATCH_ID        0x551
+
+
+// Other Addresses
 #define MODE_TX_ID              TX_BASE + 0x01
-#define PCM_PEDALS_ID           0x220
\ No newline at end of file
+#define PCM_PEDALS_ID           0x220           //MOSTLY USED FOR TESTING PROGRAM SPEED
\ No newline at end of file

--- a/CAN_Filter_LUT.h	Thu Jan 29 04:33:10 2015 +0000
+++ b/CAN_Filter_LUT.h	Sun Feb 08 02:47:05 2015 +0000
@@ -10,7 +10,9 @@
 */
 #ifndef _FILE_CAN_FILTER_LUT_H
 #define _FILE_CAN_FILTER_LUT_H
- 
+
+#include "CAN_Address.h"
+
 #define STDMASK 0x7FF
 #define EXTMASK 0x1FFFFFFF
  
@@ -53,7 +55,52 @@
  
 const uint64_t AF_LUT_EIR[] = {
 // !! ID's MUST BE IN ASCENDING ORDER (starting at 0x00), NO OVERLAPPING RANGES !!
- 
+( SIGNALS_TX_ID                     & EXTMASK),
+( PROFILE_TX_ID                     & EXTMASK),
+( PACKERRS_TX_ID                    & EXTMASK),
+( AH_TX_ID                          & EXTMASK),
+( SUPPLY_TX_ID                      & EXTMASK),
+( VMISMATCH_TX_ID                   & EXTMASK),
+( FANSPEED_TX_ID                    & EXTMASK),
+( STACK_OPDATA_TX_ID                & EXTMASK),
+( INTREF_MMA_TX_ID_BASE             & EXTMASK),
+( DIETEMP_MMA_TX_ID_BASE            & EXTMASK),
+( VA_MMA_TX_ID_BASE                 & EXTMASK),
+( VDD_MMA_TX_ID_BASE                & EXTMASK),
+( SOC_MMA_TX_ID_BASE                & EXTMASK),
+( CELLV_TX_ID_BASE                  & EXTMASK),
+( CELLFLAGS_TX_ID_BASE              & EXTMASK),
+( TEMP_TX_ID_BASE                   & EXTMASK),
+( TEMPFLAGS_TX_ID_BASE              & EXTMASK),
+( IC_REF_SOC_TX_ID_BASE             & EXTMASK),
+( IC_VA_VDD_TX_ID_BASE              & EXTMASK),
+( IC_DIETEMP_TX_ID_BASE             & EXTMASK),
+( DIETEMPFLAGS_TX_ID_BASE           & EXTMASK),
+( IC_OPDATA_TX_ID_BASE              & EXTMASK),
+( PCM_ERROR_ID                      & EXTMASK),
+( PCM_MODE_ID                       & EXTMASK),
+( PCM_FLAGS_ID                      & EXTMASK),
+( LEFT_MOC_TXID                     & EXTMASK),
+( RIGHT_MOC_TXID                    & EXTMASK),
+( MOC_CURRENT_ID                    & EXTMASK),
+( MOC_VBUS_ID                       & EXTMASK),
+( PCM_DIGIOUT_ID                    & EXTMASK),
+( SYSMGMT_PUMPCMD_ID                & EXTMASK),
+( SYSMGMT_FANCMD_ID                 & EXTMASK),
+( MOC_FAULTS_ID                     & EXTMASK),
+( PCM_FAULTS_ID                     & EXTMASK),
+( FAULTCODE_TX_ID                   & EXTMASK),
+( SYS_ERROR_ID                      & EXTMASK),
+( SYS_XBEE1_ID                      & EXTMASK),
+( SYS_XBEE2_ID                      & EXTMASK),
+( SYS_TEMP_ID                       & EXTMASK),
+( SYS_GLV_CAPACITY_ID               & EXTMASK),
+( SYS_GLV_AH_ID                     & EXTMASK),
+( SYS_DCDC_CURRENT_ID               & EXTMASK),
+( SYS_IMD_STATUS_ID                 & EXTMASK),
+( SYS_IMD_LATCH_ID                  & EXTMASK),
+( SYS_AMS_LATCH_ID                  & EXTMASK),
+
 // EXTENDED ID RANGES - CAN CONTROLLER 1
 //( 0xLOWERBOUND & EXTMASK) << 32         | ( 0xUPPERBOUND & EXTMASK), lower/upperbounds are inclusive
  

--- a/Steering.cpp	Thu Jan 29 04:33:10 2015 +0000
+++ b/Steering.cpp	Sun Feb 08 02:47:05 2015 +0000
@@ -1,8 +1,8 @@
 #include "Steering.h"
 
 // To-Do:
-// Look at SYS management CAN translations: shutdown switches, DCDC status, & IMD status
-// Figure out screen/variable updating options
+// Look at SYS management CAN translations: shutdown switches, DCDC status, & IMD (this is a resistance, in ohms)
+// Figure out screen/variable updating options (hardware filter), NVIC_SetPriority(CAN_IRQn,####)LPC17xx.h
 // Firgure out fault protocall
 
 void Init();

--- a/Steering.h	Thu Jan 29 04:33:10 2015 +0000
+++ b/Steering.h	Sun Feb 08 02:47:05 2015 +0000
@@ -6,9 +6,9 @@
 #include "rtos.h"
 #include "KS0108.h"
 #include "Arial14.h"
+#include "Screens.h"
+#include "CANQueue.h"
 #include "CANBuffer.h"
-#include "CAN_Address.h"
-#include "Screens.h"
 
 #define GetFloat  *(float*)((void*)(&Rxmsg.data[0]))
 #define GetFloat4 *(float*)((void*)(&Rxmsg.data[4]))

--- a/mbed-rtos.lib	Thu Jan 29 04:33:10 2015 +0000
+++ b/mbed-rtos.lib	Sun Feb 08 02:47:05 2015 +0000
@@ -1,1 +1,1 @@
-http://developer.mbed.org/users/mbed_official/code/mbed-rtos/#444020d511f5
+http://developer.mbed.org/users/mbed_official/code/mbed-rtos/#5448826aa700