p_chinagoldgroup_hand_acid
/
hand_acid_mainboard_bak
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

sunlight
zhaohe 11 months ago
parent
90d365a1a4
commit
4df0d232ee
16 changed files with 132 additions and 125 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .settings/language.settings.xml
  2. 5
      README.md
  3. 8
      usrc/service/front_end_controler.cpp
  4. 10
      usrc/service/front_end_controler.hpp
  5. 16
      usrc/service/page/Page_login.cpp
  6. 34
      usrc/service/page/Page_main.cpp
  7. 30
      usrc/service/page/keyboard/Page_keybAcidCh.cpp
  8. 12
      usrc/service/page/submenu/Page_changePasswd.cpp
  9. 32
      usrc/service/page/submenu/Page_muAcidType.cpp
  10. 6
      usrc/service/page/submenu/Page_muDeviceInfo.cpp
  11. 8
      usrc/service/page/submenu/Page_muInterval.cpp
  12. 12
      usrc/service/page/submenu/Page_muPumpTest.cpp
  13. 2
      usrc/service/page/submenu/Page_muPumpTest.hpp
  14. 58
      usrc/service/page/submenu/Page_muSettings.cpp
  15. 12
      usrc/service/page/submenu/Page_muUsrMgr.cpp
  16. 8
      usrc/service/pump_ctrl_service.cpp

4
.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<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.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1198437934552552923" 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="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">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
@ -16,7 +16,7 @@
<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.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1182943701957397996" 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="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">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>

5
README.md
View File

@ -17,9 +17,8 @@
TODO:
6. 输入超过10次错误密码后，弹出提示框，请等待24小时，24小时后，页面将自动切换到恢复出厂设置页面。
1. 输入超过10次错误密码后，弹出提示框，请等待24小时，24小时后，页面将自动切换到恢复出厂设置页面。
2. 修改测试页面，pumpId选择框下发的指令为val的数值，专门的事件，而不是text
```

8
usrc/service/front_end_controler.cpp
View File

@ -107,10 +107,12 @@ void FrontEndControler::startSchedule() {
m_lastPage = m_nowPage;
m_nowPage = packet.data[1];
}
event_cache.d.sys_event_page_id.isFromPopWin = m_isInPopWin;
callUsrEventCb(&event_cache);
#if MODULE_DEBUG
ZLOGD(TAG, "page change from %d to %d frompoppage %d", m_lastPage, m_nowPage, m_isInPopWin);
#endif
callUsrEventCb(&event_cache);
if (input_file_event_cache_state) {
callUsrEventCb(&input_file_event_cache);
input_file_event_cache_state = false;
@ -379,7 +381,7 @@ bool FrontEndControler::readInt(uint8_t pid, uint8_t cId, int32_t* val) {
return true;
}
bool FrontEndControler::setVal(uint8_t pid, uint8_t bid, const char* txt, ...) {
bool FrontEndControler::setTxt(uint8_t pid, uint8_t bid, const char* txt, ...) {
zlock_guard lg(m_cmdlock);
va_list args;

10
usrc/service/front_end_controler.hpp
View File

@ -58,14 +58,12 @@ class FrontEndControler {
bool readTxt(uint8_t pid, uint8_t bid, char* txt, int32_t txtbuflen);
bool readInt(uint8_t pid, uint8_t bid, int32_t* val);
bool setVal(uint8_t pid, uint8_t bid, const char* txt, ...);
bool setVal(uint8_t pid, uint8_t bid, int32_t val);
bool setTxt(uint8_t pid, uint8_t bid, const char* txt, ...);
bool setTxt(uint8_t bid, const char* txt) { return setTxt(m_nowPage, bid, txt); }
bool setVal(uint8_t bid, const char* txt) { return setVal(m_nowPage, bid, txt); }
bool setVal(uint8_t bid, int32_t val) { return setVal(m_nowPage, bid, val); }
// bool setVal(uint16_t buuid, const char* txt) { return setVal(buuid >> 8, buuid & 0xff, txt); }
// bool setVal(uint16_t buuid, int32_t val) { return setVal(buuid >> 8, buuid & 0xff, val); }
bool setVal(uint8_t pid, uint8_t bid, int32_t val);
bool setVal(uint8_t bid, int32_t val) { return setVal(m_nowPage, bid, val); }
bool vis(uint16_t bid, int32_t val); // ²»Ö§³Ö¿çÒ³ÃæÒþ²Ø
// vis b0,0

16
usrc/service/page/Page_login.cpp
View File

@ -11,10 +11,10 @@ static CfgItermCache cfgcache;
#define EN_USR(i, enable) \
if (enable) { \
UIS->setVal(PAGE, OBJ(txtUser##i), usrName[i]); \
UIS->setTxt(PAGE, OBJ(txtUser##i), usrName[i]); \
UIS->setVal(PAGE, OBJ(uen##i), 1); \
} else { \
UIS->setVal(PAGE, OBJ(txtUser##i), ""); \
UIS->setTxt(PAGE, OBJ(txtUser##i), ""); \
UIS->setVal(PAGE, OBJ(uen##i), (int32_t)0); \
}
@ -46,16 +46,16 @@ void Page_login::OnPageLoad(OnPageLoadContext* cxt) {
EN_USR(4, enusrNum >= 5);
EN_USR(5, enusrNum >= 6);
UIS->setVal(PAGE, OBJ(chooseUsr), (int32_t)0);
UIS->setVal(PAGE, OBJ(cUsrName), getCfgStr((config_index_t)(kusr_name0)));
UIS->setTxt(PAGE, OBJ(chooseUsr), (int32_t)0);
UIS->setTxt(PAGE, OBJ(cUsrName), getCfgStr((config_index_t)(kusr_name0)));
if (!cxt->isFromPopWin) {
UIS->setVal(PAGE, OBJ(txtPasswd), "");
UIS->setTxt(PAGE, OBJ(txtPasswd), "");
}
}
void Page_login::OnInputFieldContentChange(uint8_t bid, const char* text) {
if (bid == OBJ(txtPasswd)) {
UIS->setVal(PAGE, bid, text);
UIS->setTxt(PAGE, bid, text);
UIS->virtualClick(PAGE, OBJ(blogin), 0); // 触发一次登录按钮虚拟点击事件
}
}
@ -67,12 +67,12 @@ void Page_login::OnLoginButtonClick(uint8_t bid, const char* userName, const cha
ZLOGI(TAG, "try login %s %s", userName, passwd);
const char* curUsrPasswd = getPasswd(userName, &passwdcfgcache);
if (!curUsrPasswd) {
UIS->setVal(PAGE, OBJ(txtPasswd), "");
UIS->setTxt(PAGE, OBJ(txtPasswd), "");
UIS->alert("用户不存在");
return;
}
if (strcmp(curUsrPasswd, passwd) != 0) {
UIS->setVal(PAGE, OBJ(txtPasswd), "");
UIS->setTxt(PAGE, OBJ(txtPasswd), "");
UIS->alert("密码错误");
return;
}

34
usrc/service/page/Page_main.cpp
View File

@ -35,7 +35,7 @@ void Page_main::updateRunModeState() {
} else {
UIS->vis(ob_main_RunModeVal, 1);
UIS->vis(ob_main_RunModeValUint, 1);
UIS->setVal(PAGE, ob_main_RunModeVal, CS->getStr(kcfg_distrInterval, &cfgcache)); // 加酸间隔状态更新
UIS->setTxt(PAGE, ob_main_RunModeVal, CS->getStr(kcfg_distrInterval, &cfgcache)); // 加酸间隔状态更新
}
}
@ -58,15 +58,15 @@ void Page_main::OnPageLoad(OnPageLoadContext*cxt) {
updateRunModeState();
// 更新酸液种类
UIS->setVal(PAGE, ob_main_acidname0, CS->getStr(kcfg_acidChooseName0, &cfgcache));
UIS->setVal(PAGE, ob_main_acidname1, CS->getStr(kcfg_acidChooseName1, &cfgcache));
UIS->setVal(PAGE, ob_main_acidname2, CS->getStr(kcfg_acidChooseName2, &cfgcache));
UIS->setVal(PAGE, ob_main_acidname3, CS->getStr(kcfg_acidChooseName3, &cfgcache));
UIS->setTxt(PAGE, ob_main_acidname0, CS->getStr(kcfg_acidChooseName0, &cfgcache));
UIS->setTxt(PAGE, ob_main_acidname1, CS->getStr(kcfg_acidChooseName1, &cfgcache));
UIS->setTxt(PAGE, ob_main_acidname2, CS->getStr(kcfg_acidChooseName2, &cfgcache));
UIS->setTxt(PAGE, ob_main_acidname3, CS->getStr(kcfg_acidChooseName3, &cfgcache));
// 更新加液体积
UIS->setVal(PAGE, ob_main_acideval0, CS->getStr(kcfg_acideval0, &cfgcache));
UIS->setVal(PAGE, ob_main_acideval1, CS->getStr(kcfg_acideval1, &cfgcache));
UIS->setVal(PAGE, ob_main_acideval2, CS->getStr(kcfg_acideval2, &cfgcache));
UIS->setVal(PAGE, ob_main_acideval3, CS->getStr(kcfg_acideval3, &cfgcache));
UIS->setTxt(PAGE, ob_main_acideval0, CS->getStr(kcfg_acideval0, &cfgcache));
UIS->setTxt(PAGE, ob_main_acideval1, CS->getStr(kcfg_acideval1, &cfgcache));
UIS->setTxt(PAGE, ob_main_acideval2, CS->getStr(kcfg_acideval2, &cfgcache));
UIS->setTxt(PAGE, ob_main_acideval3, CS->getStr(kcfg_acideval3, &cfgcache));
// 更新顶部状态栏
UIS->setEnumComponentState(PAGE, ob_main_AcidState, GSM->getAcidState()); // 酸液锁是否在线
UIS->setAph(PAGE, ob_main_AcidState, 0); // 暂时隐藏掉Aph
@ -78,8 +78,8 @@ void Page_main::OnPageLoad(OnPageLoadContext*cxt) {
UIS->setVal(PAGE, ob_main_acidch3, GSM->getPumpSelectState(3));
// 时间位置暂时显示版本号
UIS->setVal(PAGE, ob_main_clock, "");
// UIS->setVal(PAGE, ob_main_clock, "版本:%s", APP_VERSION);
UIS->setTxt(PAGE, ob_main_clock, "");
// UIS->setTxt(PAGE, ob_main_clock, "版本:%s", APP_VERSION);
// 根据当前登录用户设置菜单页面
}
@ -111,19 +111,19 @@ void Page_main::OnInputFieldContentChange(uint8_t bid, const char* text) {
else if (bid == ob_main_acidname0) {
ZLOGI(TAG, "acidname0:%s", text);
CS->setcfgAndFlush(kcfg_acidChooseName0, text);
UIS->setVal(PAGE, bid, text);
UIS->setTxt(PAGE, bid, text);
} else if (bid == ob_main_acidname1) {
ZLOGI(TAG, "acidname1:%s", text);
CS->setcfgAndFlush(kcfg_acidChooseName1, text);
UIS->setVal(PAGE, bid, text);
UIS->setTxt(PAGE, bid, text);
} else if (bid == ob_main_acidname2) {
ZLOGI(TAG, "acidname2:%s", text);
CS->setcfgAndFlush(kcfg_acidChooseName2, text);
UIS->setVal(PAGE, bid, text);
UIS->setTxt(PAGE, bid, text);
} else if (bid == ob_main_acidname3) {
ZLOGI(TAG, "acidname3:%s", text);
CS->setcfgAndFlush(kcfg_acidChooseName3, text);
UIS->setVal(PAGE, bid, text);
UIS->setTxt(PAGE, bid, text);
}
// 设置加酸间隔
@ -138,7 +138,7 @@ void Page_main::OnInputFieldContentChange(uint8_t bid, const char* text) {
UIS->alert("酸液间隔时间不能大于30");
return;
}
UIS->setVal(PAGE, bid, zfmt("%.1f", distrIntervalSecond));
UIS->setTxt(PAGE, bid, zfmt("%.1f", distrIntervalSecond));
CS->setcfgAndFlush(kcfg_distrInterval, zfmt("%.1f", distrIntervalSecond));
}
}
@ -180,6 +180,6 @@ void Page_main::processAcidevalUpdateEvent(uint8_t bid, const char* text, int ch
char reformattext[20];
sprintf(reformattext, "%.1f", add_ml);
ZLOGI(TAG, "set acid ch%d:%s", ch, reformattext);
UIS->setVal(PAGE, bid, reformattext);
UIS->setTxt(PAGE, bid, reformattext);
CS->setcfgAndFlush(cfgid, reformattext); //
}

30
usrc/service/page/keyboard/Page_keybAcidCh.cpp
View File

@ -9,21 +9,21 @@ bool Page_keybAcidCh::isBelongThisPage(int page) { return page == PAGE; }
void Page_keybAcidCh::OnKeyboardPageLoad() {
UIS->setVal(PAGE, OBJ(b0), getCfgStr(kcfg_acidName1));
UIS->setVal(PAGE, OBJ(b1), getCfgStr(kcfg_acidName2));
UIS->setVal(PAGE, OBJ(b2), getCfgStr(kcfg_acidName3));
UIS->setVal(PAGE, OBJ(b3), getCfgStr(kcfg_acidName4));
UIS->setVal(PAGE, OBJ(b4), getCfgStr(kcfg_acidName5));
UIS->setVal(PAGE, OBJ(b5), getCfgStr(kcfg_acidName6));
UIS->setVal(PAGE, OBJ(b6), getCfgStr(kcfg_acidName7));
UIS->setVal(PAGE, OBJ(b7), getCfgStr(kcfg_acidName8));
UIS->setVal(PAGE, OBJ(b8), getCfgStr(kcfg_acidName9));
UIS->setVal(PAGE, OBJ(b9), getCfgStr(kcfg_acidName10));
UIS->setVal(PAGE, OBJ(b10), getCfgStr(kcfg_acidName11));
UIS->setVal(PAGE, OBJ(b11), getCfgStr(kcfg_acidName12));
UIS->setVal(PAGE, OBJ(b12), getCfgStr(kcfg_acidName13));
UIS->setVal(PAGE, OBJ(b13), getCfgStr(kcfg_acidName14));
UIS->setVal(PAGE, OBJ(b14), getCfgStr(kcfg_acidName15));
UIS->setTxt(PAGE, OBJ(b0), getCfgStr(kcfg_acidName1));
UIS->setTxt(PAGE, OBJ(b1), getCfgStr(kcfg_acidName2));
UIS->setTxt(PAGE, OBJ(b2), getCfgStr(kcfg_acidName3));
UIS->setTxt(PAGE, OBJ(b3), getCfgStr(kcfg_acidName4));
UIS->setTxt(PAGE, OBJ(b4), getCfgStr(kcfg_acidName5));
UIS->setTxt(PAGE, OBJ(b5), getCfgStr(kcfg_acidName6));
UIS->setTxt(PAGE, OBJ(b6), getCfgStr(kcfg_acidName7));
UIS->setTxt(PAGE, OBJ(b7), getCfgStr(kcfg_acidName8));
UIS->setTxt(PAGE, OBJ(b8), getCfgStr(kcfg_acidName9));
UIS->setTxt(PAGE, OBJ(b9), getCfgStr(kcfg_acidName10));
UIS->setTxt(PAGE, OBJ(b10), getCfgStr(kcfg_acidName11));
UIS->setTxt(PAGE, OBJ(b11), getCfgStr(kcfg_acidName12));
UIS->setTxt(PAGE, OBJ(b12), getCfgStr(kcfg_acidName13));
UIS->setTxt(PAGE, OBJ(b13), getCfgStr(kcfg_acidName14));
UIS->setTxt(PAGE, OBJ(b14), getCfgStr(kcfg_acidName15));
return;
};

12
usrc/service/page/submenu/Page_changePasswd.cpp
View File

@ -19,9 +19,9 @@ void Page_changePasswd::OnPageLoad(OnPageLoadContext*cxt) {
memset(confirmPasswdBuf, 0, sizeof(confirmPasswdBuf));
}
UIS->setVal(PAGE, ob_changePasswd_oldPwd, oldpasswdBuf);
UIS->setVal(PAGE, ob_changePasswd_newPwd, newpasswdBuf);
UIS->setVal(PAGE, ob_changePasswd_newPwdCfm, confirmPasswdBuf);
UIS->setTxt(PAGE, ob_changePasswd_oldPwd, oldpasswdBuf);
UIS->setTxt(PAGE, ob_changePasswd_newPwd, newpasswdBuf);
UIS->setTxt(PAGE, ob_changePasswd_newPwdCfm, confirmPasswdBuf);
};
void Page_changePasswd::OnInputFieldContentChange(uint8_t bid, const char* text) {
@ -32,15 +32,15 @@ void Page_changePasswd::OnInputFieldContentChange(uint8_t bid, const char* text)
UIS->alert("旧密码错误");
return;
}
UIS->setVal(PAGE, bid, text);
UIS->setTxt(PAGE, bid, text);
strcpy(oldpasswdBuf, text);
} else if (bid == ob_changePasswd_newPwd) { // 新密码
strcpy(newpasswdBuf, text);
UIS->setVal(PAGE, bid, text);
UIS->setTxt(PAGE, bid, text);
} else if (bid == ob_changePasswd_newPwdCfm) { // 新密码确认
strcpy(confirmPasswdBuf, text);
UIS->setVal(PAGE, bid, text);
UIS->setTxt(PAGE, bid, text);
}
}
void Page_changePasswd::OnButton(uint8_t bid, uint8_t val) {

32
usrc/service/page/submenu/Page_muAcidType.cpp
View File

@ -13,25 +13,25 @@ static CfgItermCache cfgcache;
bool Page_muAcidType::isBelongThisPage(int page) { return page == PAGE; }
void Page_muAcidType::OnPageLoad(OnPageLoadContext*cxt) { //
UIS->setVal(PAGE, OBJ(t1), getCfgStr(kcfg_acidName1));
UIS->setVal(PAGE, OBJ(t2), getCfgStr(kcfg_acidName2));
UIS->setVal(PAGE, OBJ(t3), getCfgStr(kcfg_acidName3));
UIS->setVal(PAGE, OBJ(t4), getCfgStr(kcfg_acidName4));
UIS->setVal(PAGE, OBJ(t5), getCfgStr(kcfg_acidName5));
UIS->setVal(PAGE, OBJ(t6), getCfgStr(kcfg_acidName6));
UIS->setVal(PAGE, OBJ(t7), getCfgStr(kcfg_acidName7));
UIS->setVal(PAGE, OBJ(t8), getCfgStr(kcfg_acidName8));
UIS->setVal(PAGE, OBJ(t9), getCfgStr(kcfg_acidName9));
UIS->setVal(PAGE, OBJ(t10), getCfgStr(kcfg_acidName10));
UIS->setVal(PAGE, OBJ(t11), getCfgStr(kcfg_acidName11));
UIS->setVal(PAGE, OBJ(t12), getCfgStr(kcfg_acidName12));
UIS->setVal(PAGE, OBJ(t13), getCfgStr(kcfg_acidName13));
UIS->setVal(PAGE, OBJ(t14), getCfgStr(kcfg_acidName14));
UIS->setVal(PAGE, OBJ(t15), getCfgStr(kcfg_acidName15));
UIS->setTxt(PAGE, OBJ(t1), getCfgStr(kcfg_acidName1));
UIS->setTxt(PAGE, OBJ(t2), getCfgStr(kcfg_acidName2));
UIS->setTxt(PAGE, OBJ(t3), getCfgStr(kcfg_acidName3));
UIS->setTxt(PAGE, OBJ(t4), getCfgStr(kcfg_acidName4));
UIS->setTxt(PAGE, OBJ(t5), getCfgStr(kcfg_acidName5));
UIS->setTxt(PAGE, OBJ(t6), getCfgStr(kcfg_acidName6));
UIS->setTxt(PAGE, OBJ(t7), getCfgStr(kcfg_acidName7));
UIS->setTxt(PAGE, OBJ(t8), getCfgStr(kcfg_acidName8));
UIS->setTxt(PAGE, OBJ(t9), getCfgStr(kcfg_acidName9));
UIS->setTxt(PAGE, OBJ(t10), getCfgStr(kcfg_acidName10));
UIS->setTxt(PAGE, OBJ(t11), getCfgStr(kcfg_acidName11));
UIS->setTxt(PAGE, OBJ(t12), getCfgStr(kcfg_acidName12));
UIS->setTxt(PAGE, OBJ(t13), getCfgStr(kcfg_acidName13));
UIS->setTxt(PAGE, OBJ(t14), getCfgStr(kcfg_acidName14));
UIS->setTxt(PAGE, OBJ(t15), getCfgStr(kcfg_acidName15));
};
void Page_muAcidType::updateAcidName(uint8_t bid, config_index_t cindex, const char* txt) {
ZLOGI(TAG, "updateAcidName: cindex %d : %s", cindex, txt);
UIS->setVal(PAGE, bid, txt);
UIS->setTxt(PAGE, bid, txt);
CS->setcfgAndFlush(cindex, txt);
}

6
usrc/service/page/submenu/Page_muDeviceInfo.cpp
View File

@ -7,9 +7,9 @@ using namespace iflytop;
bool Page_muDeviceInfo::isBelongThisPage(int page) { return page == PAGE; }
void Page_muDeviceInfo::OnPageLoad(OnPageLoadContext*cxt) {
UIS->setVal(PAGE, ob_muDeviceInfo_deviceId, "SN000000");
UIS->setVal(PAGE, ob_muDeviceInfo_manufa, "Öйú»Æ½ð");
UIS->setVal(PAGE, ob_muDeviceInfo_softVers, APP_VERSION);
UIS->setTxt(PAGE, ob_muDeviceInfo_deviceId, "SN000000");
UIS->setTxt(PAGE, ob_muDeviceInfo_manufa, "Öйú»Æ½ð");
UIS->setTxt(PAGE, ob_muDeviceInfo_softVers, APP_VERSION);
}
void Page_muDeviceInfo::OnInputFieldContentChange(uint8_t bid, const char* text) {}
void Page_muDeviceInfo::OnButton(uint8_t bid, uint8_t val) {

8
usrc/service/page/submenu/Page_muInterval.cpp
View File

@ -14,7 +14,7 @@ bool Page_muInterval::isBelongThisPage(int page) { return page == PAGE; }
void Page_muInterval::OnPageLoad(OnPageLoadContext*cxt) {
// 设置加酸间隔时间
UIS->setVal(PAGE, ob_muInterval_stAcidInte, CS->getStr(kcfg_distrInterval, &cfgcache));
UIS->setTxt(PAGE, ob_muInterval_stAcidInte, CS->getStr(kcfg_distrInterval, &cfgcache));
};
void Page_muInterval::OnInputFieldContentChange(uint8_t bid, const char* text) {
@ -22,16 +22,16 @@ void Page_muInterval::OnInputFieldContentChange(uint8_t bid, const char* text) {
float distrIntervalSecond = atof(text);
if (distrIntervalSecond <= 0) {
UIS->alert("酸液间隔时间不能小于0");
UIS->setVal(PAGE, ob_muInterval_stAcidInte, CS->getStr(kcfg_distrInterval, &cfgcache));
UIS->setTxt(PAGE, ob_muInterval_stAcidInte, CS->getStr(kcfg_distrInterval, &cfgcache));
return;
}
if (distrIntervalSecond > 30) {
UIS->alert("酸液间隔时间不能大于30");
UIS->setVal(PAGE, ob_muInterval_stAcidInte, CS->getStr(kcfg_distrInterval, &cfgcache));
UIS->setTxt(PAGE, ob_muInterval_stAcidInte, CS->getStr(kcfg_distrInterval, &cfgcache));
return;
}
UIS->setVal(PAGE, bid, zfmt("%.1f", distrIntervalSecond));
UIS->setTxt(PAGE, bid, zfmt("%.1f", distrIntervalSecond));
CS->setcfgAndFlush(kcfg_distrInterval, zfmt("%.1f", distrIntervalSecond));
}
};

12
usrc/service/page/submenu/Page_muPumpTest.cpp
View File

@ -24,16 +24,17 @@ void Page_muPumpTest::OnPageLoad(OnPageLoadContext* cxt) {
// motorTrunsBegin
if (!cxt->isFromPopWin) {
updateStatiInfo(0, 0);
m_pumpId = 1;
m_pumpId = 0;
}
UIS->setVal(ob_muPumpTest_pumpId, m_pumpId + 1);
ZLOGI(TAG, "m_pumpId:%d %d", m_pumpId, cxt->isFromPopWin);
UIS->setTxt(ob_muPumpTest_pumpId, zfmt("%d", m_pumpId + 1));
}
void Page_muPumpTest::OnInputFieldContentChange(uint8_t bid, const char* text) { //
ZLOGI(TAG, "bid:%d %s", bid, text);
// ob_muPumpTest_frompage
if (bid == ob_muPumpTest_pumpId) {
pumpChangeSelectId(atoi(text));
pumpChangeSelectId(atoi(text) - 1);
}
}
void Page_muPumpTest::OnButton(uint8_t bid, uint8_t val) {
@ -64,6 +65,7 @@ void Page_muPumpTest::pumpStop() {
updateStatiInfo();
}
void Page_muPumpTest::pumpStart(int32_t direction) {
ZLOGI(TAG, "pumpStart %d %d", m_pumpId, direction);
PUMPCS->rotate(m_pumpId, direction);
osTimerStop(statiUpdateTimerId);
osTimerStart(statiUpdateTimerId, 300);
@ -83,8 +85,8 @@ void Page_muPumpTest::pumpChangeSelectId(int id) {
void Page_muPumpTest::updateStatiInfo(float statiTruns, float statiVolum) {
m_statiTruns = statiTruns;
m_statiVolum = statiVolum;
UIS->setVal(ob_muPumpTest_statiTrun, zfmt("%.2f", m_statiTruns));
UIS->setVal(ob_muPumpTest_statiVolum, zfmt("%.2f", m_statiVolum));
UIS->setTxt(ob_muPumpTest_statiTrun, zfmt("%.2f", m_statiTruns));
UIS->setTxt(ob_muPumpTest_statiVolum, zfmt("%.1f", m_statiVolum));
}
void Page_muPumpTest::clearStatisInfo() {
updateStatiInfo(0, 0);

2
usrc/service/page/submenu/Page_muPumpTest.hpp
View File

@ -9,7 +9,7 @@ class Page_muPumpTest : public IPageProcesser {
/* data */
double m_motorTrunsBegin = 0;
int m_pumpId = 1;
int m_pumpId = 0;
float m_statiTruns = 0;
float m_statiVolum = 0;

58
usrc/service/page/submenu/Page_muSettings.cpp
View File

@ -33,20 +33,20 @@ static bool m_scaning;
bool Page_muSettings::isBelongThisPage(int page) { return page == PAGE; }
void Page_muSettings::updatePage() {
UIS->setVal(PAGE, ob_muSettings_bleCliName, getCfgStr(kcfg_bleClientName));
UIS->setVal(PAGE, ob_muSettings_irun0, zitoa(getMxIRun(0)));
UIS->setVal(PAGE, ob_muSettings_irun1, zitoa(getMxIRun(1)));
UIS->setVal(PAGE, ob_muSettings_irun2, zitoa(getMxIRun(2)));
UIS->setVal(PAGE, ob_muSettings_irun3, zitoa(getMxIRun(3)));
UIS->setVal(PAGE, ob_muSettings_pumpCoef0, zfmt("%.1f", getMotorMLPR(0)));
UIS->setVal(PAGE, ob_muSettings_pumpCoef1, zfmt("%.1f", getMotorMLPR(1)));
UIS->setVal(PAGE, ob_muSettings_pumpCoef2, zfmt("%.1f", getMotorMLPR(2)));
UIS->setVal(PAGE, ob_muSettings_pumpCoef3, zfmt("%.1f", getMotorMLPR(3)));
UIS->setVal(PAGE, ob_muSettings_pipeLen0, getCfgStr(kcfg_pipeLengthML));
UIS->setVal(PAGE, ob_muSettings_pipeLen1, getCfgStr(kcfg_pipeLengthML));
UIS->setVal(PAGE, ob_muSettings_pipeLen2, getCfgStr(kcfg_pipeLengthML));
UIS->setVal(PAGE, ob_muSettings_pipeLen3, getCfgStr(kcfg_pipeLengthML));
UIS->setVal(PAGE, ob_muSettings_addAcidVel, getCfgStr(kcfg_pumpDefVel));
UIS->setTxt(PAGE, ob_muSettings_bleCliName, getCfgStr(kcfg_bleClientName));
UIS->setTxt(PAGE, ob_muSettings_irun0, zitoa(getMxIRun(0)));
UIS->setTxt(PAGE, ob_muSettings_irun1, zitoa(getMxIRun(1)));
UIS->setTxt(PAGE, ob_muSettings_irun2, zitoa(getMxIRun(2)));
UIS->setTxt(PAGE, ob_muSettings_irun3, zitoa(getMxIRun(3)));
UIS->setTxt(PAGE, ob_muSettings_pumpCoef0, zfmt("%.1f", getMotorMLPR(0)));
UIS->setTxt(PAGE, ob_muSettings_pumpCoef1, zfmt("%.1f", getMotorMLPR(1)));
UIS->setTxt(PAGE, ob_muSettings_pumpCoef2, zfmt("%.1f", getMotorMLPR(2)));
UIS->setTxt(PAGE, ob_muSettings_pumpCoef3, zfmt("%.1f", getMotorMLPR(3)));
UIS->setTxt(PAGE, ob_muSettings_pipeLen0, getCfgStr(kcfg_pipeLengthML));
UIS->setTxt(PAGE, ob_muSettings_pipeLen1, getCfgStr(kcfg_pipeLengthML));
UIS->setTxt(PAGE, ob_muSettings_pipeLen2, getCfgStr(kcfg_pipeLengthML));
UIS->setTxt(PAGE, ob_muSettings_pipeLen3, getCfgStr(kcfg_pipeLengthML));
UIS->setTxt(PAGE, ob_muSettings_addAcidVel, getCfgStr(kcfg_pumpDefVel));
}
void Page_muSettings::OnPageLoad(OnPageLoadContext* cxt) { //
@ -55,7 +55,7 @@ void Page_muSettings::OnPageLoad(OnPageLoadContext* cxt) { //
void Page_muSettings::OnAppEvent(AppEvent_t* event) {
if (event->type == kAppEvent_BleConnectEvent) {
ZLOGI(TAG, "ble connect success");
UIS->setVal(PAGE, ob_muSettings_bleCliName, "绑定成功");
UIS->setTxt(PAGE, ob_muSettings_bleCliName, "绑定成功");
CS->setcfgAndFlush(kcfg_bleClientName, event->d.bleName);
m_scaning = false;
}
@ -67,16 +67,16 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) {
***********************************************************************************************************************/
if (bid == ob_muSettings_irun0) {
setMxIRun(0, atoi(text));
UIS->setVal(bid, getMxIRun(0));
UIS->setTxt(bid, zfmt("%d", getMxIRun(0)));
} else if (bid == ob_muSettings_irun1) {
setMxIRun(1, atoi(text));
UIS->setVal(bid, getMxIRun(1));
UIS->setTxt(bid, zfmt("%d", getMxIRun(1)));
} else if (bid == ob_muSettings_irun2) {
setMxIRun(2, atoi(text));
UIS->setVal(bid, getMxIRun(2));
UIS->setTxt(bid, zfmt("%d", getMxIRun(2)));
} else if (bid == ob_muSettings_irun3) {
setMxIRun(3, atoi(text));
UIS->setVal(bid, getMxIRun(3));
UIS->setTxt(bid, zfmt("%d", getMxIRun(3)));
}
/***********************************************************************************************************************
@ -85,16 +85,16 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) {
else if (bid == ob_muSettings_pumpCoef0) {
setMotorMLPR(0, atof(text));
UIS->setVal(bid, zfmt("%.1f", getMotorMLPR(0)));
UIS->setTxt(bid, zfmt("%.1f", getMotorMLPR(0)));
} else if (bid == ob_muSettings_pumpCoef1) {
setMotorMLPR(1, atof(text));
UIS->setVal(bid, zfmt("%.1f", getMotorMLPR(1)));
UIS->setTxt(bid, zfmt("%.1f", getMotorMLPR(1)));
} else if (bid == ob_muSettings_pumpCoef2) {
setMotorMLPR(2, atof(text));
UIS->setVal(bid, zfmt("%.1f", getMotorMLPR(2)));
UIS->setTxt(bid, zfmt("%.1f", getMotorMLPR(2)));
} else if (bid == ob_muSettings_pumpCoef3) {
setMotorMLPR(3, atof(text));
UIS->setVal(bid, zfmt("%.1f", getMotorMLPR(3)));
UIS->setTxt(bid, zfmt("%.1f", getMotorMLPR(3)));
}
/***********************************************************************************************************************
@ -103,22 +103,22 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) {
else if (bid == ob_muSettings_pipeLen0) {
CS->setcfg(kcfg_pipeLengthML, text);
UIS->setVal(bid, getCfgStr(kcfg_pipeLengthML));
UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
}
else if (bid == ob_muSettings_pipeLen1) {
CS->setcfg(kcfg_pipeLengthML, text);
UIS->setVal(bid, getCfgStr(kcfg_pipeLengthML));
UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
}
else if (bid == ob_muSettings_pipeLen2) {
CS->setcfg(kcfg_pipeLengthML, text);
UIS->setVal(bid, getCfgStr(kcfg_pipeLengthML));
UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
}
else if (bid == ob_muSettings_pipeLen3) {
CS->setcfg(kcfg_pipeLengthML, text);
UIS->setVal(bid, getCfgStr(kcfg_pipeLengthML));
UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
}
/***********************************************************************************************************************
@ -127,7 +127,7 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) {
else if (bid == ob_muSettings_addAcidVel) {
CS->setcfg(kcfg_pumpDefVel, text);
UIS->setVal(bid, getCfgStr(kcfg_pumpDefVel));
UIS->setTxt(bid, getCfgStr(kcfg_pumpDefVel));
}
updatePage();
@ -144,7 +144,7 @@ void Page_muSettings::OnButton(uint8_t bid, uint8_t val) {
} else if (bid == ob_muSettings_bleScan) {
ZLOGI(TAG, "bleScan");
bool suc = RCTRL->startScan(BLENAME, true);
if (suc) UIS->setVal(PAGE, ob_muSettings_bleCliName, "扫描中...");
if (suc) UIS->setTxt(PAGE, ob_muSettings_bleCliName, "扫描中...");
m_scaning = true;
}
};

12
usrc/service/page/submenu/Page_muUsrMgr.cpp
View File

@ -17,12 +17,12 @@ void Page_muUsrMgr::OnPageLoad(OnPageLoadContext*cxt) { //
updatePage();
};
void Page_muUsrMgr::updatePage() {
UIS->setVal(PAGE, ob_muUsrMgr_usr0name, getCfgStr(kusr_name0));
UIS->setVal(PAGE, ob_muUsrMgr_usr1name, getCfgStr(kusr_name1));
UIS->setVal(PAGE, ob_muUsrMgr_usr2name, getCfgStr(kusr_name2));
UIS->setVal(PAGE, ob_muUsrMgr_usr3name, getCfgStr(kusr_name3));
UIS->setVal(PAGE, ob_muUsrMgr_usr4name, getCfgStr(kusr_name4));
UIS->setVal(PAGE, ob_muUsrMgr_usr5name, getCfgStr(kusr_name5));
UIS->setTxt(PAGE, ob_muUsrMgr_usr0name, getCfgStr(kusr_name0));
UIS->setTxt(PAGE, ob_muUsrMgr_usr1name, getCfgStr(kusr_name1));
UIS->setTxt(PAGE, ob_muUsrMgr_usr2name, getCfgStr(kusr_name2));
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->setVal(PAGE, ob_muUsrMgr_usr1en, (int)getCfgBool(kusr_enable1));
UIS->setVal(PAGE, ob_muUsrMgr_usr2en, (int)getCfgBool(kusr_enable2));

8
usrc/service/pump_ctrl_service.cpp
View File

@ -263,15 +263,21 @@ void PumpCtrlService::rotate(int32_t mid, int32_t direction) {
ValveStateSyncService::ins()->setValveState(1);
TMC51X0* cur_motor = m_motors[mid];
cur_motor->rotate(PUMP_TEST_RPM);
cur_motor->rotate(direction > 0 ? PUMP_TEST_RPM : -PUMP_TEST_RPM);
}
void PumpCtrlService::stopRotate() {
if (isWorking()) {
ZLOGE(TAG, "rotate fail, PumpCtrlService isWorking");
return;
}
stopAll();
int cnt = 0;
while (!isAllReachTarget()) {
osDelay(10);
cnt++;
if (cnt % 10 == 0) {
stopAll();
}
}
ValveStateSyncService::ins()->setValveState(0);
}

Write Preview
Loading…
Cancel
Save