浏览代码

Нужно добавить кнопку энкодера.

TelenkovDmitry 2 周之前
父节点
当前提交
f34e4ee746
共有 3 个文件被更改,包括 22 次插入4 次删除
  1. 7 2
      desk/modules/menu/menu_items.cpp
  2. 15 2
      desk/modules/menu/menu_tree.h
  3. 0 0
      project/ewarm/settings/tuber.wsdt

+ 7 - 2
desk/modules/menu/menu_items.cpp

@@ -27,11 +27,16 @@ void draw_main(uint8_t sel)
 //
 void draw_settings(uint8_t sel)
 {
-    static int counter = 0;
     update_flag = true;
     
     DBG printf("\033c");
-    DBG printf("This is settings screen\r\n");
+    
+    DBG printf("Factor 1: x\r\n");
+    DBG printf("Factor 2: x\r\n");
+    DBG printf("Revers  : yes\r\n");
+    DBG printf("Save settings\r\n");
+    
+    DBG printf("\r\nSelect item: %u\r\n", sel);
 }
 
 //

+ 15 - 2
desk/modules/menu/menu_tree.h

@@ -9,6 +9,9 @@ typedef enum
     MCELL_NULL = 0,
     MCELL_MAIN,
     MCELL_K1,
+    MCELL_K2,
+    MCELL_REV,
+    MCELL_SAVE,
 } menu_cell_t;
 
 
@@ -24,8 +27,18 @@ MAKE_MENU(NULL_ENTRY, NULL_MENU, NULL_MENU, NULL_MENU, NULL_MENU, MCELL_NULL, fa
 MAKE_MENU(m_main, 		m_k1,   		m_k1,		    NULL_ENTRY,		NULL_ENTRY,
           MCELL_MAIN,   false,          &draw_main,     &empty_func_bool);
 
-MAKE_MENU(m_k1, 		m_main,		    m_main,		    m_main,		    NULL_ENTRY,
-          MCELL_K1,     false,          &draw_settings,     &empty_func_bool);
+MAKE_MENU(m_k1, 		m_k2,		    m_main,		    m_main,		    NULL_ENTRY,
+          MCELL_K1,     false,          &draw_settings, &empty_func_bool);
+
+MAKE_MENU(m_k2, 		m_revers,	    m_k1,		    m_main,		    NULL_ENTRY,
+          MCELL_K2,     false,          &draw_settings, &empty_func_bool);
+
+MAKE_MENU(m_revers,     m_save,		    m_k2,		    m_main,		    NULL_ENTRY,
+          MCELL_REV,    false,          &draw_settings, &empty_func_bool);
+
+MAKE_MENU(m_save,       m_main,		    m_revers,		m_main,		    NULL_ENTRY,
+          MCELL_SAVE,   false,          &draw_settings, &empty_func_bool);
+
 
 
 // Экран настроек. Пока отобразим один условный коэффициент.

文件差异内容过多而无法显示
+ 0 - 0
project/ewarm/settings/tuber.wsdt


部分文件因为文件数量过多而无法显示