Browse Source

update

sunlight
zhaohe 11 months ago
parent
commit
33a8361c7b
  1. 1
      README.md
  2. 4
      uappbase/service/config_service.cpp
  3. BIN
      ui/hand_acid_mainboard_ui.HMI
  4. 12
      usrc/service/app_core.cpp
  5. 10
      usrc/service/front_end_controler.cpp
  6. 1
      usrc/service/front_end_controler.hpp

1
README.md

@ -29,5 +29,6 @@ UI
8. 修改主页面 menu按键切换页面由后台处理逻辑
9. 修改每个页面的后初始化事件,区分当前页面是键盘,还是弹窗,还是普通页面。
10. 去掉menu页面的setfrompage
11. 美化提示栏
```

4
uappbase/service/config_service.cpp

@ -58,7 +58,9 @@ bool ConfigService::initialize() {
AppHal::MX_I2C1_Init();
eeprom.initialize(&hi2c1);
eeprom.scan_i2c();
if (!eeprom.isOnline()) {
return false;
}
static_assert(kcfg_max == CFG_MAX_INDEX, "");
if (!checkcfg()) {

BIN
ui/hand_acid_mainboard_ui.HMI

12
usrc/service/app_core.cpp

@ -51,12 +51,22 @@ void AppCore::debugLightLoop() {
}
void AppCore::appsetup() {
osDelay(1000);
/***********************************************************************************************************************
* INIT *
***********************************************************************************************************************/
GStateMgr::ins()->initialize();
AppEventBus::ins()->initialize();
ConfigService::ins()->initialize();
bool suc = ConfigService::ins()->initialize();
if (true) {
AppHardware::ins()->initialize(); // 基础硬件初始化
FrontEndControler::ins()->initialize(); // 前端控制器,对屏幕的消息进行解析,发送消息给屏幕
FrontEndControler::ins()->startSchedule();
FrontEndControler::ins()->alertNoConfirm("设备异常:\r\n 存储异常,请尝试重新上电");
while (true) {
osDelay(1);
}
}
ZCAN1::ins()->init();
// hardInit

10
usrc/service/front_end_controler.cpp

@ -375,6 +375,16 @@ void FrontEndControler::alert(const char* info, function<void(bool)> onConfirm)
sendcmd("p[%d].b[%d].txt=\"%s\"", pg_alert, ob_alert_info, buf);
sendcmd("page alert");
}
void FrontEndControler::alertNoConfirm(const char* info) {
zlock_guard lg(m_cmdlock);
static char buf[128];
sprintf(buf, "%s", info);
sendcmd("p[%d].b[%d].val=dp", pg_alert, ob_alert_frompage);
sendcmd("p[%d].b[%d].txt=\"%s\"", pg_alert, ob_alert_info, buf);
sendcmd("page alert");
vis(ob_alert_confirmkey, 0);
}
void FrontEndControler::confirmNoCancle(const char* info, function<void(bool)> onConfirm) {
zlock_guard lg(m_cmdlock);

1
usrc/service/front_end_controler.hpp

@ -68,6 +68,7 @@ class FrontEndControler {
bool readInt(uint16_t buuid, int32_t* val) { return readInt(buuid >> 8, buuid & 0xff, val); }
void alert(const char* info) { alert(info, nullptr); }
void alertNoConfirm(const char* info);
void alert(const char* info, function<void(bool)> onConfirm);
void confirmNoCancle(const char* info) { confirmNoCancle(info, nullptr); }
void confirmNoCancle(const char* info, function<void(bool)> onConfirm);

Loading…
Cancel
Save