新增重启设备和设备断电

hgdriver/hgdev/hg_scanner.cpp

@@ -3029,6 +3029,12 @@ int hg_scanner::device_io_control(unsigned long code, void* data, unsigned* len)
 		case SANE_POWER_MINUTES_240:
 			sleeptime = 14400;
 			break;
+		case SANE_POWER_SHUTDOWN:
+			set_devshtudown();
+			break;
+		case SANE_POWER_RESTART:
+			set_devreboot();
+			break;
 		default:
 			sleeptime = 0;
 			break;
@@ -3126,7 +3132,14 @@ int hg_scanner::get_device_log(string &log)
 {
 	return SCANNER_ERR_DEVICE_NOT_SUPPORT;
 }
-
+int hg_scanner::set_devreboot()
+{
+	return -2;
+}
+int hg_scanner::set_devshtudown()
+{
+	return -2;
+}
 int hg_scanner::clear_roller_num(void)
 {
 	return SCANNER_ERR_DEVICE_NOT_SUPPORT;

hgdriver/hgdev/hg_scanner.h

@@ -377,6 +377,8 @@ public:
 
     virtual int notify_sleep(void);//唤醒设备
     virtual int get_device_log(string &log);//获取设备日志
+    virtual int set_devreboot();//设置设备重启
+    virtual int set_devshtudown();//设置设备关机
 
 };
 

hgdriver/hgdev/hg_scanner_239.cpp

@@ -165,16 +165,31 @@ enum Scanner_Reg_Defs
 	SR_NOTIFY_SLEEP,
 	SR_GET_FEEDMODE,
 	SR_SET_FEEDMODE,
-	SR_GET_AUTOMATICCONTROLFEEDMODE_ENABLE, //获取自动调整搓纸是否使能 0关闭 1开启
-	SR_SET_AUTOMATICCONTROLFEEDMODE_ENABLE, //设置自动调整搓纸是否使能
-	SR_GET_AUTOMATICCONTROLFEEDMODE_THRESHOLD, //设置自动调整搓纸强度阈值0.1-0.9
-	SR_SET_AUTOMATICCONTROLFEEDMODE_THRESHOLD, //转int
+	SR_GET_AUTOMATICCONTROLFEEDMODE_ENABLE,
+	SR_SET_AUTOMATICCONTROLFEEDMODE_ENABLE,
+	SR_GET_AUTOMATICCONTROLFEEDMODE_THRESHOLD,
+	SR_SET_AUTOMATICCONTROLFEEDMODE_THRESHOLD,
+	SR_GET_TRAYPOSITION,
+	SR_SET_TRAYPOSITION,
 	SR_GET_CUO_ERROR = 0x50,
 	SR_GET_DOU_ERROR,
 	SR_GET_JAM_ERROR,
 	SR_GET_SCANN_NUM,
 	SR_CLR_ROLLER_NUM,
 	SR_GET_ROLLER_NUM,
+	SR_CLR_SCANN_NUM,
+	SR_GET_H_200_RATIO,  //非敦南cis需返回false
+	SR_SET_H_200_RATIO,
+	SR_GET_V_200_RATIO,
+	SR_SET_V_200_RATIO,
+	SR_GET_H_300_RATIO,
+	SR_SET_H_300_RATIO,
+	SR_GET_V_300_RATIO,
+	SR_SET_V_300_RATIO,
+	SR_GET_H_600_RATIO,
+	SR_SET_H_600_RATIO,
+	SR_GET_V_600_RATIO,
+	SR_SET_V_600_RATIO,
 	SR_UPDATA_START = 0x100,
 	SR_UPDATA_STAUTUS = 0x101,
 	SR_UPDATA_MD5_RELUST = 0x102,
@@ -193,7 +208,8 @@ enum Scanner_Reg_Defs
 	SR_GET_MBVERSION_LENGHT,
 	SR_GET_MBVERSION,
 	SR_GET_USBVIDPID,
-	SR_SET_USBVIDPID
+	SR_SET_USBVIDPID,
+	SR_SET_STARTBACKUP
 };
 enum Scanner_Cmd_Defs
 {
@@ -2086,3 +2102,19 @@ int hg_scanner_239::get_device_log(string &logpath)
 	return ret;
 }
 
+int hg_scanner_239::set_devreboot()
+{
+	int val = 0,
+		ret = read_register(SR_REBOOT, &val);
+
+	if (ret != SCANNER_ERR_OK)
+		return ret;
+}
+int hg_scanner_239::set_devshtudown()
+{
+	int val = 0,
+		ret = read_register(SR_POWEROFF, &val);
+
+	if (ret != SCANNER_ERR_OK)
+		return ret;
+}

hgdriver/hgdev/hg_scanner_239.h

@@ -127,5 +127,7 @@ public:
 	virtual int notify_sleep(void);//唤醒设备
 	virtual int get_history_count(void);//获取历史扫描张数 -2：设备不支持该功能；-1：与设备通信失败；其它大于等于0的为正常 为实现
 	virtual int get_device_log(string &get_device_log);//获取设备日志
+	virtual int set_devreboot();//设置设备重启
+	virtual int set_devshtudown();//设置设备关机
 };
 

hgdriver/hgdev/image_process.cpp

@@ -297,9 +297,7 @@ namespace hg_imgproc
 						back.release();
                		 	front.release();
 					}
-                        //#ifndef mips64
                              buffer_.reset(new std::vector<char >());
-                        //#endif
 				}
 				catch (const std::exception& e)
 				{