From e1736be283e3da3df63e9d29c9382c076e59f80e Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Mon, 23 Nov 2015 13:42:33 -0600 Subject: clean up after config, get things building again, update default configuration to match spec --- main.cpp | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 6bc459f..c1c7f6d 100644 --- a/main.cpp +++ b/main.cpp @@ -52,13 +52,10 @@ ModeConfig* modeConfig; // Serial debug port Serial debug(USBTX, USBRX); -// Config mode serial port. -mts::MTSSerial serial(USBTX, USBRX, 512, 512); // Prototypes void mainMenu(); void join(); -void configuration(); void loraDemo(); void surveySingle(); void surveySweep(); @@ -74,24 +71,9 @@ int main() { dot = mDot::getInstance(); lora = new LoRaHandler(main_id); - // display startup screen for 3 seconds - LayoutStartup ls(lcd); - ls.display(); - osDelay(3000); - - // start of temporary stuff! - //dot->setFrequencyBand(mDot::FB_868); - if (dot->getFrequencyBand() == mDot::FB_915) - dot->setFrequencySubBand(mDot::FSB_7); - dot->setJoinMode(mDot::OTA); - dot->setNetworkName("mikes_lora_network"); - dot->setNetworkPassphrase("password_123"); - dot->setAck(1); - // end of temporary stuff! - modeJoin = new ModeJoin(lcd, buttons, dot, lora); modeSingle = new ModeSingle(lcd, buttons, dot, lora); - modeConfig = new ModeConfig(lcd, serial, dot, buttons); + modeConfig = new ModeConfig(lcd, buttons, dot, lora); // display startup screen for 3 seconds LayoutStartup ls(lcd); -- cgit v1.2.3