Browse Source

updata UI and add warehourse

sunlight
sunlight 10 months ago
parent
commit
e295e25fdf
  1. 4
      .settings/language.settings.xml
  2. BIN
      release/V200/hand_acid_mainboard_ui upadte.HMI
  3. 8
      uappbase/appcfg/appcfg.hpp
  4. 85
      uappbase/bean/config_index_enum.hpp
  5. 91
      uappbase/service/config_index.cpp
  6. 2
      uappbase/service/config_index.hpp
  7. 2
      uappbase/service/config_service.cpp
  8. 8
      uappbase/service/config_service_utils.cpp
  9. 1104
      ui/ui.h
  10. 4
      ui/usrui.h
  11. 3
      usrc/service/app_core.cpp
  12. 4
      usrc/service/page/Page_login.cpp
  13. 2
      usrc/service/page/page.hpp
  14. 4
      usrc/service/page/submenu/Page_muDeviceInfo.cpp
  15. 223
      usrc/service/page/submenu/Page_muGetAcidMgr.cpp
  16. 4
      usrc/service/page/submenu/Page_muGetAcidMgr.hpp
  17. 98
      usrc/service/page/submenu/Page_muGetAcidRcord.cpp
  18. 25
      usrc/service/page/submenu/Page_muGetAcidRcord.hpp
  19. 7
      usrc/service/pump_ctrl_service.cpp

4
.settings/language.settings.xml

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1534615028576298921" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1324296782879874877" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1550109261171453848" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1312690375029265710" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

BIN
release/V200/hand_acid_mainboard_ui upadte.HMI

8
uappbase/appcfg/appcfg.hpp

@ -27,10 +27,10 @@
#define MOTOR_SHAFT false #define MOTOR_SHAFT false
#define STEPMOTOR_IHOLD 10 #define STEPMOTOR_IHOLD 10
#define STEPMOTOR_IHOLDDELAY 100 #define STEPMOTOR_IHOLDDELAY 100
#define MOTOR_VSTART 50 // 启动速度
#define MOTOR_A1 15 // 阶段1_加速度
#define MOTOR_AMAX 30 // 阶段2_加速度
#define MOTOR_V1 300 // 阶段2_开始速度
#define MOTOR_VSTART 150 // 启动速度
#define MOTOR_A1 5 // 阶段1_加速度
#define MOTOR_AMAX 20 // 阶段2_加速度
#define MOTOR_V1 500 // 阶段2_开始速度
#define MOTOR_TZEROWAIT 100 // 速度零点点切换时间 #define MOTOR_TZEROWAIT 100 // 速度零点点切换时间
#define BLENAME "AciDisp" // BLE名字 #define BLENAME "AciDisp" // BLE名字

85
uappbase/bean/config_index_enum.hpp

@ -16,7 +16,7 @@ typedef enum {
kusr_passwd2, // 用户2密码 kusr_passwd2, // 用户2密码
kusr_name3, // 用户3名字 kusr_name3, // 用户3名字
kusr_enable3, // 用户3是否使能 kusr_enable3, // 用户3是否使能
kusr_passwd3, // 用户3密码
kusr_passwd3, // 用Ppa户3密码
kusr_name4, // 用户4名字 kusr_name4, // 用户4名字
kusr_enable4, // 用户4是否使能 kusr_enable4, // 用户4是否使能
kusr_passwd4, // 用户4密码 kusr_passwd4, // 用户4密码
@ -46,56 +46,6 @@ typedef enum {
kcfg_acidName14, // 酸液中预设名字 kcfg_acidName14, // 酸液中预设名字
kcfg_acidName15, // 酸液中预设名字 kcfg_acidName15, // 酸液中预设名字
kcfg_usr2AcidChooseName0, // 酸液0 选择的名字
kcfg_usr2AcidChooseName1, // 酸液1 选择的名字
kcfg_usr2AcidChooseName2, // 酸液2 选择的名字
kcfg_usr2AcidChooseName3, // 酸液3 选择的名字
kcfg_usr3AcidChooseName0, // 酸液0 选择的名字
kcfg_usr3AcidChooseName1, // 酸液1 选择的名字
kcfg_usr3AcidChooseName2, // 酸液2 选择的名字
kcfg_usr3AcidChooseName3, // 酸液3 选择的名字
kcfg_usr4AcidChooseName0, // 酸液0 选择的名字
kcfg_usr4AcidChooseName1, // 酸液1 选择的名字
kcfg_usr4AcidChooseName2, // 酸液2 选择的名字
kcfg_usr4AcidChooseName3, // 酸液3 选择的名字
kcfg_usr5AcidChooseName0, // 酸液0 选择的名字
kcfg_usr5AcidChooseName1, // 酸液1 选择的名字
kcfg_usr5AcidChooseName2, // 酸液2 选择的名字
kcfg_usr5AcidChooseName3, // 酸液3 选择的名字
kcfg_usr6AcidChooseName0, // 酸液0 选择的名字
kcfg_usr6AcidChooseName1, // 酸液1 选择的名字
kcfg_usr6AcidChooseName2, // 酸液2 选择的名字
kcfg_usr6AcidChooseName3, // 酸液3 选择的名字
kcfg_usr2AcidCapacityLimite0,
kcfg_usr2AcidCapacityLimite1,
kcfg_usr2AcidCapacityLimite2,
kcfg_usr2AcidCapacityLimite3,
kcfg_usr3AcidCapacityLimite0,
kcfg_usr3AcidCapacityLimite1,
kcfg_usr3AcidCapacityLimite2,
kcfg_usr3AcidCapacityLimite3,
kcfg_usr4AcidCapacityLimite0,
kcfg_usr4AcidCapacityLimite1,
kcfg_usr4AcidCapacityLimite2,
kcfg_usr4AcidCapacityLimite3,
kcfg_usr5AcidCapacityLimite0,
kcfg_usr5AcidCapacityLimite1,
kcfg_usr5AcidCapacityLimite2,
kcfg_usr5AcidCapacityLimite3,
kcfg_usr6AcidCapacityLimite0,
kcfg_usr6AcidCapacityLimite1,
kcfg_usr6AcidCapacityLimite2,
kcfg_usr6AcidCapacityLimite3,
/*********************************************************************************************************************** /***********************************************************************************************************************
* * * *
***********************************************************************************************************************/ ***********************************************************************************************************************/
@ -126,11 +76,11 @@ typedef enum {
***********************************************************************************************************************/ ***********************************************************************************************************************/
kcfg_lockAcidName, // 锁定酸液名称 kcfg_lockAcidName, // 锁定酸液名称
kcfg_echDitrUpLi, // 每次分配上限设定值 each distri up-limit kcfg_echDitrUpLi, // 每次分配上限设定值 each distri up-limit
kcfg_distrInterval, // 每次分配间隔时间
kcfg_pumpDefVel0, // 泵机默认速度r/min kcfg_pumpDefVel0, // 泵机默认速度r/min
kcfg_pumpDefVel1, // 泵机默认速度r/min kcfg_pumpDefVel1, // 泵机默认速度r/min
kcfg_pumpDefVel2, // 泵机默认速度r/min kcfg_pumpDefVel2, // 泵机默认速度r/min
kcfg_pumpDefVel3, // 泵机默认速度r/min kcfg_pumpDefVel3, // 泵机默认速度r/min
kcfg_distrInterval, // 每次分配间隔时间
/*********************************************************************************************************************** /***********************************************************************************************************************
* * * *
@ -147,6 +97,37 @@ typedef enum {
kcfg_bleClientName, kcfg_bleClientName,
kcfg_recordNum,
kcfg_grantAcidName0,
kcfg_getAcidUsr0,
kcfg_usrAcidChooseName0, // 酸液0 选择的名字
kcfg_usrAcidCapacityLimite0,
kcfg_grantAcidName1,
kcfg_getAcidUsr1,
kcfg_usrAcidChooseName1,
kcfg_usrAcidCapacityLimite1,
kcfg_grantAcidName2,
kcfg_getAcidUsr2,
kcfg_usrAcidChooseName2, // 酸液0 选择的名字
kcfg_usrAcidCapacityLimite2,
kcfg_grantAcidName3,
kcfg_getAcidUsr3,
kcfg_usrAcidChooseName3, // 酸液0 选择的名字
kcfg_usrAcidCapacityLimite3,
kcfg_grantAcidName4,
kcfg_getAcidUsr4,
kcfg_usrAcidChooseName4, // 酸液0 选择的名字
kcfg_usrAcidCapacityLimite4,
kcfg_grantAcidName5,
kcfg_getAcidUsr5,
kcfg_usrAcidChooseName5, // 酸液0 选择的名字
kcfg_usrAcidCapacityLimite5,
kcfg_max, kcfg_max,
} config_index_t; } config_index_t;

91
uappbase/service/config_index.cpp

@ -56,44 +56,6 @@ static cfg_iterm_info_t cfg_iterm_infos[] = {
CFG_ITERM(kcfg_acidName15, kcfgt_str, ACID_DEFAULT_NAME15), // CFG_ITERM(kcfg_acidName15, kcfgt_str, ACID_DEFAULT_NAME15), //
/*********************************************************************************************************************** /***********************************************************************************************************************
* *
***********************************************************************************************************************/
CFG_ITERM(kcfg_usr2AcidChooseName0, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr2AcidChooseName1, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr2AcidChooseName2, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr2AcidChooseName3, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr3AcidChooseName0, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr3AcidChooseName1, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr3AcidChooseName2, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr3AcidChooseName3, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr4AcidChooseName0, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr4AcidChooseName1, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr4AcidChooseName2, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr4AcidChooseName3, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr5AcidChooseName0, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr5AcidChooseName1, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr5AcidChooseName2, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr5AcidChooseName3, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr6AcidChooseName0, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr6AcidChooseName1, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr6AcidChooseName2, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr6AcidChooseName3, kcfgt_str, "未设置"), //
CFG_ITERM(kcfg_usr2AcidCapacityLimite0, kcfgt_str, "0"), CFG_ITERM(kcfg_usr2AcidCapacityLimite1, kcfgt_str, "0"), CFG_ITERM(kcfg_usr2AcidCapacityLimite2, kcfgt_str, "0"), CFG_ITERM(kcfg_usr2AcidCapacityLimite3, kcfgt_str, "0"),
CFG_ITERM(kcfg_usr3AcidCapacityLimite0, kcfgt_str, "0"), CFG_ITERM(kcfg_usr3AcidCapacityLimite1, kcfgt_str, "0"), CFG_ITERM(kcfg_usr3AcidCapacityLimite2, kcfgt_str, "0"), CFG_ITERM(kcfg_usr3AcidCapacityLimite3, kcfgt_str, "0"),
CFG_ITERM(kcfg_usr4AcidCapacityLimite0, kcfgt_str, "0"), CFG_ITERM(kcfg_usr4AcidCapacityLimite1, kcfgt_str, "0"), CFG_ITERM(kcfg_usr4AcidCapacityLimite2, kcfgt_str, "0"), CFG_ITERM(kcfg_usr4AcidCapacityLimite3, kcfgt_str, "0"),
CFG_ITERM(kcfg_usr5AcidCapacityLimite0, kcfgt_str, "0"), CFG_ITERM(kcfg_usr5AcidCapacityLimite1, kcfgt_str, "0"), CFG_ITERM(kcfg_usr5AcidCapacityLimite2, kcfgt_str, "0"), CFG_ITERM(kcfg_usr5AcidCapacityLimite3, kcfgt_str, "0"),
CFG_ITERM(kcfg_usr6AcidCapacityLimite0, kcfgt_str, "0"), CFG_ITERM(kcfg_usr6AcidCapacityLimite1, kcfgt_str, "0"), CFG_ITERM(kcfg_usr6AcidCapacityLimite2, kcfgt_str, "0"), CFG_ITERM(kcfg_usr6AcidCapacityLimite3, kcfgt_str, "0"),
/***********************************************************************************************************************
* * * *
***********************************************************************************************************************/ ***********************************************************************************************************************/
CFG_ITERM(kcfg_acidChooseName0, kcfgt_str, "未设置"), // CFG_ITERM(kcfg_acidChooseName0, kcfgt_str, "未设置"), //
@ -116,10 +78,10 @@ static cfg_iterm_info_t cfg_iterm_infos[] = {
CFG_ITERM(kcfg_mLPR1, kcfgt_float, "0.6900"), // CFG_ITERM(kcfg_mLPR1, kcfgt_float, "0.6900"), //
CFG_ITERM(kcfg_mLPR2, kcfgt_float, "0.1350"), // CFG_ITERM(kcfg_mLPR2, kcfgt_float, "0.1350"), //
CFG_ITERM(kcfg_mLPR3, kcfgt_float, "0.1350"), // */ CFG_ITERM(kcfg_mLPR3, kcfgt_float, "0.1350"), // */
CFG_ITERM(kcfg_mLPR1, kcfgt_float, "1"), //
CFG_ITERM(kcfg_mLPR0, kcfgt_float, "1"), //
CFG_ITERM(kcfg_mLPR2, kcfgt_float, "1"), //
CFG_ITERM(kcfg_mLPR3, kcfgt_float, "1"), //
CFG_ITERM(kcfg_mLPR1, kcfgt_float, "1.0"), //
CFG_ITERM(kcfg_mLPR0, kcfgt_float, "1.0"), //
CFG_ITERM(kcfg_mLPR2, kcfgt_float, "1.0"), //
CFG_ITERM(kcfg_mLPR3, kcfgt_float, "1.0"), //
/*********************************************************************************************************************** /***********************************************************************************************************************
* * * *
@ -134,13 +96,6 @@ static cfg_iterm_info_t cfg_iterm_infos[] = {
CFG_ITERM(kcfg_pumpDefVel2, kcfgt_int32, PUMPDEFVEL), // CFG_ITERM(kcfg_pumpDefVel2, kcfgt_int32, PUMPDEFVEL), //
CFG_ITERM(kcfg_pumpDefVel3, kcfgt_int32, PUMPDEFVEL), // CFG_ITERM(kcfg_pumpDefVel3, kcfgt_int32, PUMPDEFVEL), //
CFG_ITERM(kcfg_m0irun, kcfgt_int32, "22"), //
CFG_ITERM(kcfg_m1irun, kcfgt_int32, "22"), //
CFG_ITERM(kcfg_m2irun, kcfgt_int32, "22"), //
CFG_ITERM(kcfg_m3irun, kcfgt_int32, "22"), //
CFG_ITERM(kcfg_bleClientName, kcfgt_str, ""), //
/*********************************************************************************************************************** /***********************************************************************************************************************
* * * *
***********************************************************************************************************************/ ***********************************************************************************************************************/
@ -153,6 +108,44 @@ static cfg_iterm_info_t cfg_iterm_infos[] = {
CFG_ITERM(kcfg_pipeLengthML1, kcfgt_float, "35.5"), // CFG_ITERM(kcfg_pipeLengthML1, kcfgt_float, "35.5"), //
CFG_ITERM(kcfg_pipeLengthML2, kcfgt_float, "35.5"), // CFG_ITERM(kcfg_pipeLengthML2, kcfgt_float, "35.5"), //
CFG_ITERM(kcfg_pipeLengthML3, kcfgt_float, "35.5"), // CFG_ITERM(kcfg_pipeLengthML3, kcfgt_float, "35.5"), //
//
CFG_ITERM(kcfg_m0irun, kcfgt_int32, "22"), //
CFG_ITERM(kcfg_m1irun, kcfgt_int32, "22"), //
CFG_ITERM(kcfg_m2irun, kcfgt_int32, "22"), //
CFG_ITERM(kcfg_m3irun, kcfgt_int32, "22"), //
CFG_ITERM(kcfg_bleClientName, kcfgt_str, " "),
/***********************************************************************************************************************
* *
***********************************************************************************************************************/
CFG_ITERM(kcfg_recordNum, kcfgt_int32, "0"), //
CFG_ITERM(kcfg_grantAcidName0, kcfgt_str, ""), //
CFG_ITERM(kcfg_getAcidUsr0, kcfgt_str, ""), //
CFG_ITERM(kcfg_usrAcidChooseName0, kcfgt_str, ""), //
CFG_ITERM(kcfg_usrAcidCapacityLimite0, kcfgt_str, ""), //
CFG_ITERM(kcfg_grantAcidName1, kcfgt_str, ""), //
CFG_ITERM(kcfg_getAcidUsr1, kcfgt_str, ""), //
CFG_ITERM(kcfg_usrAcidChooseName1, kcfgt_str, ""), //
CFG_ITERM(kcfg_usrAcidCapacityLimite1, kcfgt_str, ""), //
CFG_ITERM(kcfg_grantAcidName2, kcfgt_str, ""), //
CFG_ITERM(kcfg_getAcidUsr2, kcfgt_str, ""), //
CFG_ITERM(kcfg_usrAcidChooseName2, kcfgt_str, ""), //
CFG_ITERM(kcfg_usrAcidCapacityLimite2, kcfgt_str, ""), //
CFG_ITERM(kcfg_grantAcidName3, kcfgt_str, ""), //
CFG_ITERM(kcfg_getAcidUsr3, kcfgt_str, ""), //
CFG_ITERM(kcfg_usrAcidChooseName3, kcfgt_str, ""), //
CFG_ITERM(kcfg_usrAcidCapacityLimite3, kcfgt_str, ""), //
CFG_ITERM(kcfg_grantAcidName4, kcfgt_str, ""), //
CFG_ITERM(kcfg_getAcidUsr4, kcfgt_str, ""), //
CFG_ITERM(kcfg_usrAcidChooseName4, kcfgt_str, ""), //
CFG_ITERM(kcfg_usrAcidCapacityLimite4, kcfgt_str, ""), //
CFG_ITERM(kcfg_grantAcidName5, kcfgt_str, ""), //
CFG_ITERM(kcfg_getAcidUsr5, kcfgt_str, ""), //
CFG_ITERM(kcfg_usrAcidChooseName5, kcfgt_str, ""), //
CFG_ITERM(kcfg_usrAcidCapacityLimite5, kcfgt_str, ""), //
}; };
const char *cfgName(int32_t index) { const char *cfgName(int32_t index) {

2
uappbase/service/config_index.hpp

@ -19,7 +19,7 @@ typedef struct {
const char *initval; const char *initval;
} cfg_iterm_info_t; } cfg_iterm_info_t;
#define CFG_MAX_INDEX 104
#define CFG_MAX_INDEX 89
const char *cfgName(int32_t index); const char *cfgName(int32_t index);
cfg_iterm_type_t cfgType(int32_t index); cfg_iterm_type_t cfgType(int32_t index);

2
uappbase/service/config_service.cpp

@ -3,7 +3,7 @@
#include "uappbase\service\app_event_bus.hpp" #include "uappbase\service\app_event_bus.hpp"
// //
#define CFG_HEADER 0x12345672
#define CFG_HEADER 0x12345676
/** /**
* @brief CFG内存使用 * @brief CFG内存使用
* *

8
uappbase/service/config_service_utils.cpp

@ -4,7 +4,7 @@ namespace iflytop {
float getPumpAppendMl(int chid) { float getPumpAppendMl(int chid) {
switch (chid) { switch (chid) {
case 0: case 0:
return CH0APPENDML; //
return CH0APPENDML; //
case 1: case 1:
return CH1APPENDML; return CH1APPENDML;
case 2: case 2:
@ -194,6 +194,12 @@ const char* getPasswd(const char* usrname, CfgItermCache* cache) {
memcpy(cache, &cfgcache, sizeof(CfgItermCache)); memcpy(cache, &cfgcache, sizeof(CfgItermCache));
return cache->buf; return cache->buf;
} }
if (strcmp(usrname, getCfgStr(kusr_name6)) == 0) {
getCfgStr(kusr_passwd6);
memcpy(cache, &cfgcache, sizeof(CfgItermCache));
return cache->buf;
}
return NULL; return NULL;
} }

1104
ui/ui.h
File diff suppressed because it is too large
View File

4
ui/usrui.h

@ -1,4 +1,4 @@
#pragma once #pragma once
#define pic_jog_mode 26
#define pic_continuous_mode 27
#define pic_jog_mode 27
#define pic_continuous_mode 28

3
usrc/service/app_core.cpp

@ -90,8 +90,9 @@ void AppCore::appsetup() {
Page_muSettings::ins()->initialize(); Page_muSettings::ins()->initialize();
Page_muUsrMgr::ins()->initialize(); Page_muUsrMgr::ins()->initialize();
Page_muDeviceInfo::ins()->initialize(); Page_muDeviceInfo::ins()->initialize();
Page_muAudit::ins()->initialize();
// Page_muAudit::ins()->initialize();
Page_muGetAcidMgr::ins()->initialize(); Page_muGetAcidMgr::ins()->initialize();
Page_muGetAcidRcord::ins()->initialize();
Page_muPumpTest::ins()->initialize(); Page_muPumpTest::ins()->initialize();
// EventProcesser // EventProcesser
Page_muPumpSett::ins()->initialize(); Page_muPumpSett::ins()->initialize();

4
usrc/service/page/Page_login.cpp

@ -8,7 +8,7 @@ using namespace iflytop;
#define OBJ(name) ob_login_##name #define OBJ(name) ob_login_##name
#define TAG "Page_login" #define TAG "Page_login"
static CfgItermCache cfgcache; static CfgItermCache cfgcache;
// UIS->sendcmd("p[%d].b[%d].picc=%d", PAGE, OBJ(txtUser##i), 2);
#define EN_USR(i, enable) \ #define EN_USR(i, enable) \
if (enable) { \ if (enable) { \
UIS->setTxt(PAGE, OBJ(txtUser##i), usrName[i]); \ UIS->setTxt(PAGE, OBJ(txtUser##i), usrName[i]); \
@ -52,6 +52,8 @@ void Page_login::OnPageLoad(OnPageLoadContext* cxt) {
UIS->setTxt(PAGE, OBJ(cUsrName), getCfgStr((config_index_t)(kusr_name0))); UIS->setTxt(PAGE, OBJ(cUsrName), getCfgStr((config_index_t)(kusr_name0)));
UIS->setTxt(PAGE, OBJ(txtPasswd), ""); UIS->setTxt(PAGE, OBJ(txtPasswd), "");
} }
UIS->sendcmd("click m0,0");
} }
void Page_login::OnInputFieldContentChange(uint8_t bid, const char* text) { void Page_login::OnInputFieldContentChange(uint8_t bid, const char* text) {
if (bid == OBJ(txtPasswd)) { if (bid == OBJ(txtPasswd)) {

2
usrc/service/page/page.hpp

@ -9,11 +9,13 @@
#include "submenu/Page_muAudit.hpp" #include "submenu/Page_muAudit.hpp"
#include "submenu/Page_muDeviceInfo.hpp" #include "submenu/Page_muDeviceInfo.hpp"
#include "submenu/Page_muGetAcidMgr.hpp" #include "submenu/Page_muGetAcidMgr.hpp"
#include "submenu/Page_muGetAcidRcord.hpp"
#include "submenu/Page_muInterval.hpp" #include "submenu/Page_muInterval.hpp"
#include "submenu/Page_muPumpTest.hpp" #include "submenu/Page_muPumpTest.hpp"
#include "submenu/Page_muSettings.hpp" #include "submenu/Page_muSettings.hpp"
#include "submenu/Page_muUsrMgr.hpp" #include "submenu/Page_muUsrMgr.hpp"
// //
#include "submenu/Page_muBleHandSett.hpp" #include "submenu/Page_muBleHandSett.hpp"
#include "submenu/Page_muMotorSett.hpp" #include "submenu/Page_muMotorSett.hpp"

4
usrc/service/page/submenu/Page_muDeviceInfo.cpp

@ -6,8 +6,8 @@ using namespace iflytop;
#define TAG "Page_muDeviceInfo" #define TAG "Page_muDeviceInfo"
bool Page_muDeviceInfo::isBelongThisPage(int page) { return page == PAGE; } bool Page_muDeviceInfo::isBelongThisPage(int page) { return page == PAGE; }
void Page_muDeviceInfo::OnPageLoad(OnPageLoadContext*cxt) {
UIS->setTxt(PAGE, ob_muDeviceInfo_deviceId, "SN000000");
void Page_muDeviceInfo::OnPageLoad(OnPageLoadContext* cxt) {
UIS->setTxt(PAGE, ob_muDeviceInfo_deviceId, "SN000001");
UIS->setTxt(PAGE, ob_muDeviceInfo_manufa, "Öйú»Æ½ð"); UIS->setTxt(PAGE, ob_muDeviceInfo_manufa, "Öйú»Æ½ð");
UIS->setTxt(PAGE, ob_muDeviceInfo_softVers, APP_VERSION); UIS->setTxt(PAGE, ob_muDeviceInfo_softVers, APP_VERSION);
} }

223
usrc/service/page/submenu/Page_muGetAcidMgr.cpp

@ -1,100 +1,157 @@
#include "Page_muGetAcidMgr.hpp" #include "Page_muGetAcidMgr.hpp"
using namespace iflytop; using namespace iflytop;
#define PAGE pg_muGetAcidMgr
#define OBJ(name) ob_muGetAcidMgr_##name
#define TAG "Page_muGetAcidMgr"
static CfgItermCache cfgcache;
#define PAGE pg_muGetAcidMgr
#define TAG "Page_muGetAcidMgr"
typedef struct {
char usrName[20];
char usr_acid_name[20];
char usr_acid_cap[20];
} usr_acid_record_t;
static uint8_t id;
static const char* fmt(const char* fmt, ...) {
static char buf[128];
va_list args;
va_start(args, fmt);
vsnprintf(buf, sizeof(buf), fmt, args);
va_end(args);
return buf;
}
static CfgItermCache cfgcache;
bool Page_muGetAcidMgr::isBelongThisPage(int page) { return page == PAGE; }
static int32_t num;
static usr_acid_record_t usr;
static char buf[2] = {0x5c, 0x72};
bool Page_muGetAcidMgr::isBelongThisPage(int page) { return page == PAGE; }
void Page_muGetAcidMgr::OnPageLoad(OnPageLoadContext* cxt) { // void Page_muGetAcidMgr::OnPageLoad(OnPageLoadContext* cxt) { //
if (id == 1) {
UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname2, getCfgStr(kcfg_usr2AcidChooseName0));
UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname3, getCfgStr(kcfg_usr2AcidChooseName1));
UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname4, getCfgStr(kcfg_usr2AcidChooseName2));
UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname5, getCfgStr(kcfg_usr2AcidChooseName3));
UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval2, getCfgStr(kcfg_usr2AcidCapacityLimite0));
UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval3, getCfgStr(kcfg_usr2AcidCapacityLimite1));
UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval4, getCfgStr(kcfg_usr2AcidCapacityLimite2));
UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval5, getCfgStr(kcfg_usr2AcidCapacityLimite3));
UIS->sendcmd("b[%d].path=\"\"", ob_muGetAcidMgr_usrName);
if (CS->getBool(kusr_enable2)) {
UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, getCfgStr(kusr_name2));
UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, buf);
}
if (CS->getBool(kusr_enable3)) {
UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, getCfgStr(kusr_name3));
UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, buf);
}
if (CS->getBool(kusr_enable4)) {
UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, getCfgStr(kusr_name4));
UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, buf);
}
if (CS->getBool(kusr_enable5)) {
UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, getCfgStr(kusr_name5));
UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, buf);
}
if (CS->getBool(kusr_enable6)) {
UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, getCfgStr(kusr_name6));
UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, buf);
}
UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname0, usr.usr_acid_name);
UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval0, usr.usr_acid_cap);
if (strcmp(usr.usrName, getCfgStr(kusr_name2)) == 0 || //
strcmp(usr.usrName, getCfgStr(kusr_name3)) == 0 || //
strcmp(usr.usrName, getCfgStr(kusr_name4)) == 0 || //
strcmp(usr.usrName, getCfgStr(kusr_name5)) == 0 || //
strcmp(usr.usrName, getCfgStr(kusr_name6)) == 0) {
UIS->setTxt(PAGE, ob_muGetAcidMgr_usrName, usr.usrName);
} }
// UIS->setTxt(PAGE, ob_muGetAcidMgr_usrName, getCfgStr(kusr_name2));
// UIS->sendcmd("b[%d].path+=%s", ob_muGetAcidMgr_usrName, buf);
// UIS->setTxt(PAGE, ob_muGetAcidMgr_usrName, getCfgStr(kusr_name3), buf);
// UIS->sendcmd("b[%d].path+=%s", ob_muGetAcidMgr_usrName);
// UIS->setTxt(PAGE, ob_muGetAcidMgr_usrName, getCfgStr(kusr_name4), buf);
// UIS->sendcmd("b[%d].path+=%s", ob_muGetAcidMgr_usrName);
// UIS->setTxt(PAGE, ob_muGetAcidMgr_usrName, getCfgStr(kusr_name5), buf);
// UIS->sendcmd("b[%d].path+=%s", ob_muGetAcidMgr_usrName);
// UIS->setTxt(PAGE, ob_muGetAcidMgr_usrName, getCfgStr(kusr_name6), buf);
// UIS->sendcmd("b[%d].path+=%s", ob_muGetAcidMgr_usrName);
}; };
void Page_muGetAcidMgr::OnInputFieldContentChange(uint8_t bid, const char* text) { // void Page_muGetAcidMgr::OnInputFieldContentChange(uint8_t bid, const char* text) { //
if (bid == ob_muGetAcidMgr_usrName) { if (bid == ob_muGetAcidMgr_usrName) {
if (atoi(text) == 1) {
id = 1;
UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname2, getCfgStr(kcfg_usr2AcidChooseName0));
UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname3, getCfgStr(kcfg_usr2AcidChooseName1));
UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname4, getCfgStr(kcfg_usr2AcidChooseName2));
UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname5, getCfgStr(kcfg_usr2AcidChooseName3));
UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval2, getCfgStr(kcfg_usr2AcidCapacityLimite0));
UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval3, getCfgStr(kcfg_usr2AcidCapacityLimite1));
UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval4, getCfgStr(kcfg_usr2AcidCapacityLimite2));
UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval5, getCfgStr(kcfg_usr2AcidCapacityLimite3));
// } else if (atoi(text) == 2) {
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname2, getCfgStr(kcfg_usr3AcidChooseName0));
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname3, getCfgStr(kcfg_usr3AcidChooseName1));
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname4, getCfgStr(kcfg_usr3AcidChooseName2));
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname5, getCfgStr(kcfg_usr3AcidChooseName3));
// } else if (atoi(text) == 3) {
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname2, getCfgStr(kcfg_usr4AcidChooseName0));
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname3, getCfgStr(kcfg_usr4AcidChooseName1));
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname4, getCfgStr(kcfg_usr4AcidChooseName2));
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname5, getCfgStr(kcfg_usr4AcidChooseName3));
// } else if (atoi(text) == 4) {
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname2, getCfgStr(kcfg_usr5AcidChooseName0));
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname3, getCfgStr(kcfg_usr5AcidChooseName1));
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname4, getCfgStr(kcfg_usr5AcidChooseName2));
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname5, getCfgStr(kcfg_usr5AcidChooseName3));
// } else if (atoi(text) == 5) {
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname2, getCfgStr(kcfg_usr6AcidChooseName0));
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname3, getCfgStr(kcfg_usr6AcidChooseName1));
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname4, getCfgStr(kcfg_usr6AcidChooseName2));
// UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname5, getCfgStr(kcfg_usr6AcidChooseName3));
// }
}
usrSwitching(text);
} }
if (id == 1) {
if (bid == ob_muGetAcidMgr_acidname2) {
UIS->setTxt(PAGE, bid, text);
CS->setcfgAndFlush(kcfg_usr2AcidChooseName0, text);
} else if (bid == ob_muGetAcidMgr_acidname3) {
UIS->setTxt(PAGE, bid, text);
CS->setcfgAndFlush(kcfg_usr2AcidChooseName1, text);
} else if (bid == ob_muGetAcidMgr_acidname4) {
UIS->setTxt(PAGE, bid, text);
CS->setcfgAndFlush(kcfg_usr2AcidChooseName2, text);
} else if (bid == ob_muGetAcidMgr_acidname5) {
UIS->setTxt(PAGE, bid, text);
CS->setcfgAndFlush(kcfg_usr2AcidChooseName3, text);
} else if (bid == ob_muGetAcidMgr_acideval2) {
UIS->setTxt(PAGE, bid, text);
CS->setcfgAndFlush(kcfg_usr2AcidCapacityLimite0, text);
} else if (bid == ob_muGetAcidMgr_acideval3) {
CS->setcfgAndFlush(kcfg_usr2AcidCapacityLimite1, text);
} else if (bid == ob_muGetAcidMgr_acideval4) {
CS->setcfgAndFlush(kcfg_usr2AcidCapacityLimite2, text);
} else if (bid == ob_muGetAcidMgr_acideval5) {
CS->setcfgAndFlush(kcfg_usr2AcidCapacityLimite3, text);
if (bid == ob_muGetAcidMgr_acideval0) {
float add_ml = atof(text);
if (add_ml < 0.009) {
UIS->alert("设定值不能小于0");
return;
} else if (add_ml > 5000) {
UIS->alert("设定值不能大于5000");
return;
} }
} }
if (bid == ob_muGetAcidMgr_acidname0) {
UIS->setTxt(PAGE, bid, text);
memcpy(usr.usr_acid_name, text, 20);
} else if (bid == ob_muGetAcidMgr_acideval0) {
UIS->setTxt(PAGE, bid, text);
memcpy(usr.usr_acid_cap, text, 20);
}
} }
void Page_muGetAcidMgr::OnButton(uint8_t bid, uint8_t val) { // void Page_muGetAcidMgr::OnButton(uint8_t bid, uint8_t val) { //
// if (bid == OBJ(bak)) {
// UIS->chpage(GSM->getMenuPage());
// }
};
if (bid == ob_muGetAcidMgr_bak) {
memcpy(usr.usrName, 0, 20);
memcpy(usr.usr_acid_name, 0, 20);
memcpy(usr.usr_acid_cap, 0, 20);
UIS->setVal(PAGE, ob_muGetAcidMgr_choose_flag, 0);
UIS->chpage(GSM->getMenuPage());
}
if (bid == ob_muGetAcidMgr_sure) {
ZLOGI(TAG, "%d", getCfgInt(kcfg_recordNum));
switch (getCfgInt(kcfg_recordNum)) {
case 0:
CS->setcfgAndFlush(kcfg_grantAcidName0, getCfgStr(kusr_name1));
CS->setcfgAndFlush(kcfg_getAcidUsr0, usr.usrName);
CS->setcfgAndFlush(kcfg_usrAcidChooseName0, usr.usr_acid_name);
CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite0, usr.usr_acid_cap);
break;
case 1:
CS->setcfgAndFlush(kcfg_grantAcidName1, getCfgStr(kusr_name1));
CS->setcfgAndFlush(kcfg_getAcidUsr1, usr.usrName);
CS->setcfgAndFlush(kcfg_usrAcidChooseName1, usr.usr_acid_name);
CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite1, usr.usr_acid_cap);
break;
case 2:
CS->setcfgAndFlush(kcfg_grantAcidName2, getCfgStr(kusr_name1));
CS->setcfgAndFlush(kcfg_getAcidUsr2, usr.usrName);
CS->setcfgAndFlush(kcfg_usrAcidChooseName2, usr.usr_acid_name);
CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite2, usr.usr_acid_cap);
break;
case 3:
CS->setcfgAndFlush(kcfg_grantAcidName3, getCfgStr(kusr_name1));
CS->setcfgAndFlush(kcfg_getAcidUsr3, usr.usrName);
CS->setcfgAndFlush(kcfg_usrAcidChooseName3, usr.usr_acid_name);
CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite3, usr.usr_acid_cap);
break;
case 4:
CS->setcfgAndFlush(kcfg_grantAcidName4, getCfgStr(kusr_name1));
CS->setcfgAndFlush(kcfg_getAcidUsr4, usr.usrName);
CS->setcfgAndFlush(kcfg_usrAcidChooseName4, usr.usr_acid_name);
CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite4, usr.usr_acid_cap);
break;
}
UIS->confirmNoCancle("领取成功");
num++;
CS->setcfgAndFlush(kcfg_recordNum, num);
}
};
int32_t Page_muGetAcidMgr::getUsrName(uint8_t id) {
switch (id) {}
}
void Page_muGetAcidMgr::usrSwitching(const char* usrname) {
if (strcmp(usrname, getCfgStr(kusr_name2)) == 0) {
memcpy(usr.usrName, usrname, 20);
} else if (strcmp(usrname, getCfgStr(kusr_name3)) == 0) {
memcpy(usr.usrName, usrname, 20);
} else if (strcmp(usrname, getCfgStr(kusr_name4)) == 0) {
memcpy(usr.usrName, usrname, 20);
} else if (strcmp(usrname, getCfgStr(kusr_name5)) == 0) {
memcpy(usr.usrName, usrname, 20);
} else if (strcmp(usrname, getCfgStr(kusr_name6)) == 0) {
memcpy(usr.usrName, usrname, 20);
}
if (strcmp(usrname, "未选择") != 0) {
UIS->setVal(PAGE, ob_muGetAcidMgr_choose_flag, 1);
}
}

4
usrc/service/page/submenu/Page_muGetAcidMgr.hpp

@ -21,5 +21,9 @@ class Page_muGetAcidMgr : public IPageProcesser {
virtual void OnPageLoad(OnPageLoadContext* cxt) override; virtual void OnPageLoad(OnPageLoadContext* cxt) override;
virtual void OnInputFieldContentChange(uint8_t bid, const char* text) override; virtual void OnInputFieldContentChange(uint8_t bid, const char* text) override;
virtual void OnButton(uint8_t bid, uint8_t val) override; virtual void OnButton(uint8_t bid, uint8_t val) override;
private:
int32_t getUsrName(uint8_t id);
void usrSwitching(const char* usrname);
}; };
} // namespace iflytop } // namespace iflytop

98
usrc/service/page/submenu/Page_muGetAcidRcord.cpp

@ -0,0 +1,98 @@
#include "Page_muGetAcidRcord.hpp"
using namespace iflytop;
#define PAGE pg_muGetAcidRcod
#define TAG "Page_muGetAcidRcord"
typedef struct {
char usrName[20];
int32_t usr_acid_name[5];
int32_t usr_acid_cap[5];
} usr_acid_record_t;
static const char* fmt(const char* fmt, ...) {
static char buf[128];
va_list args;
va_start(args, fmt);
vsnprintf(buf, sizeof(buf), fmt, args);
va_end(args);
return buf;
}
static CfgItermCache cfgcache;
static int32_t id;
static usr_acid_record_t usr;
static char buf[2] = {0x5c, 0x72}; // "\r"
bool Page_muGetAcidRcord::isBelongThisPage(int page) { return page == PAGE; }
void Page_muGetAcidRcord::OnPageLoad(OnPageLoadContext* cxt) { //
UIS->setTxt(PAGE, ob_muGetAcidRcod_name0, getCfgStr(kcfg_grantAcidName0));
UIS->setTxt(PAGE, ob_muGetAcidRcod_usrname0, getCfgStr(kcfg_getAcidUsr0));
UIS->setTxt(PAGE, ob_muGetAcidRcod_acidname0, getCfgStr(kcfg_usrAcidChooseName0));
UIS->setTxt(PAGE, ob_muGetAcidRcod_acideval0, getCfgStr(kcfg_usrAcidCapacityLimite0));
UIS->setTxt(PAGE, ob_muGetAcidRcod_name1, getCfgStr(kcfg_grantAcidName1));
UIS->setTxt(PAGE, ob_muGetAcidRcod_usrname1, getCfgStr(kcfg_getAcidUsr1));
UIS->setTxt(PAGE, ob_muGetAcidRcod_acidname1, getCfgStr(kcfg_usrAcidChooseName1));
UIS->setTxt(PAGE, ob_muGetAcidRcod_acideval1, getCfgStr(kcfg_usrAcidCapacityLimite1));
UIS->setTxt(PAGE, ob_muGetAcidRcod_name2, getCfgStr(kcfg_grantAcidName2));
UIS->setTxt(PAGE, ob_muGetAcidRcod_usrname2, getCfgStr(kcfg_getAcidUsr2));
UIS->setTxt(PAGE, ob_muGetAcidRcod_acidname2, getCfgStr(kcfg_usrAcidChooseName2));
UIS->setTxt(PAGE, ob_muGetAcidRcod_acideval2, getCfgStr(kcfg_usrAcidCapacityLimite2));
UIS->setTxt(PAGE, ob_muGetAcidRcod_name3, getCfgStr(kcfg_grantAcidName3));
UIS->setTxt(PAGE, ob_muGetAcidRcod_usrname3, getCfgStr(kcfg_getAcidUsr3));
UIS->setTxt(PAGE, ob_muGetAcidRcod_acidname3, getCfgStr(kcfg_usrAcidChooseName3));
UIS->setTxt(PAGE, ob_muGetAcidRcod_acideval3, getCfgStr(kcfg_usrAcidCapacityLimite3));
UIS->setTxt(PAGE, ob_muGetAcidRcod_name4, getCfgStr(kcfg_grantAcidName4));
UIS->setTxt(PAGE, ob_muGetAcidRcod_usrname4, getCfgStr(kcfg_getAcidUsr4));
UIS->setTxt(PAGE, ob_muGetAcidRcod_acidname4, getCfgStr(kcfg_usrAcidChooseName4));
UIS->setTxt(PAGE, ob_muGetAcidRcod_acideval4, getCfgStr(kcfg_usrAcidCapacityLimite4));
}
void Page_muGetAcidRcord::OnInputFieldContentChange(uint8_t bid, const char* text) { //
}
void Page_muGetAcidRcord::OnButton(uint8_t bid, uint8_t val) { //
if (bid == ob_muGetAcidRcod_bak) {
UIS->chpage(GSM->getMenuPage());
}
if (bid == ob_muGetAcidRcod_clear) {
UIS->alertNoConfirm("Çå³ýÖÐ....");
CS->setcfgAndFlush(kcfg_recordNum, "0");
CS->setcfgAndFlush(kcfg_grantAcidName0, "");
CS->setcfgAndFlush(kcfg_getAcidUsr0, "");
CS->setcfgAndFlush(kcfg_usrAcidChooseName0, "");
CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite0, "");
CS->setcfgAndFlush(kcfg_grantAcidName1, "");
CS->setcfgAndFlush(kcfg_getAcidUsr1, "");
CS->setcfgAndFlush(kcfg_usrAcidChooseName1, "");
CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite1, "");
CS->setcfgAndFlush(kcfg_grantAcidName2, "");
CS->setcfgAndFlush(kcfg_getAcidUsr2, "");
CS->setcfgAndFlush(kcfg_usrAcidChooseName2, "");
CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite2, "");
CS->setcfgAndFlush(kcfg_grantAcidName3, "");
CS->setcfgAndFlush(kcfg_getAcidUsr3, "");
CS->setcfgAndFlush(kcfg_usrAcidChooseName3, "");
CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite3, "");
CS->setcfgAndFlush(kcfg_grantAcidName4, "");
CS->setcfgAndFlush(kcfg_getAcidUsr4, "");
CS->setcfgAndFlush(kcfg_usrAcidChooseName4, "");
CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite4, "");
CS->setcfgAndFlush(kcfg_grantAcidName5, "");
CS->setcfgAndFlush(kcfg_getAcidUsr5, "");
CS->setcfgAndFlush(kcfg_usrAcidChooseName5, "");
CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite5, "");
UIS->chpage(pg_muGetAcidRcod);
UIS->sendcmd("sendme");
}
};

25
usrc/service/page/submenu/Page_muGetAcidRcord.hpp

@ -0,0 +1,25 @@
#pragma once
//
#include "../page_processer.hpp"
namespace iflytop {
using namespace std;
// page: keybAcidCh
class Page_muGetAcidRcord : public IPageProcesser {
private:
/* data */
public:
static Page_muGetAcidRcord* ins() {
static Page_muGetAcidRcord instance;
return &instance;
}
private:
virtual bool isBelongThisPage(int page) override;
virtual void OnPageLoad(OnPageLoadContext* cxt) override;
virtual void OnInputFieldContentChange(uint8_t bid, const char* text) override;
virtual void OnButton(uint8_t bid, uint8_t val) override;
};
} // namespace iflytop

7
usrc/service/pump_ctrl_service.cpp

@ -33,7 +33,7 @@ void PumpCtrlService::initialize() {
} }
} }
}); });
m_monitor_thread.init("PumpCtrlServiceMonitor", 1024);
m_monitor_thread.init("PumpCtrlServiceMonitor", 1024);
m_monitor_thread.start([this]() { m_monitor_thread.start([this]() {
for (size_t i = 0; i < 4; i++) { for (size_t i = 0; i < 4; i++) {
TMC51X0* motor = m_motors[i]; TMC51X0* motor = m_motors[i];
@ -76,7 +76,6 @@ m_monitor_thread.init("PumpCtrlServiceMonitor", 1024);
} }
} }
}); });
} }
#define WAIT_FOR_MOTOR_STOP() \ #define WAIT_FOR_MOTOR_STOP() \
@ -245,11 +244,11 @@ void PumpCtrlService::rotate(int32_t mid, int32_t direction) {
ZLOGE(TAG, "rotate fail, PumpCtrlService isWorking"); ZLOGE(TAG, "rotate fail, PumpCtrlService isWorking");
return; return;
} }
tryUpdateMotorSetting();
ValveStateSyncService::ins()->setValveState(1); ValveStateSyncService::ins()->setValveState(1);
TMC51X0* cur_motor = m_motors[mid]; TMC51X0* cur_motor = m_motors[mid];
// cur_motor->rotate(direction > 0 ? getMxRunRPM(mid) : -getMxRunRPM(mid)); // cur_motor->rotate(direction > 0 ? getMxRunRPM(mid) : -getMxRunRPM(mid));
cur_motor->moveToEnd(direction > 0 ? 1 : -1,getMxRunRPM(mid));
cur_motor->moveToEnd(direction > 0 ? 1 : -1, getMxRunRPM(mid));
} }
void PumpCtrlService::stopRotate() { void PumpCtrlService::stopRotate() {
if (isWorking()) { if (isWorking()) {

Loading…
Cancel
Save