Revision 29:f148490b5f65, committed 2014-11-08

Comitter:

pspatel321

Date:

Sat Nov 08 17:15:14 2014 +0000

Parent:

21:2e83002d452d

Commit message:

Parth edits branch

Changed in this revision

--- a/CANBuffer.lib	Fri Nov 07 01:26:37 2014 +0000
+++ b/CANBuffer.lib	Sat Nov 08 17:15:14 2014 +0000
@@ -1,1 +1,1 @@
-http://developer.mbed.org/teams/Penn-Electric-Racing/code/CANBuffer/#110f268af846
+http://developer.mbed.org/teams/Penn-Electric-Racing/code/CANBuffer/#4baa7251c6c0

--- a/CAN_Filter_LUT.h	Fri Nov 07 01:26:37 2014 +0000
+++ b/CAN_Filter_LUT.h	Sat Nov 08 17:15:14 2014 +0000
@@ -38,7 +38,6 @@
  
 // STANDARD ID RANGES - CAN CONTROLLER 2
 //( 0xLOWERBOUND & STDMASK | 1<<13) << 16 | ( 0xUPPERBOUND & STDMASK | 1<<13),  lower/upperbounds are inclusive
-  ( 0x400        & STDMASK | 1<<13) << 16 | ( 0x4FF        & STDMASK | 1<<13),  // Index1
 };
  
 const uint32_t AF_LUT_EEI[] = {

--- a/LPCDigitalIn.lib	Fri Nov 07 01:26:37 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://mbed.org/teams/Penn-Electric-Racing/code/LPCDigitalIn/#963ce3b85931

--- a/PollSwitch/PollSwitch.cpp	Fri Nov 07 01:26:37 2014 +0000
+++ b/PollSwitch/PollSwitch.cpp	Sat Nov 08 17:15:14 2014 +0000
@@ -28,6 +28,8 @@
     }
     
     // bit on: switch may be broken
-    switchState = (1 << i);
-    return (1 << i);
+    if (i < sizeof(sw)/sizeof(sw[0])) {
+        switchState = (1 << i);
+        return (1 << i);
+    } else return 0;
 }
\ No newline at end of file

--- a/SerialDiagnostics/SerialDiagnostics.cpp	Fri Nov 07 01:26:37 2014 +0000
+++ b/SerialDiagnostics/SerialDiagnostics.cpp	Sat Nov 08 17:15:14 2014 +0000
@@ -30,7 +30,7 @@
         int len = 0;
         len += sprintf(buff+len, "\033[0;0H");                      // Home the cursor
         padCenter(line, max_charsPerLine-2, "-", '-'); ADD_LINE     // Generate a line full of 80 -'s      
-        padCenter(line, max_charsPerLine-2, " Penn Electric Racing - REV0 System Management Module Serial Dashboard ", '-'); ADD_LINE
+        padCenter(line, max_charsPerLine-2, " Penn Electric Racing - REV0 System Management Serial Dashboard ", '-'); ADD_LINE
         padCenter(line, max_charsPerLine-2, "-", '-'); ADD_LINE     // Generate a line full of 80 -'s 
         
         

--- a/SysMngmt.cpp	Fri Nov 07 01:26:37 2014 +0000
+++ b/SysMngmt.cpp	Sat Nov 08 17:15:14 2014 +0000
@@ -18,4 +18,4 @@
     while(1) {
         wdt.kick();
     }
-}
+}
\ No newline at end of file

--- a/mbed-rtos.lib	Fri Nov 07 01:26:37 2014 +0000
+++ b/mbed-rtos.lib	Sat Nov 08 17:15:14 2014 +0000
@@ -1,1 +1,1 @@
-http://developer.mbed.org/users/mbed_official/code/mbed-rtos/#aaa1b2c7c64c
+http://developer.mbed.org/users/mbed_official/code/mbed-rtos/#77c8e4604045

--- a/mbed_error.h	Fri Nov 07 01:26:37 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2006-2013 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef MBED_ERROR_H
-#define MBED_ERROR_H
-
-/** To generate a fatal compile-time error, you can use the pre-processor #error directive.
- *
- * @code
- * #error "That shouldn't have happened!"
- * @endcode
- *
- * If the compiler evaluates this line, it will report the error and stop the compile.
- *
- * For example, you could use this to check some user-defined compile-time variables:
- *
- * @code
- * #define NUM_PORTS 7
- * #if (NUM_PORTS > 4)
- *     #error "NUM_PORTS must be less than 4"
- * #endif
- * @endcode
- *
- * Reporting Run-Time Errors:
- * To generate a fatal run-time error, you can use the mbed error() function.
- *
- * @code
- * error("That shouldn't have happened!");
- * @endcode
- *
- * If the mbed running the program executes this function, it will print the
- * message via the USB serial port, and then die with the blue lights of death!
- *
- * The message can use printf-style formatting, so you can report variables in the
- * message too. For example, you could use this to check a run-time condition:
- *
- * @code
- * if(x >= 5) {
- *     error("expected x to be less than 5, but got %d", x);
- * }
- * #endcode
- */
-
-// for some reason, the rtos library can't access mbed_error.h from the mbed library
-// This is a pretty recent bug as of Oct 5, 2014
-// If they fix the bug, remove this file
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void error(const char* format, ...);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
\ No newline at end of file