Diff: main.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

Child:

16:d5cf2af81a6d

--- a/main.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/main.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -6,7 +6,9 @@
 
 #define SERIAL_BUFFER_SIZE 512
 
-mts::ATSerial debug(USBTX, USBRX);
+Serial debug(USBTX, USBRX);
+
+#ifndef UNIT_TEST
 
 int main()
 {
@@ -20,14 +22,28 @@
     mts::ATSerial* serial;
 
     if (dot->getFlowControl())
+#if defined(TARGET_MTS_MDOT_F411RE)
         serial = new mts::ATSerialFlowControl(XBEE_DOUT, XBEE_DIN, XBEE_RTS, XBEE_CTS, SERIAL_BUFFER_SIZE, SERIAL_BUFFER_SIZE);
+#else
+        serial = new mts::ATSerialFlowControl(UART1_TX, UART1_RX, UART1_RTS, UART1_CTS, SERIAL_BUFFER_SIZE, SERIAL_BUFFER_SIZE);
+#endif
     else
+#if defined(TARGET_MTS_MDOT_F411RE)
         serial = new mts::ATSerial(XBEE_DOUT, XBEE_DIN, SERIAL_BUFFER_SIZE, SERIAL_BUFFER_SIZE);
+#else
+        serial = new mts::ATSerial(UART1_TX, UART1_RX, SERIAL_BUFFER_SIZE, SERIAL_BUFFER_SIZE);
+#endif
 
     debug.baud(dot->getDebugBaud());
     serial->baud(dot->getBaud());
 
-    CommandTerminal term(*serial, dot);
+    CommandTerminal term(*serial);
+    CommandTerminal::_dot = dot;
+
+    term.init();
 
     term.start();
 }
+
+#endif // UNIT_TEST
+