Removed radio calibration bitmap
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 100 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 98 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 161 KiB |
@@ -195,7 +195,6 @@ const uint8_t LBM_SWIPE_RIGHT[] = {
|
||||
BitmapBuffer * calibStick = nullptr;
|
||||
BitmapBuffer * calibStickBackground = nullptr;
|
||||
BitmapBuffer * calibTrackpBackground = nullptr;
|
||||
BitmapBuffer * calibRadioPict = nullptr;
|
||||
BitmapBuffer * modelselIconBitmap = nullptr;
|
||||
BitmapBuffer * modelselSdFreeBitmap = nullptr;
|
||||
BitmapBuffer * modelselModelQtyBitmap = nullptr;
|
||||
|
||||
@@ -86,7 +86,6 @@ extern BitmapBuffer * modelselWizardBackground;
|
||||
extern BitmapBuffer * calibStick;
|
||||
extern BitmapBuffer * calibStickBackground;
|
||||
extern BitmapBuffer * calibTrackpBackground;
|
||||
extern BitmapBuffer * calibRadioPict;
|
||||
|
||||
// Channels monitor bitmaps
|
||||
extern BitmapBuffer * chanMonLockedBitmap;
|
||||
|
||||
@@ -69,16 +69,9 @@ void RadioCalibrationPage::buildBody(FormWindow * window)
|
||||
{
|
||||
menuCalibrationState = CALIB_START;
|
||||
|
||||
if (calibRadioPict) {
|
||||
// Background radio image
|
||||
#if LCD_W > LCD_H
|
||||
new StaticBitmap(window, {LCD_W / 2 - calibRadioPict->width() / 2, 5, calibRadioPict->height(), calibRadioPict->width()}, calibRadioPict);
|
||||
#else
|
||||
new StaticBitmap(window, {LCD_W / 2 - calibRadioPict->width() / 2, LCD_H / 2 - calibRadioPict->height() / 2, calibRadioPict->height(), calibRadioPict->width()}, calibRadioPict);
|
||||
#endif
|
||||
}
|
||||
|
||||
// The two sticks
|
||||
|
||||
//TODO: dynamic placing
|
||||
new StickCalibrationWindow(window, {40, 20, 90, 90}, STICK1, STICK2);
|
||||
new StickCalibrationWindow(window, {LCD_W - 130, 20, 90, 90}, STICK4, STICK3);
|
||||
|
||||
|
||||
@@ -195,17 +195,6 @@ class Theme480: public OpenTxTheme
|
||||
delete calibTrackpBackground;
|
||||
calibTrackpBackground = BitmapBuffer::loadBitmap(getFilePath("trackp_background.png"));
|
||||
|
||||
delete calibRadioPict;
|
||||
#if defined(PCBX10)
|
||||
if(STICKS_PWM_ENABLED()) {
|
||||
calibRadioPict = BitmapBuffer::loadBitmap(getFilePath("X10S.bmp"));
|
||||
}
|
||||
else {
|
||||
calibRadioPict = BitmapBuffer::loadBitmap(getFilePath("X10.bmp"));
|
||||
}
|
||||
#else
|
||||
calibRadioPict = BitmapBuffer::loadBitmap(getFilePath("horus.bmp"));
|
||||
#endif
|
||||
|
||||
// Model Selection screen
|
||||
delete modelselIconBitmap;
|
||||
|
||||
@@ -215,9 +215,6 @@ class FlyskyTheme: public OpenTxTheme
|
||||
delete calibTrackpBackground;
|
||||
calibTrackpBackground = BitmapBuffer::loadBitmap(getFilePath("trackp_background.png"));
|
||||
|
||||
delete calibRadioPict;
|
||||
calibRadioPict = BitmapBuffer::loadBitmap(getFilePath("NV14.bmp"));
|
||||
|
||||
// Model Selection screen
|
||||
delete modelselIconBitmap;
|
||||
modelselIconBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_iconback.png", TITLE_BGCOLOR, DEFAULT_BGCOLOR);
|
||||
|
||||
Reference in New Issue
Block a user