Skip to content

Commit 8cc9ae8

Browse files
committed
Merge branch 'patch-clickbuttons'
2 parents 5343d44 + 6971fe2 commit 8cc9ae8

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ esphttpdconfig.mk
1616

1717
# Garbage added by CLion
1818
.idea/
19-
cmake-build-debug/
19+
cmake-build-debug*/
2020
.sass-cache
2121

2222
*.map

user/screen.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,10 @@ enum CursorShape {
124124
X(char, font_stack, [TERM_FONTSTACK_LEN], /**/, xget_string, xset_string, TERM_FONTSTACK_LEN, /**/, 1) \
125125
X(u8, font_size, /**/, /**/, xget_dec, xset_u8, NULL, /**/, 1)
126126

127-
#define TERM_BM_N(tc, n) ((tc)->bm1+(TERM_BTN_MSG_LEN*n))
128-
#define TERM_BTN_N(tc, n) ((tc)->btn1+(TERM_BTN_LEN*n))
127+
/** Get button N message from the passed config structure pointer */
128+
#define TERM_BM_N(tc, n) ((tc)->bm1+(TERM_BTN_MSG_LEN*(n)))
129+
/** Get button N text from the passed config structure pointer */
130+
#define TERM_BTN_N(tc, n) ((tc)->btn1+(TERM_BTN_LEN*(n)))
129131

130132
/** Export color for config */
131133
void xget_term_color(char *buff, u32 value);

user/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#define FW_V_MAJOR 2
1212
#define FW_V_MINOR 3
13-
#define FW_V_PATCH 0
13+
#define FW_V_PATCH 1
1414
#define FW_V_SUFFIX ""
1515
#define FW_CODENAME "Cricket" // 2.3
1616
#define FW_CODENAME_QUOTED "\""FW_CODENAME"\""

0 commit comments

Comments
 (0)