diff options
author | Mike Fiore <mfiore@multitech.com> | 2015-11-18 15:46:37 -0600 |
---|---|---|
committer | Mike Fiore <mfiore@multitech.com> | 2015-11-18 15:46:37 -0600 |
commit | d48510e9c3a57753ff4b33b00e0c61a2b39ff9a1 (patch) | |
tree | f04f39f7287a6bca826a6c22179b0542cd16f36f /main.cpp | |
parent | 94990163d2b694373eb5b2b8ccc4d002aad4ecd9 (diff) | |
parent | ce5c78c53be8d66da4a2cccdf18b622c0b77e773 (diff) | |
download | mtdot-box-evb-factory-firmware-d48510e9c3a57753ff4b33b00e0c61a2b39ff9a1.tar.gz mtdot-box-evb-factory-firmware-d48510e9c3a57753ff4b33b00e0c61a2b39ff9a1.tar.bz2 mtdot-box-evb-factory-firmware-d48510e9c3a57753ff4b33b00e0c61a2b39ff9a1.zip |
Merge branch 'atcommands'
configuration needs to be pulled out of main and implemented as a Mode object
Conflicts:
main.cpp
Diffstat (limited to 'main.cpp')
-rw-r--r-- | main.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
@@ -51,6 +51,9 @@ ModeJoin* modeJoin; // Serial debug port Serial debug(USBTX, USBRX); +mts::MTSSerial serial(USBTX, USBRX, 512, 512); + + // Prototypes void mainMenu(); @@ -121,6 +124,20 @@ void mainMenu() { items.push_back(menu_strings[single]); items.push_back(menu_strings[sweep]); + + + mDot* dot = mDot::getInstance(); + if(dot){ + logInfo("dot created"); + CommandTerminal term(serial, dot); + term.start(); + } + else { + logInfo("Radio Init Failed!"); + } + + + while (true) { LayoutScrollSelect menu(lcd, items, menu_strings[0], menu_strings[1]); menu.display(); |