Use X10 picture during X10 calibration (#5435)
* Use X10 picture during X10 calibration * Scale down radio picture a little * last x10 change requires a sd version bump * Differentiate X10 and X10S
This commit is contained in:
+1
-1
@@ -6,7 +6,7 @@ set(VERSION_REVISION "1")
|
|||||||
set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
|
set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
|
||||||
set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR})
|
set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR})
|
||||||
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX})
|
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX})
|
||||||
set(SDCARD_REVISION "0011")
|
set(SDCARD_REVISION "0012")
|
||||||
set(SDCARD_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION})
|
set(SDCARD_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION})
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 2.8)
|
cmake_minimum_required(VERSION 2.8)
|
||||||
|
|||||||
Executable
BIN
Binary file not shown.
|
After Width: | Height: | Size: 161 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 156 KiB |
Executable
BIN
Binary file not shown.
|
After Width: | Height: | Size: 161 KiB |
Executable
BIN
Binary file not shown.
|
After Width: | Height: | Size: 156 KiB |
@@ -135,7 +135,16 @@ class DarkblueTheme: public Theme
|
|||||||
calibTrackpBackground = BitmapBuffer::load(getThemePath("trackp_background.png"));
|
calibTrackpBackground = BitmapBuffer::load(getThemePath("trackp_background.png"));
|
||||||
|
|
||||||
delete calibHorus;
|
delete calibHorus;
|
||||||
|
#if defined(PCBX10)
|
||||||
|
if(ANALOGS_PWM_ENABLED()) {
|
||||||
|
calibHorus = BitmapBuffer::load(getThemePath("X10S.bmp"));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
calibHorus = BitmapBuffer::load(getThemePath("X10.bmp"));
|
||||||
|
}
|
||||||
|
#else
|
||||||
calibHorus = BitmapBuffer::load(getThemePath("horus.bmp"));
|
calibHorus = BitmapBuffer::load(getThemePath("horus.bmp"));
|
||||||
|
#endif
|
||||||
|
|
||||||
// Channels monitor screen
|
// Channels monitor screen
|
||||||
delete chanMonLockedBitmap;
|
delete chanMonLockedBitmap;
|
||||||
|
|||||||
@@ -174,7 +174,16 @@ class DefaultTheme: public Theme
|
|||||||
calibTrackpBackground = BitmapBuffer::load(getThemePath("trackp_background.png"));
|
calibTrackpBackground = BitmapBuffer::load(getThemePath("trackp_background.png"));
|
||||||
|
|
||||||
delete calibHorus;
|
delete calibHorus;
|
||||||
|
#if defined(PCBX10)
|
||||||
|
if(ANALOGS_PWM_ENABLED()) {
|
||||||
|
calibHorus = BitmapBuffer::load(getThemePath("X10S.bmp"));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
calibHorus = BitmapBuffer::load(getThemePath("X10.bmp"));
|
||||||
|
}
|
||||||
|
#else
|
||||||
calibHorus = BitmapBuffer::load(getThemePath("horus.bmp"));
|
calibHorus = BitmapBuffer::load(getThemePath("horus.bmp"));
|
||||||
|
#endif
|
||||||
|
|
||||||
// Model Selection screen
|
// Model Selection screen
|
||||||
delete modelselIconBitmap;
|
delete modelselIconBitmap;
|
||||||
|
|||||||
Reference in New Issue
Block a user