Merge branch 'patch-clickbuttons' into work

work
Ondřej Hruška 7 years ago
commit 9030d5ce85
Signed by: MightyPork
GPG Key ID: 2C5FD5035250423D
  1. 2
      .gitignore
  2. 2
      front-end
  3. 6
      user/screen.h
  4. 2
      user/version.h

2
.gitignore vendored

@ -16,7 +16,7 @@ esphttpdconfig.mk
# Garbage added by CLion
.idea/
cmake-build-debug/
cmake-build-debug*/
.sass-cache
*.map

@ -1 +1 @@
Subproject commit 8b43b1d17182bf27c62b5d38467c69ee98257239
Subproject commit e25523de11484d306a8cc5cb7b9d3c5839edd916

@ -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);

@ -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"\""

Loading…
Cancel
Save