From cae696418409bc92a10c37191f7d973b3de1f75d Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Fri, 29 Dec 2023 16:40:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E4=B8=AA=E6=95=B0=E8=A1=A8=E7=A4=BA=E4=BA=A7=E5=93=81=E7=B3=BB?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scanner/scanner_const_opts.cpp | 16 +++++++++++++---
 xmake.lua                      |  4 ++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/scanner/scanner_const_opts.cpp b/scanner/scanner_const_opts.cpp
index 169afb2..700935f 100644
--- a/scanner/scanner_const_opts.cpp
+++ b/scanner/scanner_const_opts.cpp
@@ -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)
diff --git a/xmake.lua b/xmake.lua
index b016295..07b8135 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -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")