espterm/espterm-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'patch-clickbuttons' into work

Browse Source
This commit is contained in:
MightyPork
2018-01-21 14:09:14 +01:00
parent 6b4013f779 6971fe2036
commit 9030d5ce85
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -1
View File
@@ -16,7 +16,7 @@ esphttpdconfig.mk
# Garbage added by CLion # Garbage added by CLion
.idea/ .idea/
cmake-build-debug/ cmake-build-debug*/
.sass-cache .sass-cache
*.map *.map
front-end
+1 -1
Submodule front-end updated: 8b43b1d171...e25523de11
user/screen.h
+4 -2
View File
@@ -124,8 +124,10 @@ enum CursorShape {
X(char, font_stack, [TERM_FONTSTACK_LEN], /**/, xget_string, xset_string, TERM_FONTSTACK_LEN, /**/, 1) \ 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) X(u8, font_size, /**/, /**/, xget_dec, xset_u8, NULL, /**/, 1)
#define TERM_BM_N(tc, n) ((tc)->bm1+(TERM_BTN_MSG_LEN*n)) /** Get button N message from the passed config structure pointer */
#define TERM_BTN_N(tc, n) ((tc)->btn1+(TERM_BTN_LEN*n)) #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 */ /** Export color for config */
void xget_term_color(char *buff, u32 value); void xget_term_color(char *buff, u32 value);
user/version.h
+1 -1
View File
@@ -10,7 +10,7 @@
#define FW_V_MAJOR 2 #define FW_V_MAJOR 2
#define FW_V_MINOR 3 #define FW_V_MINOR 3
#define FW_V_PATCH 0 #define FW_V_PATCH 1
#define FW_V_SUFFIX "" #define FW_V_SUFFIX ""
#define FW_CODENAME "Cricket" // 2.3 #define FW_CODENAME "Cricket" // 2.3
#define FW_CODENAME_QUOTED "\""FW_CODENAME"\"" #define FW_CODENAME_QUOTED "\""FW_CODENAME"\""