From 328213fda5a1777d293d67dcdaba3976c8944e3b Mon Sep 17 00:00:00 2001 From: payton Date: Mon, 25 Sep 2023 17:15:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/cardv/SrcCode/PrjCfg_HUNTING_S550.h | 8 ++++---- code/application/source/cardv/SrcCode/UIApp/ExifVendor.c | 8 ++++---- .../source/cardv/SrcCode/PrjCfg_HUNTING_S550.h | 8 ++++---- .../application/source/cardv/SrcCode/UIApp/ExifVendor.c | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h index 58ade2b5d..8b2d730cc 100755 --- a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h +++ b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h @@ -461,11 +461,11 @@ // EXIF Config #define USE_EXIF DISABLE // End string must be '\0', total char must be 31 -#define EXIF_MAKER_NAME "SY" +#define EXIF_MAKER_NAME "TC" // End string must be '\0', total char must be 31 -#define EXIF_MODEL_NAME "S550-R" +#define EXIF_MODEL_NAME "X-PRO 3.0" // End string must be '\0', total char must be 31 -#define EXIF_IMAGE_DESCROPTOIN "S550 CAMERA" +#define EXIF_IMAGE_DESCROPTOIN "CAMERA" #define EXIF_SOFTWARE_VERSION FW_VERSION_NUM // <= 20 char (TagSoftVerLen) @@ -924,7 +924,7 @@ #define SF_BASE_VERSION "7MD4RCwD901" #define HW_S530 DISABLE #define DCF_DIR_NAME "MEDIA" /* 100MEDIA */ -#define DCF_FILE_NAME "SYFW" /* SYFW0001.JPG */ +#define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */ #define PHOTO_THUMB_PATH "A:\\THUMB\\" #define MOVIE_THUMB_PATH "A:\\THUMB\\" #define SF_SD_ROOT "/mnt/sd/" diff --git a/code/application/source/cardv/SrcCode/UIApp/ExifVendor.c b/code/application/source/cardv/SrcCode/UIApp/ExifVendor.c index 7c7310ed5..c795bfea5 100755 --- a/code/application/source/cardv/SrcCode/UIApp/ExifVendor.c +++ b/code/application/source/cardv/SrcCode/UIApp/ExifVendor.c @@ -19,8 +19,8 @@ #include "vendor_isp.h" #define MAKERNOTEID 0x36353000 -#define EXIF_MAKER "MAKER NAME " -#define EXIF_SOFTWARE "Verx.xx" +#define EXIF_MAKER "TC " +#define EXIF_SOFTWARE "R6.0" #define __MODULE__ ExifVendor #define __DBGLVL__ 2 // 0=FATAL, 1=ERR, 2=WRN, 3=UNIT, 4=FUNC, 5=IND, 6=MSG, 7=VALUE, 8=USER @@ -275,8 +275,8 @@ void ExifVendor_WriteExifIFD(EXIF_HANDLE_ID HandleID) #else uiISOSpeed = 100; expo = 1000000; - uiAperture[0] = 18; - MaxAperture[0] = 18; + uiAperture[0] = 20; + MaxAperture[0] = 20; #endif status.id=RecID; if ((hd_ret = vendor_isp_init()) != HD_OK) { diff --git a/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h b/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h index 98627ad56..a917b828b 100755 --- a/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h +++ b/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h @@ -478,11 +478,11 @@ // EXIF Config #define USE_EXIF DISABLE // End string must be '\0', total char must be 31 -#define EXIF_MAKER_NAME "SY" +#define EXIF_MAKER_NAME "TC" // End string must be '\0', total char must be 31 -#define EXIF_MODEL_NAME "S550-R" +#define EXIF_MODEL_NAME "X-PRO 3.0" // End string must be '\0', total char must be 31 -#define EXIF_IMAGE_DESCROPTOIN "S550 CAMERA" +#define EXIF_IMAGE_DESCROPTOIN "CAMERA" #define EXIF_SOFTWARE_VERSION FW_VERSION_NUM // <= 20 char (TagSoftVerLen) @@ -947,7 +947,7 @@ #define SF_EXIF_MN_BUF_SIZE 256 #define SF_BASE_VERSION "7MD4RCwD901" #define DCF_DIR_NAME "MEDIA" /* 100MEDIA */ -#define DCF_FILE_NAME "SYFW" /* SYFW0001.JPG */ +#define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */ #define PHOTO_THUMB_PATH "A:\\THUMB\\" #define MOVIE_THUMB_PATH "A:\\THUMB\\" #define SF_SEND_LIST_DIR "/mnt/sd/THUMB" diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/ExifVendor.c b/rtos/code/application/source/cardv/SrcCode/UIApp/ExifVendor.c index 3b5aace17..67714dc39 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/ExifVendor.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/ExifVendor.c @@ -19,8 +19,8 @@ #include "vendor_isp.h" #define MAKERNOTEID 0x36353000 -#define EXIF_MAKER "MAKER NAME " -#define EXIF_SOFTWARE "Verx.xx" +#define EXIF_MAKER "TC " +#define EXIF_SOFTWARE "R6.0" #define __MODULE__ ExifVendor #define __DBGLVL__ 2 // 0=FATAL, 1=ERR, 2=WRN, 3=UNIT, 4=FUNC, 5=IND, 6=MSG, 7=VALUE, 8=USER @@ -281,8 +281,8 @@ void ExifVendor_WriteExifIFD(EXIF_HANDLE_ID HandleID) #else uiISOSpeed = 100; expo = 1000000; - uiAperture[0] = 18; - MaxAperture[0] = 18; + uiAperture[0] = 20; + MaxAperture[0] = 20; #endif status.id=RecID; if ((hd_ret = vendor_isp_init()) != HD_OK) {