From 33a8361c7b29a84b9f8409007beec3118c33332c Mon Sep 17 00:00:00 2001 From: zhaohe Date: Fri, 30 Aug 2024 23:24:18 +0800 Subject: [PATCH] update --- README.md | 1 + uappbase/service/config_service.cpp | 4 +++- ui/hand_acid_mainboard_ui.HMI | Bin 15800145 -> 15800145 bytes usrc/service/app_core.cpp | 12 +++++++++++- usrc/service/front_end_controler.cpp | 10 ++++++++++ usrc/service/front_end_controler.hpp | 1 + 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d9174fc..2a9dc1b 100644 --- a/README.md +++ b/README.md @@ -29,5 +29,6 @@ UI 8. 修改主页面 menu按键切换页面由后台处理逻辑 9. 修改每个页面的后初始化事件,区分当前页面是键盘,还是弹窗,还是普通页面。 10. 去掉menu页面的setfrompage + 11. 美化提示栏 ``` diff --git a/uappbase/service/config_service.cpp b/uappbase/service/config_service.cpp index c8427c8..1c1c19f 100644 --- a/uappbase/service/config_service.cpp +++ b/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()) { diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI index d6420f0db353992a5abfc091c28940cd2fc240bc..dc2f43dd6847340edd37c211bb75e0513c076104 100644 GIT binary patch delta 17633 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 P2W|jWtl5t0ZYlo*Z1fWA delta 22473 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 diff --git a/usrc/service/app_core.cpp b/usrc/service/app_core.cpp index eb7c4f0..624b7e9 100644 --- a/usrc/service/app_core.cpp +++ b/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 diff --git a/usrc/service/front_end_controler.cpp b/usrc/service/front_end_controler.cpp index d631c68..ed083a9 100644 --- a/usrc/service/front_end_controler.cpp +++ b/usrc/service/front_end_controler.cpp @@ -375,6 +375,16 @@ void FrontEndControler::alert(const char* info, function 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 onConfirm) { zlock_guard lg(m_cmdlock); diff --git a/usrc/service/front_end_controler.hpp b/usrc/service/front_end_controler.hpp index 37b053a..4c8f6fc 100644 --- a/usrc/service/front_end_controler.hpp +++ b/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 onConfirm); void confirmNoCancle(const char* info) { confirmNoCancle(info, nullptr); } void confirmNoCancle(const char* info, function onConfirm);