Diff: behave.cpp

Revision:

10:f65649c13b5b

Parent:

9:f783bce314cd

--- a/behave.cpp	Wed Apr 26 16:40:36 2017 +0000
+++ b/behave.cpp	Fri Apr 28 14:47:55 2017 +0000
@@ -48,9 +48,10 @@
 __attribute((section("AHBSRAM0"),aligned)) intOperation intOperationBlock[NUMINTOPERATIONS];
 __attribute((section("AHBSRAM0"),aligned)) displayAction displayActionBlock[NUMDISPLAYACTIONS];
 __attribute((section("AHBSRAM0"),aligned)) triggerFunctionAction triggerFunctionActionBlock[NUMTRIGGERACTIONS];
+
 #endif
 
-#ifdef FPGAHARDWARE
+#if defined(FPGAHARDWARE) || defined(K64HARDWARE)
 
 char buffer[256];
 event eventBlock[NUMEVENTS];
@@ -89,8 +90,8 @@
     vInfo.middle = 1;
     vInfo.minor = 2;
 
-    vInfo.updateDay = 30;
-    vInfo.updateMonth = 3;
+    vInfo.updateDay = 28;
+    vInfo.updateMonth = 4;
     vInfo.updateYear = 2017;
 
 
@@ -107,6 +108,13 @@
 
 #endif
 
+#ifdef K64HARDWARE
+    hardware = new MBEDSystem();
+    pc = new MBEDSerialPort();
+    pc->init();
+    textDisplay.setSerial(pc);
+#endif
+
 #ifdef FPGAHARDWARE
        pc = new FPGASerialPort();
        pc->init();
@@ -419,7 +427,7 @@
     thresh(0),
     lastChangeTime(0),
     hasTriggerFunction(false),
-    reportUpdates(false),
+    reportUpdates(true),
     hardwareStatePtr(NULL)
 {
 
@@ -531,7 +539,7 @@
     inPin(NULL) {
 
     portType = analog;
-    
+
 }
 
 void AnalogPort::init(sAnalogIn *IP) {
@@ -539,7 +547,7 @@
     portDir = in;
     inPin = IP;
     hardwareStatePtr = (int*)IP->hardwareStatePtr;
-    
+
 }
 
 void AnalogPort::init(sAnalogOut *OP){
@@ -2988,7 +2996,7 @@
 
 
                         } else {
-                            textDisplay << "Error: function number does not exist\r\n";                           
+                            textDisplay << "Error: function number does not exist\r\n";
                             lineError = true;
                         }
                     } else {
@@ -6159,4 +6167,3 @@
 
 
 }
-