Browse Source

stabilization version

sunlight
sunlight 9 months ago
parent
commit
ddc1e8c113
  1. 10616
      release/V200/hand_acid_mainboard.hex
  2. BIN
      release/V200/hand_acid_mainboard_ui upadte.HMI
  3. BIN
      release/V200/hand_acid_mainboard_ui upadte.tft
  4. 11
      uappbase/appcfg/appcfg.hpp
  5. 34
      uappbase/bean/config_index_enum.hpp
  6. 33
      uappbase/service/config_index.cpp
  7. 2
      uappbase/service/config_index.hpp
  8. 5
      uappbase/service/config_service_utils.cpp
  9. 4
      ui/usrui.h
  10. 2
      usrc/service/app_core.cpp
  11. 17
      usrc/service/page/Page_login.cpp
  12. 3
      usrc/service/page/page.hpp
  13. 157
      usrc/service/page/submenu/Page_muGetAcidMgr.cpp
  14. 29
      usrc/service/page/submenu/Page_muGetAcidMgr.hpp
  15. 98
      usrc/service/page/submenu/Page_muGetAcidRcord.cpp
  16. 25
      usrc/service/page/submenu/Page_muGetAcidRcord.hpp
  17. 15
      usrc/service/page/submenu/Page_muUsrMgr.cpp
  18. 1
      usrc/service/pump_ctrl_service.cpp

10616
release/V200/hand_acid_mainboard.hex
File diff suppressed because it is too large
View File

BIN
release/V200/hand_acid_mainboard_ui upadte.HMI

BIN
release/V200/hand_acid_mainboard_ui upadte.tft

11
uappbase/appcfg/appcfg.hpp

@ -41,12 +41,11 @@
* *
***********************************************************************************************************************/
#define USER0_DEFAULT_NAME "管理员"
#define USER1_DEFAULT_NAME "仓库员"
#define USER2_DEFAULT_NAME "用户1"
#define USER3_DEFAULT_NAME "用户2"
#define USER4_DEFAULT_NAME "用户3"
#define USER5_DEFAULT_NAME "用户4"
#define USER6_DEFAULT_NAME "用户5"
#define USER1_DEFAULT_NAME "用户1"
#define USER2_DEFAULT_NAME "用户2"
#define USER3_DEFAULT_NAME "用户3"
#define USER4_DEFAULT_NAME "用户4"
#define USER5_DEFAULT_NAME "用户5"
#define USER_DEFAULT_PWD "888888"

34
uappbase/bean/config_index_enum.hpp

@ -23,9 +23,6 @@ typedef enum {
kusr_name5, // 用户5名字
kusr_enable5, // 用户5是否使能
kusr_passwd5, // 用户5密码
kusr_name6, // 用户6名字
kusr_enable6, // 用户6是否使能
kusr_passwd6, // 用户6密码
/***********************************************************************************************************************
* *
@ -97,37 +94,6 @@ typedef enum {
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,
} config_index_t;

33
uappbase/service/config_index.cpp

@ -32,10 +32,6 @@ static cfg_iterm_info_t cfg_iterm_infos[] = {
CFG_ITERM(kusr_enable5, kcfgt_bool, "false"), //
CFG_ITERM(kusr_passwd5, kcfgt_str, USER_DEFAULT_PWD), //
CFG_ITERM(kusr_name6, kcfgt_str, USER6_DEFAULT_NAME), //
CFG_ITERM(kusr_enable6, kcfgt_bool, "false"), //
CFG_ITERM(kusr_passwd6, kcfgt_str, USER_DEFAULT_PWD), //
/***********************************************************************************************************************
* ËáÒºÔ¤ÉèÃû³Æ *
***********************************************************************************************************************/
@ -116,35 +112,6 @@ static cfg_iterm_info_t cfg_iterm_infos[] = {
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, ""), //
};

2
uappbase/service/config_index.hpp

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

5
uappbase/service/config_service_utils.cpp

@ -195,11 +195,6 @@ const char* getPasswd(const char* usrname, CfgItermCache* cache) {
return cache->buf;
}
if (strcmp(usrname, getCfgStr(kusr_name6)) == 0) {
getCfgStr(kusr_passwd6);
memcpy(cache, &cfgcache, sizeof(CfgItermCache));
return cache->buf;
}
return NULL;
}

4
ui/usrui.h

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

2
usrc/service/app_core.cpp

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

17
usrc/service/page/Page_login.cpp

@ -22,11 +22,11 @@ bool Page_login::isBelongThisPage(int page) { return page == PAGE; }
void Page_login::OnPageLoad(OnPageLoadContext* cxt) {
static int enusrNum;
static char usrName[7][20];
static char usrName[6][20];
memset(usrName, 0, sizeof(usrName));
enusrNum = 0;
for (size_t i = 0; i < 7; i++) {
for (size_t i = 0; i < 6; i++) {
bool usrEn = CS->getBool((config_index_t)(kusr_enable0 + 3 * i));
if (usrEn) {
static_assert((kusr_name1 - kusr_name0) == 3);
@ -45,7 +45,6 @@ void Page_login::OnPageLoad(OnPageLoadContext* cxt) {
EN_USR(3, enusrNum >= 4);
EN_USR(4, enusrNum >= 5);
EN_USR(5, enusrNum >= 6);
EN_USR(6, enusrNum >= 7);
if (!cxt->isFromPopWin) {
UIS->setVal(PAGE, OBJ(chooseUsr), (int32_t)0);
@ -88,21 +87,13 @@ void Page_login::OnLoginButtonClick(uint8_t bid, const char* userName, const cha
if (strcmp(userName, getCfgStr(kusr_name0)) == 0) {
ZLOGI(TAG, "%s(admin) login success ", userName);
GSM->setLogin(true, false, userName);
} else if (strcmp(userName, getCfgStr(kusr_name1)) == 0) {
ZLOGI(TAG, "%s(Warehourse) login success ", userName);
GSM->setLogin(false, true, userName);
} else {
ZLOGI(TAG, "%s login success ", userName);
GSM->setLogin(false, false, userName);
}
if (GSM->isWarehoure()) {
UIS->chpage(pg_muneWarehouse);
GSM->setMenuPage(pg_muneWarehouse);
} else {
UIS->chpage(pg_main);
GSM->setMenuPage(GSM->isAdmin() ? pg_menuAdmin2 : pg_menuUsr);
}
UIS->chpage(pg_main);
GSM->setMenuPage(GSM->isAdmin() ? pg_menuAdmin2 : pg_menuUsr);
return;
}

3
usrc/service/page/page.hpp

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

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

@ -1,157 +0,0 @@
#include "Page_muGetAcidMgr.hpp"
using namespace iflytop;
#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 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 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) { //
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);
}
};
void Page_muGetAcidMgr::OnInputFieldContentChange(uint8_t bid, const char* text) { //
if (bid == ob_muGetAcidMgr_usrName) {
usrSwitching(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) { //
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);
}
}

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

@ -1,29 +0,0 @@
#pragma once
//
#include "../page_processer.hpp"
namespace iflytop {
using namespace std;
// page: keybAcidCh
class Page_muGetAcidMgr : public IPageProcesser {
private:
/* data */
public:
static Page_muGetAcidMgr* ins() {
static Page_muGetAcidMgr 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;
private:
int32_t getUsrName(uint8_t id);
void usrSwitching(const char* usrname);
};
} // namespace iflytop

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

@ -1,98 +0,0 @@
#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

@ -1,25 +0,0 @@
#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

15
usrc/service/page/submenu/Page_muUsrMgr.cpp

@ -23,14 +23,12 @@ void Page_muUsrMgr::updatePage() {
UIS->setTxt(PAGE, ob_muUsrMgr_usr3name, getCfgStr(kusr_name3));
UIS->setTxt(PAGE, ob_muUsrMgr_usr4name, getCfgStr(kusr_name4));
UIS->setTxt(PAGE, ob_muUsrMgr_usr5name, getCfgStr(kusr_name5));
UIS->setTxt(PAGE, ob_muUsrMgr_usr6name, getCfgStr(kusr_name6));
// UIS->setVal(PAGE, ob_muUsrMgr_usr1en, (int)getCfgBool(kusr_enable1));
UIS->setVal(PAGE, ob_muUsrMgr_usr2en, (int)getCfgBool(kusr_enable2));
UIS->setVal(PAGE, ob_muUsrMgr_usr3en, (int)getCfgBool(kusr_enable3));
UIS->setVal(PAGE, ob_muUsrMgr_usr4en, (int)getCfgBool(kusr_enable4));
UIS->setVal(PAGE, ob_muUsrMgr_usr5en, (int)getCfgBool(kusr_enable5));
UIS->setVal(PAGE, ob_muUsrMgr_usr6en, (int)getCfgBool(kusr_enable6));
}
void Page_muUsrMgr::OnInputFieldContentChange(uint8_t bid, const char* text) {
@ -58,10 +56,6 @@ void Page_muUsrMgr::OnInputFieldContentChange(uint8_t bid, const char* text) {
ZLOGI(TAG, "rename usr5:%s", text);
CS->setcfgAndFlush(kusr_name5, text);
updatePage();
} else if (bid == ob_muUsrMgr_usr6ReName) {
ZLOGI(TAG, "rename usr6:%s", text);
CS->setcfgAndFlush(kusr_name6, text);
updatePage();
}
}
@ -96,11 +90,6 @@ void Page_muUsrMgr::OnButton(uint8_t bid, uint8_t val) {
CS->setcfgAndFlush(kusr_name5, USER5_DEFAULT_NAME);
CS->setcfgAndFlush(kusr_passwd5, USER_DEFAULT_PWD);
updatePage();
} else if (bid == ob_muUsrMgr_usr6Rest) {
ZLOGI(TAG, "reset usr5 ");
CS->setcfgAndFlush(kusr_name6, USER5_DEFAULT_NAME);
CS->setcfgAndFlush(kusr_passwd6, USER_DEFAULT_PWD);
updatePage();
}
// }
// else if (bid == ob_muUsrMgr_usr1en) {
@ -124,10 +113,6 @@ void Page_muUsrMgr::OnButton(uint8_t bid, uint8_t val) {
ZLOGI(TAG, "enable usr5 %d", val);
CS->setcfgAndFlush(kusr_enable5, (bool)val);
updatePage();
} else if (bid == ob_muUsrMgr_usr6en) {
ZLOGI(TAG, "enable usr6 %d", val);
CS->setcfgAndFlush(kusr_enable6, (bool)val);
updatePage();
}
};

1
usrc/service/pump_ctrl_service.cpp

@ -279,6 +279,7 @@ void PumpCtrlService::setCurrentPosAsZero(int32_t mid) {
return;
}
m_motors[mid]->setXACTUAL(0);
m_motors[mid]->moveTo(0, getMxRunRPM(mid));
}
void PumpCtrlService::doMotorsMoveByOnce() {

Loading…
Cancel
Save