Merge branch 'patch-clickbuttons'

espterm · Jan 21, 2018 · 8cc9ae8 · 8cc9ae8
2 parents 5343d44 + 6971fe2
commit 8cc9ae8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,7 +16,7 @@ esphttpdconfig.mk
 
 # Garbage added by CLion
 .idea/
-cmake-build-debug/
+cmake-build-debug*/
 .sass-cache
 
 *.map

diff --git a/user/screen.h b/user/screen.h
@@ -124,8 +124,10 @@ enum CursorShape {
 	X(char,           font_stack, [TERM_FONTSTACK_LEN], /**/, xget_string,  xset_string, TERM_FONTSTACK_LEN,  /**/, 1) \
 	X(u8,             font_size, /**/,              /**/, xget_dec,      xset_u8, NULL,       /**/, 1)
 
-#define TERM_BM_N(tc, n) ((tc)->bm1+(TERM_BTN_MSG_LEN*n))
-#define TERM_BTN_N(tc, n) ((tc)->btn1+(TERM_BTN_LEN*n))
+/** Get button N message from the passed config structure pointer */
+#define TERM_BM_N(tc, n) ((tc)->bm1+(TERM_BTN_MSG_LEN*(n)))
+/** Get button N text from the passed config structure pointer */
+#define TERM_BTN_N(tc, n) ((tc)->btn1+(TERM_BTN_LEN*(n)))
 
 /** Export color for config */
 void xget_term_color(char *buff, u32 value);

diff --git a/user/version.h b/user/version.h
@@ -10,7 +10,7 @@
 
 #define FW_V_MAJOR 2
 #define FW_V_MINOR 3
-#define FW_V_PATCH 0
+#define FW_V_PATCH 1
 #define FW_V_SUFFIX ""
 #define FW_CODENAME "Cricket" // 2.3
 #define FW_CODENAME_QUOTED "\""FW_CODENAME"\""