[更新] 更新软件版本号

rtpkgs · Dec 18, 2017 · 70cea3e · 70cea3e
1 parent b0dce99
commit 70cea3e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/dwin/dwin_def.h b/dwin/dwin_def.h
@@ -10,7 +10,7 @@
 
 /* dwin version information */
 #define DWIN_MAJOR_VER      1L          /* major version number */
-#define DWIN_MINOR_VER      3L          /* minor version number */
+#define DWIN_MINOR_VER      4L          /* minor version number */
 #define DWIN_REVISE_VER     0L          /* revise version number */
 #define DWIN_VERSION        ((DWIN_MAJOR_VER*10000) + (DWIN_MINOR_VER*100) + DWIN_REVISE_VER)
 

diff --git a/dwin/plugins/icon/dwin_plugin_icon.c b/dwin/plugins/icon/dwin_plugin_icon.c
@@ -17,7 +17,7 @@
 #define DWIN_ICON_SPACE_BYTE  (1)         /* 按键变量空间大小 */
 
 /* 创建icon组 */
-uint8_t dwin_plugin_icon_create(const char *name, uint16_t min, uint16_t max, uint16_t current)
+uint8_t dwin_plugin_icon_create(const char *name, uint16_t min, uint16_t max, uint16_t cur)
 {
     dwin_space_t icon_space;
     dwin_icon_t  icon_handle;
@@ -42,18 +42,19 @@ uint8_t dwin_plugin_icon_create(const char *name, uint16_t min, uint16_t max, ui
 
     /* 填充结构体 */
     icon_handle->state = icon_start;
-    icon_handle->cur_index = current;
+    icon_handle->cur_index = cur;
     icon_handle->min_index = min;
     icon_handle->max_index = max;
     icon_space ->plugin = (void *)icon_handle;
 
     /* 改变icon序号 */
-    dwin_plugin_icon_update(name, current);
+    dwin_plugin_icon_update(name, cur);
 
     return dwin_err_none;
 }
 
 /* 改变icon组显示状态 */
+#if 0
 uint8_t dwin_plugin_icon_mode(const char *name, uint8_t mode)
 {
     dwin_space_t space;
@@ -70,6 +71,7 @@ uint8_t dwin_plugin_icon_mode(const char *name, uint8_t mode)
 
     return dwin_err_none;
 }
+#endif 
 
 /* 更新icon组显示序号 */
 uint8_t dwin_plugin_icon_update(const char *name, uint16_t current)

diff --git a/dwin/plugins/icon/dwin_plugin_icon.h b/dwin/plugins/icon/dwin_plugin_icon.h
@@ -21,9 +21,9 @@ enum icon_state
 };
 
 /* 导出接口 */
-uint8_t  dwin_plugin_icon_create(const char *name, uint16_t min, uint16_t max, uint16_t current);
+uint8_t  dwin_plugin_icon_create(const char *name, uint16_t min, uint16_t max, uint16_t cur);
 uint8_t  dwin_plugin_icon_update(const char *name, uint16_t current);
-uint8_t  dwin_plugin_icon_mode(const char *name, uint8_t mode);
+// uint8_t  dwin_plugin_icon_mode(const char *name, uint8_t mode);
 uint16_t dwin_plugin_icon_read(const char *name);
 
 #endif