From a5959b55a2752d844d0d1ad1087b4d5d4d936e9e Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 22 Aug 2019 23:39:42 +0200 Subject: [PATCH] Cosmetics --- radio/src/gui/480x272/model_inputs.cpp | 3 ++- radio/src/sdcard.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/480x272/model_inputs.cpp b/radio/src/gui/480x272/model_inputs.cpp index 87a5fda30..00ea22caa 100644 --- a/radio/src/gui/480x272/model_inputs.cpp +++ b/radio/src/gui/480x272/model_inputs.cpp @@ -240,7 +240,8 @@ bool menuModelExpoOne(event_t event) case EXPO_FIELD_SOURCE: lcdDrawText(MENUS_MARGIN_LEFT, y, STR_SOURCE); drawSource(EXPO_ONE_2ND_COLUMN, y, ed->srcRaw, menuHorizontalPosition==0 ? attr : 0); - if (attr && menuHorizontalPosition==0) ed->srcRaw = checkIncDec(event, ed->srcRaw, INPUTSRC_FIRST, INPUTSRC_LAST, EE_MODEL|INCDEC_SOURCE|NO_INCDEC_MARKS, isInputSourceAvailable); + if (attr && menuHorizontalPosition==0) + ed->srcRaw = checkIncDec(event, ed->srcRaw, INPUTSRC_FIRST, INPUTSRC_LAST, EE_MODEL|INCDEC_SOURCE|NO_INCDEC_MARKS, isInputSourceAvailable); if (ed->srcRaw >= MIXSRC_FIRST_TELEM) { drawSensorCustomValue(EXPO_ONE_2ND_COLUMN+75, y, (ed->srcRaw - MIXSRC_FIRST_TELEM)/3, convertTelemValue(ed->srcRaw - MIXSRC_FIRST_TELEM + 1, ed->scale), LEFT|(menuHorizontalPosition==1?attr:0)); if (attr && menuHorizontalPosition == 1) ed->scale = checkIncDec(event, ed->scale, 0, maxTelemValue(ed->srcRaw - MIXSRC_FIRST_TELEM + 1), EE_MODEL); diff --git a/radio/src/sdcard.h b/radio/src/sdcard.h index 853a4b822..d56c9f7bd 100644 --- a/radio/src/sdcard.h +++ b/radio/src/sdcard.h @@ -120,7 +120,7 @@ inline const char * SDCARD_ERROR(FRESULT result) #endif // NOTE: 'size' must = 0 or be a valid character position within 'filename' array -- it is NOT validated -const char * getFileExtension(const char * filename, uint8_t size=0, uint8_t extMaxLen=0, uint8_t *fnlen=NULL, uint8_t *extlen=NULL); +const char * getFileExtension(const char * filename, uint8_t size=0, uint8_t extMaxLen=0, uint8_t * fnlen=nullptr, uint8_t * extlen=nullptr); const char * getBasename(const char * path); #if defined(PCBX12S) @@ -147,7 +147,7 @@ const char * getBasename(const char * path); bool isFileAvailable(const char * filename, bool exclDir = false); int findNextFileIndex(char * filename, uint8_t size, const char * directory); -bool isExtensionMatching(const char * extension, const char * pattern, char * match = NULL); +bool isExtensionMatching(const char * extension, const char * pattern, char * match = nullptr); const char * sdCopyFile(const char * src, const char * dest); const char * sdCopyFile(const char * srcFilename, const char * srcDir, const char * destFilename, const char * destDir);