diff --git a/radio/src/bmp.cpp b/radio/src/bmp.cpp index ec30b2f5b..9466f4699 100644 --- a/radio/src/bmp.cpp +++ b/radio/src/bmp.cpp @@ -459,19 +459,6 @@ const char * imgLoad(uint8_t * bmp, const char * filename, uint16_t width, uint1 } stbi_image_free(data); return 0; -// // ... process data if not NULL ... -// // ... x = width, y = height, n = # 8-bit components per pixel ... -// // ... replace '0' with '1'..'4' to force that many components per pixel -// // ... but 'n' will always be the number that it would have been if you said 0 -// stbi_image_free(data) -// -// Standard parameters: -// int *x -- outputs image width in pixels -// int *y -- outputs image height in pixels -// int *comp -- outputs # of image components in image file -// int req_comp -- if non-zero, # of image components requested in result - - } #endif // if defined(PCBHORUS) diff --git a/radio/src/gui/horus/lcd.h b/radio/src/gui/horus/lcd.h index c83f1deaa..5ddd35e94 100644 --- a/radio/src/gui/horus/lcd.h +++ b/radio/src/gui/horus/lcd.h @@ -311,7 +311,7 @@ void lcdSetContrast(); #define lcdOff(...) const char * bmpLoad(uint8_t * dest, const char * filename, uint16_t width, uint16_t height); -const char * imgLoad(uint8_t * bmp, const char * filename, uint16_t width, uint16_t height); +const char * imgLoad(uint8_t * dest, const char * filename, uint16_t width, uint16_t height); #if defined(BOOT) diff --git a/radio/src/gui/horus/menu_general_sdmanager.cpp b/radio/src/gui/horus/menu_general_sdmanager.cpp index 810940a93..1a1c9020d 100644 --- a/radio/src/gui/horus/menu_general_sdmanager.cpp +++ b/radio/src/gui/horus/menu_general_sdmanager.cpp @@ -357,17 +357,7 @@ bool menuGeneralSdManager(evt_t _event) } char * ext = getFileExtension(reusableBuffer.sdmanager.lines[index], SD_SCREEN_FILE_LENGTH+1); - if (ext && !strcasecmp(ext, BITMAPS_EXT)) { - if (lastBitmap != menuVerticalPosition) { - lastBitmap = menuVerticalPosition; - if (imgLoad(modelBitmap, reusableBuffer.sdmanager.lines[index], MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) { - ((uint32_t *)modelBitmap)[0] = 0; - } - } - lcdDrawBitmap(LCD_W/2, (LCD_H-MODEL_BITMAP_HEIGHT)/2, modelBitmap); - } - - if (ext && (!strcasecmp(ext, ".png") || !strcasecmp(ext, ".jpg"))) { + if (ext && (!strcasecmp(ext, BITMAPS_EXT) || !strcasecmp(ext, PNG_EXT) || !strcasecmp(ext, JPG_EXT))) { if (lastBitmap != menuVerticalPosition) { lastBitmap = menuVerticalPosition; if (imgLoad(modelBitmap, reusableBuffer.sdmanager.lines[index], MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) { diff --git a/radio/src/sdcard.h b/radio/src/sdcard.h index f5d517360..87dbd4429 100644 --- a/radio/src/sdcard.h +++ b/radio/src/sdcard.h @@ -46,6 +46,8 @@ #define LOGS_EXT ".csv" #define SOUNDS_EXT ".wav" #define BITMAPS_EXT ".bmp" +#define PNG_EXT ".png" +#define JPG_EXT ".jpg" #define SCRIPTS_EXT ".lua" #define TEXT_EXT ".txt" #define FIRMWARE_EXT ".bin"