From 99a0a0b190859b910a988b74e3e9749a307920b8 Mon Sep 17 00:00:00 2001 From: sorgelig Date: Sat, 10 Nov 2018 00:29:16 +0800 Subject: [PATCH] Suport for altera scaler boot coefficients. --- file_io.h | 2 ++ menu.cpp | 4 ++-- user_io.cpp | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/file_io.h b/file_io.h index 45fb686..886062b 100644 --- a/file_io.h +++ b/file_io.h @@ -79,4 +79,6 @@ const char *getFullPath(const char *name); uint32_t getFileType(const char *name); +#define COEFF_DIR "filters" + #endif diff --git a/menu.cpp b/menu.cpp index 4545875..a7dc115 100644 --- a/menu.cpp +++ b/menu.cpp @@ -1334,7 +1334,7 @@ void HandleUI(void) if (strlen(user_io_get_scaler_coeff())) strncat(s, user_io_get_scaler_coeff(), 22); else strcat(s, ""); - OsdWrite(n++, s, menusub == 5, user_io_get_scaler_flt() != 4 || !S_ISDIR(getFileType("coeff"))); + OsdWrite(n++, s, menusub == 5, user_io_get_scaler_flt() != 4 || !S_ISDIR(getFileType(COEFF_DIR))); OsdWrite(n++); } @@ -1423,7 +1423,7 @@ void HandleUI(void) case 5: if (user_io_get_scaler_flt() == 4) { - sprintf(SelectedPath, "coeff/%s", user_io_get_scaler_coeff()); + sprintf(SelectedPath, COEFF_DIR"/%s", user_io_get_scaler_coeff()); SelectFile(0, SCANO_COEFF, MENU_COEFF_FILE_SELECTED, MENU_8BIT_SYSTEM1); } break; diff --git a/user_io.cpp b/user_io.cpp index 0c2db2e..e36b347 100644 --- a/user_io.cpp +++ b/user_io.cpp @@ -2590,16 +2590,16 @@ static void setScaler() if (!spi_uio_cmd_cont(UIO_SET_FLTNUM)) { DisableIO(); - return; + sprintf(filename, "%s/coeff.txt", HomeDir); } else { new_scaler = 1; spi8(scaler_flt_cfg[0]); DisableIO(); + sprintf(filename, COEFF_DIR"/%s", scaler_flt_cfg + 1); } - sprintf(filename, "coeff/%s", scaler_flt_cfg+1); if (FileOpen(&f, filename)) { printf("Read scaler coefficients\n");