lmh188
/
twain2
mirror of http://192.168.1.51:8099/lmh188/twain2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整之前定义的flash地址宏定义，之前定义未区分200dpi 300dpi

This commit is contained in:
pm 2019-12-06 20:04:11 +08:00
parent bd8404f831
commit d9056ec3d0
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
device_common.h
View File

@ -6,20 +6,39 @@
#define VID_ADDR (PID_ADDR+2) //!<PID_ADDR向后偏移2字节 指向VID_ADDR首地址 2字节存储vid 所属空间大小2字节 #define VID_ADDR (PID_ADDR+2) //!<PID_ADDR向后偏移2字节 指向VID_ADDR首地址 2字节存储vid 所属空间大小2字节
#define DEVNAME_ADDR (VID_ADDR+2) //!<VID_ADDR向后偏移2字节 指向DEVNAME_ADDR首地址 所属空间大小64字节 #define DEVNAME_ADDR (VID_ADDR+2) //!<VID_ADDR向后偏移2字节 指向DEVNAME_ADDR首地址 所属空间大小64字节
#define SERIAL_ADDR (DEVNAME_ADDR+64) //!<DEVNAME_ADDR向后偏移64字节 指向序列号flash存储地址 所属空间大小12字节 #define SERIAL_ADDR (DEVNAME_ADDR+64) //!<DEVNAME_ADDR向后偏移64字节 指向序列号flash存储地址 所属空间大小12字节
#define MOTORBOARD_CONFIG_ADDR (SERIAL_ADDR+12) //!<SERIAL_ADDR偏移12字节 指向 电机板flash存储数据头地址 所属空间3字节 #define FWVERSION_ADDR (SERIAL_ADDR+12) //!<固件版本号 8字节
#define EXPOSURE_ADDR (MOTORBOARD_CONFIG_ADDR+3) //!<MOTORBOARD_CONFIG_ADDR偏移8字节 指向 电机板flash存储曝光数据头地址 #define MOTORBOARD_CONFIG_ADDR (FWVERSION_ADDR+8) //!<SERIAL_ADDR偏移12字节 指向 电机板flash存储数据头地址 所属空间3字节
#define EXPOSURE_ADDR_200DPI (MOTORBOARD_CONFIG_ADDR+3) //!<MOTORBOARD_CONFIG_ADDR偏移8字节 指向 电机板flash存储曝光数据头地址
//!<所属空间8字节 存储空间 存储方式Gray（2）+B（2）+G（2）+R（2） //!<所属空间8字节 存储空间 存储方式Gray（2）+B（2）+G（2）+R（2）
#define AD_ADDR (EXPOSURE_ADDR+8) //!<EXPOSURE_ADDR #define EXPOSURE_ADDR_300DPI (EXPOSURE_ADDR_200DPI+2)
#define FPGA_FLAT_ADDR (AD_ADDR+28) //!<所属空间918+612字节 #define AD_ADDR_200DPI (EXPOSURE_ADDR_300DPI+2) //!<EXPOSURE_ADDR
#define AD_ADDR_300DPI (AD_ADDR_200DPI+28)
#define FPGA_FLAT_ADDR_200DPI_GRAY (AD_ADDR_300DPI+28) //正面+黑场数据（2448+2448）+反面+黑场数据（2448+2448）
#define FPGA_FLAT_ADDR_200DPI_COLOR (FPGA_FLAT_ADDR_200DPI_GRAY+2448*4)//正面RGB+黑场数据（2448+2448+2448+2448）+反面+黑场数据RGB+黑场数据（2448+2448+2448+2448）
#define FPGA_FLAT_ADDR_300DPI_GRAY (FPGA_FLAT_ADDR_200DPI_COLOR+2448*8)
#define FPGA_FLAT_ADDR_300DPI_COLOR (FPGA_FLAT_ADDR_300DPI_GRAY+3672*4)
//#define FPGA_FLAT_ADDR (AD_ADDR+28) //!<所属空间918+612字节
//flash size //flash size
#define FLASH_200_COLOR (2448 * 8) //#define FLASH_200_COLOR (2448 * 8)
#define FLASH_200_GRAY (2448) //#define FLASH_200_GRAY (2448*4)
#define ARRAY_200 (612) //#define ARRAY_200 (612)
#define ARRAY_300 (918) //#define ARRAY_300 (918)
#define FLASH_300_COLOR (3672 * 8) //#define FLASH_300_COLOR (3672 * 8)
#define FLASH_300_GRAY (3672) //#define FLASH_300_GRAY (3672)
#define FLASH_CONT_ADDR_SIZE (4)
#define FLASH_PID_ADDR_SIZE (2)
#define FLASH_VID_ADDR_SIZE (2)
#define FLASH_DEVNAME_ADDR_SIZE (64)
#define FLASH_SERIAL_ADDR_SIZE (12)
#define FLASH_FWVERSION_ADDR_SIZE (8)
#define FLASH_MOTORBOARD_CONFIG_ADDR_SIZE (3）
#define FLASH_AD_ADDR_SIZE (28)
#define FLASH_FPGA_FLAT_ADDR_200DPI_GRAY_SIZE (2448*4)
#define FLASH_FPGA_FLAT_ADDR_200DPI_COLOR_SIZE (2448*8)
#define FLASH_FPGA_FLAT_ADDR_300DPI_GRAY_SIZE (3672*4)
#define FLASH_FPGA_FLAT_ADDR_300DPI_COLOR_SIZE (3672*8)
typedef enum { typedef enum {
Cmd_None, Cmd_None,