lmh188
/
code_device
mirror of http://192.168.10.5:8099/sane/code_device.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

微调获取硬盘和内存大小接口和传参

This commit is contained in:
yangjiaxuan 2023-12-20 14:40:41 +08:00
parent 0d2c7d79f7
commit 13b4327281
8 changed files with 32 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hgdriver/hgdev/hg_scanner.cpp
View File

@ -4780,6 +4780,10 @@ int hg_scanner::device_io_control(unsigned long code, void* data, unsigned* len)
{ {
return set_devreboot(*((int*)data)); return set_devreboot(*((int*)data));
} }
else if (code == IO_CTRL_CODE_SET_DEVS_SHUTDOWN)
{
return set_devshtudown();
}
else if (code == IO_CTRL_CODE_SET_AUTO_FALT) else if (code == IO_CTRL_CODE_SET_AUTO_FALT)
{ {
is_auto_falt = true; is_auto_falt = true;
@ -4843,35 +4847,17 @@ int hg_scanner::device_io_control(unsigned long code, void* data, unsigned* len)
} }
else if (code == IO_CTRL_CODE_GET_DEVS_CPU) else if (code == IO_CTRL_CODE_GET_DEVS_CPU)
{ {
string str; int cpu = 0;
int ret = get_devs_cpu(str); int ret = get_devs_cpu(cpu);
if (str.empty()) (*(int*)data) = cpu;
{
ret = SCANNER_ERR_NO_DATA;
}
if (*len < str.size())
{
*len = str.size();
ret = SCANNER_ERR_INSUFFICIENT_MEMORY;
}
strcpy((char*)data, str.c_str());
return ret; return ret;
} }
else if (code == IO_CTRL_CODE_GET_DEVS_DISK) else if (code == IO_CTRL_CODE_GET_DEVS_DISK)
{ {
string str; int disk = 0;
int ret = get_devs_disk(str); int ret = get_devs_disk(disk);
if (str.empty()) (*(int*)data) = disk;
{
ret = SCANNER_ERR_NO_DATA;
}
if (*len < str.size())
{
*len = str.size();
ret = SCANNER_ERR_INSUFFICIENT_MEMORY;
}
strcpy((char*)data, str.c_str());
return ret; return ret;
} }
@ -5063,11 +5049,11 @@ int hg_scanner::get_devs_time(string& times)
{ {
return SCANNER_ERR_DEVICE_NOT_SUPPORT; return SCANNER_ERR_DEVICE_NOT_SUPPORT;
} }
int hg_scanner::get_devs_cpu(string& cpu) int hg_scanner::get_devs_cpu(int& cpu)
{ {
return SCANNER_ERR_DEVICE_NOT_SUPPORT; return SCANNER_ERR_DEVICE_NOT_SUPPORT;
} }
int hg_scanner::get_devs_disk(string& disk) int hg_scanner::get_devs_disk(int& disk)
{ {
return SCANNER_ERR_DEVICE_NOT_SUPPORT; return SCANNER_ERR_DEVICE_NOT_SUPPORT;
} }

4
hgdriver/hgdev/hg_scanner.h
View File

@ -544,8 +544,8 @@ public:
virtual int get_motor_board_ver(string &ver); //获取G239电机板的固件号 //3399设备支持 virtual int get_motor_board_ver(string &ver); //获取G239电机板的固件号 //3399设备支持
virtual int set_devs_time(string times); //设置设备时间 //3399设备支持 virtual int set_devs_time(string times); //设置设备时间 //3399设备支持
virtual int get_devs_time(string &times); //获取设备时间 //3399设备支持 virtual int get_devs_time(string &times); //获取设备时间 //3399设备支持
virtual int get_devs_cpu(string& cpu); //获取设备内存大小 virtual int get_devs_cpu(int& cpu); //获取设备内存大小(kb)
virtual int get_devs_disk(string& disk); //获取设备硬盘容量大小 virtual int get_devs_disk(int& disk); //获取设备硬盘容量大小(kb)
virtual int set_restore(); //还原文件 virtual int set_restore(); //还原文件
virtual int set_backup(); //备份文件 virtual int set_backup(); //备份文件
}; };

16
hgdriver/hgdev/hg_scanner_239.cpp
View File

@ -389,7 +389,7 @@ int hg_scanner_239::get_devs_time(string& times)
} }
return ret; return ret;
} }
int hg_scanner_239::get_devs_cpu(string& cpu) int hg_scanner_239::get_devs_cpu(int& cpu)
{ {
string path = "/usr/local/huago/sysinfo.json"; string path = "/usr/local/huago/sysinfo.json";
long long cpu_size = 0; long long cpu_size = 0;
@ -402,15 +402,11 @@ int hg_scanner_239::get_devs_cpu(string& cpu)
cpu_size = js["MemTotal"]; cpu_size = js["MemTotal"];
} }
float num = (float)cpu_size / 1024 / 1024 / 1024; cpu = cpu_size / 1024;
char buf[10] = { 0 };
sprintf(buf, "%.2f", num);
strcat(buf, "GB");
cpu = buf;
return ret; return ret;
} }
int hg_scanner_239::get_devs_disk(string& disk) int hg_scanner_239::get_devs_disk(int& disk)
{ {
string path = "/usr/local/huago/sysinfo.json"; string path = "/usr/local/huago/sysinfo.json";
long disk_size = 0; long disk_size = 0;
@ -423,11 +419,7 @@ int hg_scanner_239::get_devs_disk(string& disk)
disk_size = js["DiskTotal"]; disk_size = js["DiskTotal"];
} }
float num = (float)disk_size / 1024 / 1024; disk = disk_size;
char buf[10] = { 0 };
sprintf(buf, "%.2f", num);
strcat(buf, "GB");
disk = buf;
return ret; return ret;
} }

4
hgdriver/hgdev/hg_scanner_239.h
View File

@ -146,8 +146,8 @@ public:
virtual int set_devs_time(string times); //设置设备时间 //3399设备支持 virtual int set_devs_time(string times); //设置设备时间 //3399设备支持
virtual int get_devs_time(string& times); //获取设备时间 //3399设备支持 virtual int get_devs_time(string& times); //获取设备时间 //3399设备支持
virtual int get_devs_cpu(string& cpu); //获取设备内存大小 virtual int get_devs_cpu(int& cpu); //获取设备内存大小(kb)
virtual int get_devs_disk(string& disk); //获取设备硬盘容量大小 virtual int get_devs_disk(int& disk); //获取设备硬盘容量大小(kb)
virtual int set_restore(); //还原文件 virtual int set_restore(); //还原文件
virtual int set_backup(); //备份文件 virtual int set_backup(); //备份文件
}; };

16
hgdriver/hgdev/hg_scanner_300.cpp
View File

@ -1629,7 +1629,7 @@ int hg_scanner_300::set_updata0303(void)
} }
return 0; return 0;
} }
int hg_scanner_300::get_devs_cpu(string& cpu) int hg_scanner_300::get_devs_cpu(int& cpu)
{ {
std::string src_name = "/usr/local/huago/sysinfo.json"; std::string src_name = "/usr/local/huago/sysinfo.json";
std::string dst_name = "./sys.log"; std::string dst_name = "./sys.log";
@ -1670,15 +1670,11 @@ int hg_scanner_300::get_devs_cpu(string& cpu)
cpu_size = js["MemTotal"]; cpu_size = js["MemTotal"];
} }
float num = (float)cpu_size / 1024 / 1024 / 1024; cpu = cpu_size / 1024;
char buf[10] = { 0 };
sprintf(buf, "%.2f", num);
strcat(buf, "GB");
cpu = buf;
return ret; return ret;
} }
int hg_scanner_300::get_devs_disk(string& disk) int hg_scanner_300::get_devs_disk(int& disk)
{ {
std::string src_name = "/usr/local/huago/sysinfo.json"; std::string src_name = "/usr/local/huago/sysinfo.json";
std::string dst_name = "./sys.log"; std::string dst_name = "./sys.log";
@ -1719,11 +1715,7 @@ int hg_scanner_300::get_devs_disk(string& disk)
disk_size = js["DiskTotal"]; disk_size = js["DiskTotal"];
} }
float num = (float)disk_size / 1024 / 1024; disk = disk_size;
char buf[10] = { 0 };
sprintf(buf, "%.2f", num);
strcat(buf, "GB");
disk = buf;
return ret; return ret;
} }

4
hgdriver/hgdev/hg_scanner_300.h
View File

@ -126,8 +126,8 @@ public:
virtual int set_auto_flat(int data)override; //设置自动平场校正 virtual int set_auto_flat(int data)override; //设置自动平场校正
// data:0(ALL) 1(200dpi、gray) 2(200dpi、color) 3(300dpi、gray) 4(300dpi、color) 5(600dpi、gray) 6(600dpi、color) // data:0(ALL) 1(200dpi、gray) 2(200dpi、color) 3(300dpi、gray) 4(300dpi、color) 5(600dpi、gray) 6(600dpi、color)
virtual int set_updata0303(void)override; virtual int set_updata0303(void)override;
virtual int get_devs_cpu(string& cpu); //获取设备内存大小 virtual int get_devs_cpu(int& cpu); //获取设备内存大小(kb)
virtual int get_devs_disk(string& disk); //获取设备硬盘容量大小 virtual int get_devs_disk(int& disk); //获取设备硬盘容量大小(kb)
virtual int set_restore(); //还原文件 virtual int set_restore(); //还原文件
virtual int set_backup(); //备份文件 virtual int set_backup(); //备份文件
}; };

16
hgdriver/hgdev/hg_scanner_306.cpp
View File

@ -1478,7 +1478,7 @@ int hg_scanner_306::set_updata0303(void)
} }
return 0; return 0;
} }
int hg_scanner_306::get_devs_cpu(string& cpu) int hg_scanner_306::get_devs_cpu(int& cpu)
{ {
std::string src_name = "/usr/local/huago/sysinfo.json"; std::string src_name = "/usr/local/huago/sysinfo.json";
std::string dst_name = "./sys.log"; std::string dst_name = "./sys.log";
@ -1519,15 +1519,11 @@ int hg_scanner_306::get_devs_cpu(string& cpu)
cpu_size = js["MemTotal"]; cpu_size = js["MemTotal"];
} }
float num = (float)cpu_size / 1024 / 1024 / 1024; cpu = cpu_size / 1024;
char buf[10] = { 0 };
sprintf(buf, "%.2f", num);
strcat(buf, "GB");
cpu = buf;
return ret; return ret;
} }
int hg_scanner_306::get_devs_disk(string& disk) int hg_scanner_306::get_devs_disk(int& disk)
{ {
std::string src_name = "/usr/local/huago/sysinfo.json"; std::string src_name = "/usr/local/huago/sysinfo.json";
std::string dst_name = "./sys.log"; std::string dst_name = "./sys.log";
@ -1568,11 +1564,7 @@ int hg_scanner_306::get_devs_disk(string& disk)
disk_size = js["DiskTotal"]; disk_size = js["DiskTotal"];
} }
float num = (float)disk_size / 1024 / 1024; disk = disk_size;
char buf[10] = { 0 };
sprintf(buf, "%.2f", num);
strcat(buf, "GB");
disk = buf;
return ret; return ret;
} }

4
hgdriver/hgdev/hg_scanner_306.h
View File

@ -150,6 +150,6 @@ public:
virtual int set_auto_flat(int data)override; //设置自动平场校正 virtual int set_auto_flat(int data)override; //设置自动平场校正
// data:0(ALL) 1(200dpi、gray) 2(200dpi、color) 3(300dpi、gray) 4(300dpi、color) 5(600dpi、gray) 6(600dpi、color) // data:0(ALL) 1(200dpi、gray) 2(200dpi、color) 3(300dpi、gray) 4(300dpi、color) 5(600dpi、gray) 6(600dpi、color)
virtual int set_updata0303(void)override; virtual int set_updata0303(void)override;
virtual int get_devs_cpu(string& cpu); //获取设备内存大小 virtual int get_devs_cpu(int& cpu); //获取设备内存大小(kb)
virtual int get_devs_disk(string& disk); //获取设备硬盘容量大小 virtual int get_devs_disk(int& disk); //获取设备硬盘容量大小(kb)
}; };