My final year project
Dependencies: BSP_DISCO_F746NG F746_GUI LCD_DISCO_F746NG SDFileSystem TS_DISCO_F746NG ResistiveTouchController Map CYS8218Controller MedianFilter
Diff: main.cpp
- Revision:
- 9:355a59fd962b
- Parent:
- 7:1a6e18b818a5
- Child:
- 12:650ae2f4c7df
--- a/main.cpp Sun Oct 02 00:01:57 2016 +0200 +++ b/main.cpp Sat Oct 01 22:49:03 2016 +0000 @@ -18,6 +18,8 @@ bool saved; +Serial pc(USBTX,USBRX); + int main() { Init(); @@ -39,6 +41,8 @@ { if( nextScreen != currentScreen ) { + pc.printf("%d\n\r",nextScreen); + if( activeScreen != NULL) delete activeScreen; @@ -68,6 +72,7 @@ void Init() { + pc.baud(57600); saved = false; nextScreen = Screen::MAIN_MENU_SCREEN; guiThread.start(GUIThread); @@ -77,8 +82,10 @@ { if( saved) { - // TODO Save zero position on servos + // TODO Save zero position on servos and fix screen not changing + nextScreen = Screen::MAIN_SETTINGS_SCREEN; saved = false; - nextScreen = MAIN_SETTINGS_SCREEN; } + + Thread::wait(20); }