Diff: main.cpp

Revision:

1:6b969a803e1b

Parent:

0:769c5a7b3939

diff -r 769c5a7b3939 -r 6b969a803e1b main.cpp
--- a/main.cpp	Mon May 07 21:28:03 2018 +0000
+++ b/main.cpp	Tue May 08 13:45:29 2018 +0000
@@ -4,16 +4,18 @@
 #include "Default.h"
 #include "DefaultRequired.h"
 
-#if (MBED_MAJOR_VERSION == 2)
+/*#if (MBED_MAJOR_VERSION == 2)
 #include    "SDFileSystem.h"
 #elif (MBED_MAJOR_VERSION == 5)
 #include    "SDBlockDevice.h"
 #include    "FATFileSystem.h"
-#endif
+#endif*/
 
 #include    <stdlib.h>
 #include "main.h"
 
+#include "files.h"
+
 MAX32630FTHR pegasus(MAX32630FTHR::VIO_3V3);
 Serial _serialport(USBTX,USBRX);
 DigitalOut LED(P3_1);
@@ -24,13 +26,13 @@
 DigitalOut bLED(LED3);
 
 
-#if (MBED_MAJOR_VERSION == 2)
+/*#if (MBED_MAJOR_VERSION == 2)
 SDFileSystem    sd(D11, D12, D13, D10, "fs");  // do,di,clk,cs
 #elif (MBED_MAJOR_VERSION == 5)
 //SDBlockDevice   sd(D11, D12, D13, D10, 8000000);
 SDBlockDevice   sd(SPI0_MOSI, SPI0_MISO, SPI0_SCK, SPI0_SS, 8000000);    // For MAX32630FTHR
 FATFileSystem   fs("fs");
-#endif
+#endif*/
 
 void Rx_interrupt(void);
 
@@ -93,31 +95,31 @@
             break;
 
         case 'Q':
-            _serialport.printf("Q");
+            //_serialport.printf("Q");
             defaultIface_raise_mode(&default_SM);
             is_smactive = true;
             break;
 
         case 'W':
-            _serialport.printf("W ");
+            //_serialport.printf("W ");
             defaultIface_raise_up(&default_SM);
             is_smactive = true;
             break;
 
         case 'E':
-            _serialport.printf("E ");
+            //_serialport.printf("E ");
             defaultIface_raise_down(&default_SM);
             is_smactive = true;
             break;
 
         case 'R':
-            _serialport.printf("R ");
+            //_serialport.printf("R ");
             defaultIface_raise_back(&default_SM);
             is_smactive = true;
             break;
 
         case 'T':
-            _serialport.printf("T ");
+            //_serialport.printf("T ");
             defaultIface_raise_home(&default_SM);
             is_smactive = true;
             break;
@@ -130,39 +132,39 @@
     switch(val)
     {
         case 1:
-        _serialport.printf("Menu Selected\n");
+        _serialport.printf("Menu ");
         break;
         
         case 2:
-        _serialport.printf("function \n");
+        _serialport.printf("function ");
         break;
         
         case 3:
-        _serialport.printf("execute\n");
+        _serialport.printf("execute ");
         break;
         
         case 4:
-        _serialport.printf("ready\n");
+        _serialport.printf("ready ");
         break;
         
         case 5:
-        _serialport.printf("active\n");
+        _serialport.printf("active ");
         break;
         
         case 6:
-        _serialport.printf("alarm\n");
+        _serialport.printf("alarm ");
         break;
         
          case 7:
-        _serialport.printf("move down act\n");
+        _serialport.printf("move down act ");
         break;
         
          case 8:
-        _serialport.printf("move up act\n");
+        _serialport.printf("move up act ");
         break;
         
         case 9:
-        _serialport.printf("return\n");
+        _serialport.printf("return ");
         break;
         
         default: