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

版本号第二个数表示产品系列

This commit is contained in:
gb 2023-12-29 16:40:03 +08:00
parent e9afbd9592
commit cae6964184
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scanner/scanner_const_opts.cpp
View File

@ -11,7 +11,7 @@
// version ...
#ifndef VER_MAIN
#define VER_MAIN 2
#define VER_MINOR 0
#define VER_FAMILY 200
#define VER_DATE 20231225
#define VER_BUILD 1
#endif
@ -149,12 +149,22 @@ void scanner_const_opts::init(void)
{
char ver[40] = {0};
sprintf(ver, "%u.%u.%u%02u", VER_MAIN, VER_MINOR, VER_DATE, VER_BUILD);
sprintf(ver, "%u.%u.%u%02u", VER_MAIN, VER_FAMILY, VER_DATE, VER_BUILD);
child->set_value("cur", ver);
child->set_value("default", ver);
child->release();
utils::to_log(LOG_LEVEL_DEBUG, "version: %s\n", ver);
}
jsn->get_value(SANE_STD_OPT_NAME_DEVICE_MODEL, child);
if(child)
{
char ver[40] = {0};
sprintf(ver, "G%u", VER_FAMILY);
child->set_value("cur", ver);
child->set_value("default", ver);
child->release();
}
text = jsn->to_string();
set_opt_json_text(&text[0]);
@ -185,7 +195,7 @@ char* scanner_const_opts::get_value(const char* name, void* value, size_t* size,
else if(strcmp(name, SANE_STD_OPT_NAME_FIRMWARE_VERSION) == 0)
{
char ver[40] = {0};
sprintf(ver, "%u.%u.%u%02u", VER_MAIN, VER_MINOR, VER_DATE, VER_BUILD);
sprintf(ver, "%u.%u.%u%02u", VER_MAIN, VER_FAMILY, VER_DATE, VER_BUILD);
val = ver;
}
else if(err)

4
xmake.lua
View File

@ -58,9 +58,9 @@ add_packagedirs("sdk")
-- set_configvar("VIDEO_CLASS", has_config("isp1") and "GVideoISP1" or "gVideo")
add_defines("VER_MAIN=2")
add_defines("VER_MINOR=0")
add_defines("VER_FAMILY=300")
add_defines("VER_DATE=20231229")
add_defines("VER_BUILD=8")
add_defines("VER_BUILD=9")
target("conf")
set_kind("phony")