Doug Anson / Mbed 2 deprecated df-2014-workshop-rfid-case-generator-k64f

Dreamforce 2014 Workshop RFID Case Generator - FRDM-K64F

Dependencies:   EndpointMain-rfid EthernetInterface StatusReporter BufferedSerial mbed-rtos mbed Logger C12832

Fork of df-2014-workshop-rfid-case-generator-ublox by Doug Anson

Files at this revision

API Documentation at this revision

Revision 22:1b9e29933ab3, committed 2014-08-29

Comitter:
ansond
Date:
Fri Aug 29 19:24:19 2014 +0000
Parent:
21:579d99612e16
Child:
23:3632b2578c74
Commit message:
updates for K64F support

Changed in this revision

Definitions.h Show annotated file Show diff for this revision Revisions of this file
ErrorHandler.lib Show annotated file Show diff for this revision Revisions of this file
StatusReporter.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/Definitions.h	Fri Aug 29 04:48:42 2014 +0000
+++ b/Definitions.h	Fri Aug 29 19:24:19 2014 +0000
@@ -54,6 +54,8 @@
  
  // What platform we are compiling on
  #define _NXP_PLATFORM             true
+ #define _UBLOX_PLATFORM           false
+ #define _K64F_PLATFORM            false
  
  // Wait Time for iterations (ms)
  #define WAIT_TIME_MS              500
@@ -71,4 +73,18 @@
  #define SECOND_WIDGET             1
  #define THIRD_WIDGET              2
  
+ // PINS for RFID Reader
+ #if _NXP_PLATFORM
+    #define RFID_TX_PIN            p13
+    #define RFID_RX_PIN            p14
+ #endif
+ #if _UBLOX_PLATFORM
+    #define RFID_TX_PIN            p13
+    #define RFID_RX_PIN            p14
+ #endif
+ #if _K64F_PLATFORM
+    #define RFID_TX_PIN            PTC17
+    #define RFID_RX_PIN            PTC16
+ #endif
+ 
  #endif // _DEFINITIONS_H_
\ No newline at end of file

--- a/ErrorHandler.lib	Fri Aug 29 04:48:42 2014 +0000
+++ b/ErrorHandler.lib	Fri Aug 29 19:24:19 2014 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/ansond/code/ErrorHandler/#8d42444464d3
+http://mbed.org/users/ansond/code/ErrorHandler/#e771ffdf5c1b

--- a/StatusReporter.lib	Fri Aug 29 04:48:42 2014 +0000
+++ b/StatusReporter.lib	Fri Aug 29 19:24:19 2014 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/ansond/code/StatusReporter/#763c7a27e77a
+http://mbed.org/users/ansond/code/StatusReporter/#58e8346fc05c

--- a/main.cpp	Fri Aug 29 04:48:42 2014 +0000
+++ b/main.cpp	Fri Aug 29 19:24:19 2014 +0000
@@ -18,10 +18,12 @@
  
  // StatusReporter
  #include "StatusReporter.h"
- 
- // our LCD Panel
- #include "C12832_lcd.h"
- C12832_LCD lcd;
+
+ // appboard LCD Panel
+ #if _NXP_PLATFORM || _UBLOX_PLATFORM
+    #include "C12832_lcd.h"
+    C12832_LCD lcd;  
+ #endif
  
  // our Serial port
  #include "Serial.h"
@@ -40,8 +42,13 @@
 
  // Main Entry...
  int main() {
-    // create our object instances
+    // create our object instances 
+#if _NXP_PLATFORM || _UBLOX_PLATFORM
     ErrorHandler logger(&pc,&lcd);
+#endif
+#if _K64F_PLATFORM
+    ErrorHandler logger(&pc,NULL);
+#endif
     
     // announce
     logger.log("ARM/DreamForce 2014 mbed Status Reporter v%s",APP_VERSION);