From c436220561d65b2238ee14e744856eda3f9dafc6 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 1 Sep 2024 11:48:41 +0800 Subject: [PATCH] update --- uappbase/appcfg/appcfg.hpp | 23 ++++++++++++----------- uappbase/service/config_index.cpp | 8 ++++---- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/uappbase/appcfg/appcfg.hpp b/uappbase/appcfg/appcfg.hpp index 3d5ee80..bd0f67d 100644 --- a/uappbase/appcfg/appcfg.hpp +++ b/uappbase/appcfg/appcfg.hpp @@ -49,19 +49,20 @@ #define USER_DEFAULT_PWD "888888" - -#define ACID_DEFAULT_NAME1 "ŨÁòËá" -#define ACID_DEFAULT_NAME2 "Ï¡ÏõËáÑÎËá" -#define ACID_DEFAULT_NAME3 "ÅðËá" -#define ACID_DEFAULT_NAME4 "¼×Ëá" -#define ACID_DEFAULT_NAME5 "Ï¡ÁòËáÏõËá" -#define ACID_DEFAULT_NAME6 "ŨÏõËá" -#define ACID_DEFAULT_NAME7 "·¢ÑÌÏõËá" -#define ACID_DEFAULT_NAME8 "Ï¡ÏõËáÑÎËá" -#define ACID_DEFAULT_NAME9 "Ũ¸ßÂÈËá" +#define ACID_DEFAULT_NAME1 "ŨÁòËá" +#define ACID_DEFAULT_NAME2 "Ï¡ÏõËáÑÎËá" +#define ACID_DEFAULT_NAME3 "ÅðËá" +#define ACID_DEFAULT_NAME4 "¼×Ëá" +#define ACID_DEFAULT_NAME5 "Ï¡ÁòËáÏõËá" +#define ACID_DEFAULT_NAME6 "ŨÏõËá" +#define ACID_DEFAULT_NAME7 "·¢ÑÌÏõËá" +#define ACID_DEFAULT_NAME8 "Ï¡ÏõËáÑÎËá" +#define ACID_DEFAULT_NAME9 "Ũ¸ßÂÈËá" #define ACID_DEFAULT_NAME10 "Á×Ëá" #define ACID_DEFAULT_NAME11 "¼×Ëá" #define ACID_DEFAULT_NAME12 "²ÝËá" #define ACID_DEFAULT_NAME13 "ÈýÂÈÒÒËá" #define ACID_DEFAULT_NAME14 "Ò»ÂÈÒÒËá" -#define ACID_DEFAULT_NAME15 "Çâ·úËá" \ No newline at end of file +#define ACID_DEFAULT_NAME15 "Çâ·úËá" + +#define PUMPDEFVEL "100" // 100ml/min \ No newline at end of file diff --git a/uappbase/service/config_index.cpp b/uappbase/service/config_index.cpp index 5634292..f2562e8 100644 --- a/uappbase/service/config_index.cpp +++ b/uappbase/service/config_index.cpp @@ -78,10 +78,10 @@ static cfg_iterm_info_t cfg_iterm_infos[] = { /*********************************************************************************************************************** * ÆäËûÅäÖà * ***********************************************************************************************************************/ - CFG_ITERM(kcfg_lockAcidName, kcfgt_bool, "false"), // - CFG_ITERM(kcfg_echDitrUpLi, kcfgt_int32, "99"), // ÿ´Î·ÖÅäÉÏÏÞÉ趨ֵ each distri up-limit - CFG_ITERM(kcfg_distrInterval, kcfgt_float, "1.5"), // ÿ´Î·ÖÅä¼ä¸ôʱ¼ä - CFG_ITERM(kcfg_pumpDefVel, kcfgt_int32, "300"), // + CFG_ITERM(kcfg_lockAcidName, kcfgt_bool, "false"), // + CFG_ITERM(kcfg_echDitrUpLi, kcfgt_int32, "99"), // ÿ´Î·ÖÅäÉÏÏÞÉ趨ֵ each distri up-limit + CFG_ITERM(kcfg_distrInterval, kcfgt_float, "1.5"), // ÿ´Î·ÖÅä¼ä¸ôʱ¼ä + CFG_ITERM(kcfg_pumpDefVel, kcfgt_int32, PUMPDEFVEL), // CFG_ITERM(kcfg_m0irun, kcfgt_int32, "20"), // CFG_ITERM(kcfg_m1irun, kcfgt_int32, "20"), //