recode

usrc/service/app_core.cpp

@@ -1,16 +1,18 @@
 #include "app_core.hpp"
+
 #include <stddef.h>
 #include <stdio.h>
 
 #include "remote_controler_event_processer.hpp"
-#include "service/front_end_controler.hpp"
 #include "service/pump_ctrl_service.hpp"
 #include "service/remote_controler.hpp"
 #include "service/remote_controler_state_sync_service.hpp"
 #include "valve_state_ctrl_service.hpp"
 //
-#include "service/page/page.hpp"
 #include "ucomponents/zcan/zcan.hpp"
+//
+#include "uicontroler/front_end_controler.hpp"
+#include "uicontroler/page/page.hpp"
 
 #define TAG "main"
 using namespace iflytop;
@@ -174,7 +176,7 @@ void AppCore::test() {
   while (true) {
     // ɨÃèµ½ 0x50 ˵Ã÷EEPROMÔÚÏß
     uint8_t tx  = 0x10;
-    uint8_t rx = 0;
+    uint8_t rx  = 0;
     bool    suc = FrontEndControler::ins()->echo(tx, &rx);
     ZLOGI(TAG, "echo suc:%d tx:%x rx:%x", suc, tx, rx);
     osDelay(100);
@@ -263,6 +265,5 @@ void AppCore::initialize() {
 
   test();
 
-
   while (true) osDelay(30);
 }

usrc/service/remote_controler_event_processer.cpp

@@ -1,9 +1,13 @@
 #include "remote_controler_event_processer.hpp"
 
 #include "pump_ctrl_service.hpp"
-#include "service/front_end_controler.hpp"
 #include "service/remote_controler.hpp"
 
+//
+#include "uicontroler/front_end_controler.hpp"
+#include "uicontroler/page/page.hpp"
+//
+
 using namespace iflytop;
 #define TAG "RemoteControlerEventProcesser"
 static const char* zhex2str(uint8_t* data, size_t len) {

usrc/service/front_end_controler.cpp → usrc/uicontroler/front_end_controler.cpp

@@ -143,9 +143,6 @@ void FrontEndControler::startSchedule() {
   });
 }
 
-// GVAR_triET
-// GVAR_triBId
-// GVAR_triPageId
 
 void FrontEndControler::processScreenRxPacket(uint8_t* data, size_t len) {
   // 判断包是否合法

usrc/service/page/page_processer.hpp → usrc/uicontroler/page/page_processer.hpp

@@ -2,7 +2,7 @@
 
 #include "apphardware/apphardware.hpp"
 #include "uappbase/base.hpp"
-#include "service\front_end_controler.hpp"
+#include "uicontroler/front_end_controler.hpp"
 #include "utils/page_bak_router.hpp"
 #include "config/config.hpp"
 #include "ui/ui.h"

usrc/service/page/utils/page_bak_router.hpp → usrc/uicontroler/page/utils/page_bak_router.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "apphardware/apphardware.hpp"
 #include "uappbase/base.hpp"
-#include "service\front_end_controler.hpp"
+#include "uicontroler/front_end_controler.hpp"
 #include "config/config.hpp"
 namespace iflytop {
 int getBakPage(int nowPage);

usrc/service/tjc/tjc_constant.hpp → usrc/uicontroler/tjc/tjc_constant.hpp

@@ -120,9 +120,6 @@ typedef enum {
   k_input_confirm_event  = 2,
 } usr_event_type_t;
 
-#define GVAR_triET     "triET"
-#define GVAR_triBId    "triBId"
-#define GVAR_triPageId "triPageId"
 
 const char* pt2str(uint8_t type);
 const char* uimarco2str(uint8_t pid, uint8_t bid);
@@ -130,22 +127,4 @@ const char* pageName(uint8_t page);
 
 #define UI_UUID(pgid, obid) ((pg_##pgid << 8) + ob_##pgid##_##obid)
 
-/***********************************************************************************************************************
- *                                                   PublicPageName                                                    *
- ***********************************************************************************************************************/
-
-/**
- * @brief
- *
- * Page:
- *        "alert"
- * Var:
- *        alert.frompage
- *        alert.info
- *
- *
- *
- *
- */
-
 }  // namespace tjc