Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 00:35:18 +03:00
Code Issues Wiki Activity

Compilation fixes

Browse source
This commit is contained in:
Bertrand Songis 2016-02-21 19:35:30 +01:00
parent 358badfed9
commit 103fea7b98
5 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
radio/src/gui/horus/lcd.cpp
View file

@ -509,8 +509,7 @@ char * getSourceString(char * dest, mixsrc_t idx)
if (qr.quot < MAX_SCRIPTS && qr.rem < scriptInputsOutputs[qr.quot].outputsCount) { if (qr.quot < MAX_SCRIPTS && qr.rem < scriptInputsOutputs[qr.quot].outputsCount) {
*dest++ = '\322'; *dest++ = '\322';
// *dest++ = '1'+qr.quot; // *dest++ = '1'+qr.quot;
strncpy(dest, scriptInputsOutputs[qr.quot].outputs[qr.rem].name, sizeof(scriptInputsOutputs[qr.quot].outputs[qr.rem].name)); strcpy(dest, scriptInputsOutputs[qr.quot].outputs[qr.rem].name);
dest[sizeof(scriptInputsOutputs[qr.quot].outputs[qr.rem].name)] = '\0';
} }
#endif #endif
} }

2
radio/src/gui/taranis/lcd.h
View file

@ -220,7 +220,7 @@ void lcdSetContrast();
void lcdRefresh(); void lcdRefresh();
#endif #endif
const char * bmpLoad(uint8_t * dest, const char * filename, uint16_t width, uint16_t height); uint8_t * bmpLoad(uint8_t * dest, const char * filename, uint16_t width, uint16_t height);
const char * writeScreenshot(); const char * writeScreenshot();
#if defined(BOOT) #if defined(BOOT)

2
radio/src/gui/taranis/menu_general_sdmanager.cpp
View file

@ -458,7 +458,7 @@ void menuGeneralSdManager(evt_t _event)
char * ext = getFileExtension(reusableBuffer.sdmanager.lines[index], SD_SCREEN_FILE_LENGTH+1); char * ext = getFileExtension(reusableBuffer.sdmanager.lines[index], SD_SCREEN_FILE_LENGTH+1);
if (ext && !strcasecmp(ext, BITMAPS_EXT)) { if (ext && !strcasecmp(ext, BITMAPS_EXT)) {
if (lastPos != menuVerticalPosition) { if (lastPos != menuVerticalPosition) {
if (bmpLoad(modelBitmap, reusableBuffer.sdmanager.lines[index], MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) { if (!bmpLoad(modelBitmap, reusableBuffer.sdmanager.lines[index], MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) {
memcpy(modelBitmap, logo_taranis, MODEL_BITMAP_SIZE); memcpy(modelBitmap, logo_taranis, MODEL_BITMAP_SIZE);
} }
} }

3
radio/src/opentx.cpp
View file

@ -38,14 +38,13 @@ bool loadModelBitmap(char * name, uint8_t * bitmap)
char lfn[] = BITMAPS_PATH "/xxxxxxxxxx.bmp"; char lfn[] = BITMAPS_PATH "/xxxxxxxxxx.bmp";
strncpy(lfn+sizeof(BITMAPS_PATH), name, len); strncpy(lfn+sizeof(BITMAPS_PATH), name, len);
strcpy(lfn+sizeof(BITMAPS_PATH)+len, BITMAPS_EXT); strcpy(lfn+sizeof(BITMAPS_PATH)+len, BITMAPS_EXT);
if (bmpLoad(bitmap, lfn, MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT) == 0) { if (bmpLoad(bitmap, lfn, MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) {
return true; return true;
} }
} }
// In all error cases, we set the default logo // In all error cases, we set the default logo
memcpy(bitmap, logo_taranis, MODEL_BITMAP_SIZE); memcpy(bitmap, logo_taranis, MODEL_BITMAP_SIZE);
return false; return false;
} }
#endif #endif

14
radio/src/tests/lcd.cpp
View file

@ -365,31 +365,31 @@ TEST(Lcd, lcdDrawBitmapLoadAndDisplay)
// Test proper BMP files, they should display correctly // Test proper BMP files, they should display correctly
{ {
TestBuffer<1000> bitmap(BITMAP_BUFFER_SIZE(7, 32)); TestBuffer<1000> bitmap(BITMAP_BUFFER_SIZE(7, 32));
EXPECT_EQ(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/4b_7x32.bmp", 7, 32), (char *)0); EXPECT_TRUE(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/4b_7x32.bmp", 7, 32) != NULL);
bitmap.leakCheck(); bitmap.leakCheck();
lcdDrawBitmap(10, 2, bitmap.buffer()); lcdDrawBitmap(10, 2, bitmap.buffer());
} }
{ {
TestBuffer<1000> bitmap(BITMAP_BUFFER_SIZE(6, 32)); TestBuffer<1000> bitmap(BITMAP_BUFFER_SIZE(6, 32));
EXPECT_EQ(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/1b_6x32.bmp", 6, 32), (char *)0); EXPECT_TRUE(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/1b_6x32.bmp", 6, 32) != NULL);
bitmap.leakCheck(); bitmap.leakCheck();
lcdDrawBitmap(20, 2, bitmap.buffer()); lcdDrawBitmap(20, 2, bitmap.buffer());
} }
{ {
TestBuffer<1000> bitmap(BITMAP_BUFFER_SIZE(31, 31)); TestBuffer<1000> bitmap(BITMAP_BUFFER_SIZE(31, 31));
EXPECT_EQ(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/4b_31x31.bmp", 31, 31), (char *)0); EXPECT_TRUE(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/4b_31x31.bmp", 31, 31) != NULL);
bitmap.leakCheck(); bitmap.leakCheck();
lcdDrawBitmap(30, 2, bitmap.buffer()); lcdDrawBitmap(30, 2, bitmap.buffer());
} }
{ {
TestBuffer<1000> bitmap(BITMAP_BUFFER_SIZE(39, 32)); TestBuffer<1000> bitmap(BITMAP_BUFFER_SIZE(39, 32));
EXPECT_EQ(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/1b_39x32.bmp", 39, 32), (char *)0); EXPECT_TRUE(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/1b_39x32.bmp", 39, 32) != NULL);
bitmap.leakCheck(); bitmap.leakCheck();
lcdDrawBitmap(70, 2, bitmap.buffer()); lcdDrawBitmap(70, 2, bitmap.buffer());
} }
{ {
TestBuffer<1000> bitmap(BITMAP_BUFFER_SIZE(20, 20)); TestBuffer<1000> bitmap(BITMAP_BUFFER_SIZE(20, 20));
EXPECT_EQ(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/4b_20x20.bmp", 20, 20), (char *)0); EXPECT_TRUE(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/4b_20x20.bmp", 20, 20) != NULL);
bitmap.leakCheck(); bitmap.leakCheck();
lcdDrawBitmap(120, 2, bitmap.buffer()); lcdDrawBitmap(120, 2, bitmap.buffer());
} }
@ -398,12 +398,12 @@ TEST(Lcd, lcdDrawBitmapLoadAndDisplay)
// Test various bad BMP files, they should not display // Test various bad BMP files, they should not display
{ {
TestBuffer<1000> bitmap(BITMAP_BUFFER_SIZE(LCD_W+1, 32)); TestBuffer<1000> bitmap(BITMAP_BUFFER_SIZE(LCD_W+1, 32));
EXPECT_EQ(bmpLoad(bitmap.buffer(), "", LCD_W+1, 32), STR_INCOMPATIBLE) << "to wide"; EXPECT_TRUE(bmpLoad(bitmap.buffer(), "", LCD_W+1, 32) == NULL) << "to wide";
bitmap.leakCheck(); bitmap.leakCheck();
} }
{ {
TestBuffer<1000> bitmap(BITMAP_BUFFER_SIZE(10, 10)); TestBuffer<1000> bitmap(BITMAP_BUFFER_SIZE(10, 10));
EXPECT_EQ(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/1b_39x32.bmp", 10, 10), STR_INCOMPATIBLE) << "to small buffer"; EXPECT_TRUE(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/1b_39x32.bmp", 10, 10) == NULL) << "to small buffer";
bitmap.leakCheck(); bitmap.leakCheck();
} }
} }