From 6ad5abbe86aef211bae9e67d8734e5246e24bdf1 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Tue, 19 Sep 2023 22:41:39 +0800
Subject: [PATCH] update

---
 components/dwin/dwin_screen.cpp | 23 +++++++++++++++++++++++
 components/dwin/dwin_screen.hpp | 35 ++++++++++++++---------------------
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/components/dwin/dwin_screen.cpp b/components/dwin/dwin_screen.cpp
index fa62166..5450674 100644
--- a/components/dwin/dwin_screen.cpp
+++ b/components/dwin/dwin_screen.cpp
@@ -74,6 +74,29 @@ uint16_t DwinScreen::alloc_one_var_icon() {
   ZASSERT(item != m_rammanager_map.end());
   return item->second->alloc();
 }
+
+uint16_t DwinScreen::alloc_one_level2_text_displayer() {
+  auto item = m_rammanager_map.find(LEVEL2_TEXT);
+  ZASSERT(item != m_rammanager_map.end());
+  return item->second->alloc();
+}
+uint16_t DwinScreen::alloc_one_level2_var_icon() {
+  auto item = m_rammanager_map.find(LEVEL2_ICON);
+  ZASSERT(item != m_rammanager_map.end());
+  return item->second->alloc();
+}
+
+uint16_t DwinScreen::alloc_one_level0_text_displayer() {
+  auto item = m_rammanager_map.find(LEVEL0_TEXT);
+  ZASSERT(item != m_rammanager_map.end());
+  return item->second->alloc();
+}
+uint16_t DwinScreen::alloc_one_level0_var_icon() {
+  auto item = m_rammanager_map.find(LEVEL0_ICON);
+  ZASSERT(item != m_rammanager_map.end());
+  return item->second->alloc();
+}
+
 uint16_t DwinScreen::alloc_from(const char* whichrammanager, uint16_t size) {
   auto item = m_rammanager_map.find(whichrammanager);
   if (item == m_rammanager_map.end()) {
diff --git a/components/dwin/dwin_screen.hpp b/components/dwin/dwin_screen.hpp
index badefe1..66970c6 100644
--- a/components/dwin/dwin_screen.hpp
+++ b/components/dwin/dwin_screen.hpp
@@ -48,30 +48,16 @@ class Pos {
   uint16_t y;
 };
 
-// class DwinScreenCfg {
-//  public:
-//   uint16_t freeRawStartAddr = 0;
-//   uint16_t freeRawEndAddr   = 0;
-
-//   uint16_t textDisplayerStartAddr = 0;
-//   uint16_t textDisplayerEndAddr   = 0;
-//   uint16_t textDisplayerSize      = 0;
+#define FREE_RAM_MAP "FreeRamRamMap"
 
-//   uint16_t varIconStartAddr = 0;
-//   uint16_t varIconEndAddr   = 0;
-//   uint16_t varIconSize      = 0;
-// };
+#define LEVEL0_TEXT "level0_text"
+#define LEVEL0_ICON "level0_icon"
 
-#define FREE_RAM_MAP "FreeRamRamMap"
-#define LEVEL1_TEXT  "level1_text"
-#define LEVEL1_ICON  "level1_icon"
+#define LEVEL1_TEXT "level1_text"
+#define LEVEL1_ICON "level1_icon"
 
-// typedef enum {
-//   kdw_freeram       = 1,
-//   kdw_textdisplayer = 2,
-//   kdw_varicon       = 3,
-//   kdw_
-// } dwin_ram_type_t;
+#define LEVEL2_TEXT "level2_text"
+#define LEVEL2_ICON "level2_icon"
 
 class DwinScreen {
  public:
@@ -117,6 +103,13 @@ class DwinScreen {
   uint16_t alloc_free_ram(uint16_t size);
   uint16_t alloc_one_text_displayer();
   uint16_t alloc_one_var_icon();
+
+  uint16_t alloc_one_level2_text_displayer();
+  uint16_t alloc_one_level2_var_icon();
+
+  uint16_t alloc_one_level0_text_displayer();
+  uint16_t alloc_one_level0_var_icon();
+
   uint16_t alloc_from(const char* whichrammanager, uint16_t size);
 
   void dumpram();