From 2f9996bac0dd1c0bbacadc0d420a1b3244cd9a76 Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Mon, 16 Nov 2015 08:35:02 -0600 Subject: remove commented out code in main.cpp --- main.cpp | 42 ------------------------------------------ 1 file changed, 42 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 17adb0e..cd8a186 100644 --- a/main.cpp +++ b/main.cpp @@ -19,9 +19,6 @@ // misc heders #include -// only here for button testing code in main() -#include "font_6x8.h" - // LCD and backlight controllers SPI lcd_spi(SPI1_MOSI, SPI1_MISO, SPI1_SCK); I2C backlight_i2c(I2C_SDA, I2C_SCL); @@ -58,49 +55,10 @@ int main() { logInfo("displaying main menu"); mainMenu(); - /* test buttons - while (true) { - char buf[16]; - size_t size; - - osEvent e = Thread::signal_wait(buttonSignal); - if (e.status == osEventSignal) { - ButtonEvent ev = buttons->getButtonEvent(); - switch (ev) { - case sw1_press: - size = snprintf(buf, sizeof(buf), "SW1 press"); - break; - case sw1_hold: - size = snprintf(buf, sizeof(buf), "SW1 hold"); - break; - case sw2_press: - size = snprintf(buf, sizeof(buf), "SW2 press"); - break; - } - - lcd->clearBuffer(); - lcd->startUpdate(); - lcd->writeText(0, 0, font_6x8, buf, size); - lcd->endUpdate(); - } - } - */ - return 0; } void mainMenu() { - /* - std::string menu_strings[] = { - "MultiTech EVB", - "Select Mode", - "LoRa Demo", - "Configuration", - "Survey Single", - "Survey Sweep" - }; - */ - std::string menu_strings[] = { "MultiTech EVB", "Select Mode", -- cgit v1.2.3