SWO+USB Serial+TouchScreen Demo
Dependencies: BSP_DISCO_F429ZI LCD_DISCO_F429ZI SWO TS_DISCO_F429ZI USBDEVICE mbed storage_on_flash
Fork of DISCO-F429ZI_LCDTS_demo by
Diff: main.cpp
- Revision:
- 10:1e21661f4e04
- Parent:
- 9:62df0b9df08d
--- a/main.cpp Tue Mar 20 16:41:14 2018 +0000 +++ b/main.cpp Tue Mar 20 16:51:40 2018 +0000 @@ -239,7 +239,7 @@ BSP_LCD_SetLayerVisible_NoReload(layer, ENABLE); LCD_Reload_Safe(); lcd.Clear(LCD_COLOR_BLUE); - uint8_t* pBmp = (uint8_t*)big_fastlite_logo_68_302; + uint8_t* pBmp = const_cast<uint8_t*>(big_fastlite_logo_68_302); lcd.DrawBitmap((lcd.GetYSize()-302)/2, (lcd.GetXSize()-68)/2, pBmp); } @@ -253,7 +253,7 @@ BSP_LCD_SetFont(&UbuntuFont23); lcd.Clear(LCD_COLOR_BLUE); - uint8_t* pBmp = (uint8_t*)big_fastlite_logo_68_302; + uint8_t* pBmp = (uint8_t*)(big_fastlite_logo_68_302); lcd.DrawBitmap((lcd.GetYSize()-302)/2, 0, pBmp); sprintf((char*)text, "TEC interface"); @@ -469,16 +469,16 @@ //FASTLITE LOGO + LINE DrawRectCentered(lcd.GetYSize()/2, lcd.GetXSize()-6, lcd.GetYSize(), 2); - uint8_t* pBmp = (uint8_t*)fastlite_logo_landscape_90_20; + uint8_t* pBmp = (uint8_t*)(fastlite_logo_landscape_90_20); lcd.DrawBitmap(lcd.GetYSize()-90, lcd.GetXSize()-20, pBmp); //FRINGEEZZ LOGO #ifdef DEBUG - pBmp = (uint8_t*)fringeezz_logo_landscape_124_49; + pBmp = (uint8_t*)(fringeezz_logo_landscape_124_49); lcd.DrawBitmap(0, lcd.GetXSize()-20-49-40, pBmp); #else - pBmp = (uint8_t*)big_fringezz_logo_91_233; + pBmp = (uint8_t*)(big_fringezz_logo_91_233); lcd.DrawBitmap(5, 5, pBmp); #endif @@ -501,7 +501,7 @@ lcd.SetTextColor(LCD_COLOR_WHITE); lcd.Clear(LCD_COLOR_BLUE); - uint8_t* pBmp = (uint8_t*)fringeezz_logo_landscape_124_49; + uint8_t* pBmp = (uint8_t*)(fringeezz_logo_landscape_124_49); lcd.DrawBitmap(1, 1, pBmp); lcd.SetBackColor(LCD_COLOR_BLUE); @@ -568,7 +568,7 @@ //FASTLITE LOGO + LINE DrawRectCentered(lcd.GetYSize()/2, lcd.GetXSize()-6, lcd.GetYSize(), 2); - pBmp = (uint8_t*)fastlite_logo_landscape_90_20; + pBmp = (uint8_t*)(fastlite_logo_landscape_90_20); lcd.DrawBitmap(lcd.GetYSize()-90, lcd.GetXSize()-20, pBmp); } @@ -832,7 +832,7 @@ accel = 0; } - if (start_swipe && ((selected_screen == 1) && (swipe_dir == +1)) || ((selected_screen == -2) && (swipe_dir == -1))) + if (start_swipe && (((selected_screen == 1) && (swipe_dir == +1)) || ((selected_screen == -2) && (swipe_dir == -1)))) { start_swipe = false; }