diff --git a/src/hasp/hasp_attribute.cpp b/src/hasp/hasp_attribute.cpp index cdc8200f..be400a92 100644 --- a/src/hasp/hasp_attribute.cpp +++ b/src/hasp/hasp_attribute.cpp @@ -329,43 +329,6 @@ static inline lv_color_t haspLogColor(lv_color_t color) // OK static lv_color_t haspPayloadToColor(const char * payload) { - switch(strlen(payload)) { - case 3: - if(!strcasecmp_P(payload, PSTR("red"))) return haspLogColor(LV_COLOR_RED); - break; - case 4: - if(!strcasecmp_P(payload, PSTR("blue"))) return haspLogColor(LV_COLOR_BLUE); - if(!strcasecmp_P(payload, PSTR("cyan"))) return haspLogColor(LV_COLOR_CYAN); - if(!strcasecmp_P(payload, PSTR("gray"))) return haspLogColor(LV_COLOR_GRAY); - // if(!strcmp_P(payload, PSTR("aqua"))) return haspLogColor(LV_COLOR_AQUA); - // if(!strcmp_P(payload, PSTR("lime"))) return haspLogColor(LV_COLOR_LIME); - // if(!strcmp_P(payload, PSTR("teal"))) return haspLogColor(LV_COLOR_TEAL); - // if(!strcmp_P(payload, PSTR("navy"))) return haspLogColor(LV_COLOR_NAVY); - break; - case 5: - if(!strcasecmp_P(payload, PSTR("green"))) return haspLogColor(LV_COLOR_GREEN); - if(!strcasecmp_P(payload, PSTR("white"))) return haspLogColor(LV_COLOR_WHITE); - if(!strcasecmp_P(payload, PSTR("black"))) return haspLogColor(LV_COLOR_BLACK); - // if(!strcmp_P(payload, PSTR("olive"))) return haspLogColor(LV_COLOR_OLIVE); - break; - case 6: - if(!strcasecmp_P(payload, PSTR("yellow"))) return haspLogColor(LV_COLOR_YELLOW); - if(!strcasecmp_P(payload, PSTR("orange"))) return haspLogColor(LV_COLOR_ORANGE); - if(!strcasecmp_P(payload, PSTR("purple"))) return haspLogColor(LV_COLOR_PURPLE); - if(!strcasecmp_P(payload, PSTR("silver"))) return haspLogColor(LV_COLOR_SILVER); - // if(!strcmp_P(payload, PSTR("maroon"))) return haspLogColor(LV_COLOR_MAROON); - break; - case 7: - if(!strcasecmp_P(payload, PSTR("magenta"))) return haspLogColor(LV_COLOR_MAGENTA); - break; - - default: - // if(!strcmp_P(payload, PSTR("darkblue"))) return haspLogColor(LV_COLOR_MAKE(0, 51, 102)); - // if(!strcmp_P(payload, PSTR("lightblue"))) return haspLogColor(LV_COLOR_MAKE(46, 203, - // 203)); - break; - } - /* HEX format #rrggbb or #rrggbbaa */ char pattern[4]; snprintf_P(pattern, sizeof(pattern), PSTR(" 2x")); // % cannot be escaped, so we build our own pattern @@ -394,6 +357,95 @@ static lv_color_t haspPayloadToColor(const char * payload) return lv_color_make(R8, G8, B8); } + /* Named Color Scheme*/ + switch(sdbm(payload)) { + case ATTR_RED: + return lv_color_hex(0xFF0000); + case ATTR_TAN: + return lv_color_hex(0xD2B48C); + case ATTR_AQUA: + return lv_color_hex(0x00FFFF); + case ATTR_BLUE: + return lv_color_hex(0x0000FF); + case ATTR_CYAN: + return lv_color_hex(0x00FFFF); + case ATTR_GOLD: + return lv_color_hex(0xFFD700); + case ATTR_GRAY: + return lv_color_hex(0x808080); + case ATTR_GREY: + return lv_color_hex(0x808080); + case ATTR_LIME: + return lv_color_hex(0x00FF00); + case ATTR_NAVY: + return lv_color_hex(0x000080); + case ATTR_PERU: + return lv_color_hex(0xCD853F); + case ATTR_PINK: + return lv_color_hex(0xFFC0CB); + case ATTR_PLUM: + return lv_color_hex(0xDDA0DD); + case ATTR_SNOW: + return lv_color_hex(0xFFFAFA); + case ATTR_TEAL: + return lv_color_hex(0x008080); + case ATTR_AZURE: + return lv_color_hex(0xF0FFFF); + case ATTR_BEIGE: + return lv_color_hex(0xF5F5DC); + case ATTR_BLACK: + return lv_color_hex(0x000000); + case ATTR_BLUSH: + return lv_color_hex(0xB00000); + case ATTR_BROWN: + return lv_color_hex(0xA52A2A); + case ATTR_CORAL: + return lv_color_hex(0xFF7F50); + case ATTR_GREEN: + return lv_color_hex(0x008000); + case ATTR_IVORY: + return lv_color_hex(0xFFFFF0); + case ATTR_KHAKI: + return lv_color_hex(0xF0E68C); + case ATTR_LINEN: + return lv_color_hex(0xFAF0E6); + case ATTR_OLIVE: + return lv_color_hex(0x808000); + case ATTR_WHEAT: + return lv_color_hex(0xF5DEB3); + case ATTR_WHITE: + return lv_color_hex(0xFFFFFF); + case ATTR_BISQUE: + return lv_color_hex(0xFFE4C4); + case ATTR_INDIGO: + return lv_color_hex(0x4B0082); + case ATTR_MAROON: + return lv_color_hex(0x800000); + case ATTR_ORANGE: + return lv_color_hex(0xFFA500); + case ATTR_ORCHID: + return lv_color_hex(0xDA70D6); + case ATTR_PURPLE: + return lv_color_hex(0x800080); + case ATTR_SALMON: + return lv_color_hex(0xFA8072); + case ATTR_SIENNA: + return lv_color_hex(0xA0522D); + case ATTR_SILVER: + return lv_color_hex(0xC0C0C0); + case ATTR_TOMATO: + return lv_color_hex(0xFF6347); + case ATTR_VIOLET: + return lv_color_hex(0xEE82EE); + case ATTR_YELLOW: + return lv_color_hex(0xFFFF00); + case ATTR_FUCHSIA: + return lv_color_hex(0xFF00FF); + + default: + break; + } + /* Unknown format */ Log.warning(TAG_ATTR, F("Invalid color %s"), payload); return LV_COLOR_BLACK; diff --git a/src/hasp/hasp_attribute.h b/src/hasp/hasp_attribute.h index 3290cef4..4c469ced 100644 --- a/src/hasp/hasp_attribute.h +++ b/src/hasp/hasp_attribute.h @@ -2,20 +2,20 @@ For full license information read the LICENSE file in the project folder */ #ifndef HASP_ATTR_SET_H -#define HASP_ATTR_SET_H + #define HASP_ATTR_SET_H -#include "lvgl.h" -#if LVGL_VERSION_MAJOR != 7 - #include "../lv_components.h" -#endif + #include "lvgl.h" + #if LVGL_VERSION_MAJOR != 7 + #include "../lv_components.h" + #endif -#include "hasp_conf.h" -#include "hasp.h" -#include "hasp_object.h" + #include "hasp_conf.h" + #include "hasp.h" + #include "hasp_object.h" -#ifdef __cplusplus + #ifdef __cplusplus extern "C" { -#endif + #endif // test lv_chart_series_t * lv_chart_get_series(lv_obj_t * chart, uint8_t ser_num); @@ -25,27 +25,27 @@ void line_clear_points(lv_obj_t * obj); void hasp_process_obj_attribute(lv_obj_t * obj, const char * attr_p, const char * payload, bool update); -#ifdef __cplusplus + #ifdef __cplusplus } /* extern "C" */ -#endif + #endif -// use shorter name for readability -#define hasp_out_int hasp_send_obj_attribute_int -#define hasp_out_str hasp_send_obj_attribute_str -#define hasp_out_color hasp_send_obj_attribute_color + // use shorter name for readability + #define hasp_out_int hasp_send_obj_attribute_int + #define hasp_out_str hasp_send_obj_attribute_str + #define hasp_out_color hasp_send_obj_attribute_color -#define _HASP_ATTRIBUTE(prop_name, func_name, value_type) \ - static inline void attribute_##func_name(lv_obj_t * obj, uint8_t part, lv_state_t state, bool update, \ - const char * attr, value_type val) \ - { \ - if(update) { \ - return lv_obj_set_style_local_##func_name(obj, part, state, (value_type)val); \ - } else { \ - value_type temp = lv_obj_get_style_##func_name(obj, part); \ - /*lv_obj_get_style_##func_name(obj, part, state, &temp);*/ \ - return hasp_send_obj_attribute_int(obj, attr, temp); \ - } \ - } + #define _HASP_ATTRIBUTE(prop_name, func_name, value_type) \ + static inline void attribute_##func_name(lv_obj_t * obj, uint8_t part, lv_state_t state, bool update, \ + const char * attr, value_type val) \ + { \ + if(update) { \ + return lv_obj_set_style_local_##func_name(obj, part, state, (value_type)val); \ + } else { \ + value_type temp = lv_obj_get_style_##func_name(obj, part); \ + /*lv_obj_get_style_##func_name(obj, part, state, &temp);*/ \ + return hasp_send_obj_attribute_int(obj, attr, temp); \ + } \ + } _HASP_ATTRIBUTE(RADIUS, radius, lv_style_int_t) _HASP_ATTRIBUTE(CLIP_CORNER, clip_corner, bool) @@ -57,10 +57,10 @@ _HASP_ATTRIBUTE(PAD_TOP, pad_top, lv_style_int_t) _HASP_ATTRIBUTE(PAD_BOTTOM, pad_bottom, lv_style_int_t) _HASP_ATTRIBUTE(PAD_LEFT, pad_left, lv_style_int_t) _HASP_ATTRIBUTE(PAD_RIGHT, pad_right, lv_style_int_t) -#if LVGL_VERSION_MAJOR == 7 + #if LVGL_VERSION_MAJOR == 7 _HASP_ATTRIBUTE(PAD_INNER, pad_inner, lv_style_int_t) -#endif -#if LV_USE_BLEND_MODES + #endif + #if LV_USE_BLEND_MODES _HASP_ATTRIBUTE(BG_BLEND_MODE, bg_blend_mode, lv_blend_mode_t) _HASP_ATTRIBUTE(BORDER_BLEND_MODE, border_blend_mode, lv_blend_mode_t) _HASP_ATTRIBUTE(OUTLINE_BLEND_MODE, outline_blend_mode, lv_blend_mode_t) @@ -70,7 +70,7 @@ _HASP_ATTRIBUTE(VALUE_BLEND_MODE, value_blend_mode, lv_blend_mode_t) _HASP_ATTRIBUTE(TEXT_BLEND_MODE, text_blend_mode, lv_blend_mode_t) _HASP_ATTRIBUTE(LINE_BLEND_MODE, line_blend_mode, lv_blend_mode_t) _HASP_ATTRIBUTE(IMAGE_BLEND_MODE, image_blend_mode, lv_blend_mode_t) -#endif + #endif _HASP_ATTRIBUTE(BG_MAIN_STOP, bg_main_stop, lv_style_int_t) _HASP_ATTRIBUTE(BG_GRAD_STOP, bg_grad_stop, lv_style_int_t) _HASP_ATTRIBUTE(BG_GRAD_DIR, bg_grad_dir, lv_grad_dir_t) @@ -86,14 +86,14 @@ _HASP_ATTRIBUTE(OUTLINE_WIDTH, outline_width, lv_style_int_t) _HASP_ATTRIBUTE(OUTLINE_PAD, outline_pad, lv_style_int_t) //_HASP_ATTRIBUTE(OUTLINE_COLOR, outline_color, lv_color_t, _color, nonscalar) _HASP_ATTRIBUTE(OUTLINE_OPA, outline_opa, lv_opa_t) -#if LV_USE_SHADOW + #if LV_USE_SHADOW _HASP_ATTRIBUTE(SHADOW_WIDTH, shadow_width, lv_style_int_t) _HASP_ATTRIBUTE(SHADOW_OFS_X, shadow_ofs_x, lv_style_int_t) _HASP_ATTRIBUTE(SHADOW_OFS_Y, shadow_ofs_y, lv_style_int_t) _HASP_ATTRIBUTE(SHADOW_SPREAD, shadow_spread, lv_style_int_t) //_HASP_ATTRIBUTE(SHADOW_COLOR, shadow_color, lv_color_t, _color, nonscalar) _HASP_ATTRIBUTE(SHADOW_OPA, shadow_opa, lv_opa_t) -#endif + #endif _HASP_ATTRIBUTE(PATTERN_REPEAT, pattern_repeat, bool) //_HASP_ATTRIBUTE(PATTERN_RECOLOR, pattern_recolor, lv_color_t, _color, nonscalar) _HASP_ATTRIBUTE(PATTERN_OPA, pattern_opa, lv_opa_t) @@ -137,158 +137,201 @@ _HASP_ATTRIBUTE(SCALE_WIDTH, scale_width, lv_style_int_t) _HASP_ATTRIBUTE(SCALE_BORDER_WIDTH, scale_border_width, lv_style_int_t) _HASP_ATTRIBUTE(SCALE_END_BORDER_WIDTH, scale_end_border_width, lv_style_int_t) _HASP_ATTRIBUTE(SCALE_END_LINE_WIDTH, scale_end_line_width, lv_style_int_t) -//_HASP_ATTRIBUTE(SCALE_GRAD_COLOR, scale_grad_color, lv_color_t, _color, nonscalar) -//_HASP_ATTRIBUTE(SCALE_END_COLOR, scale_end_color, lv_color_t, _color, nonscalar) + //_HASP_ATTRIBUTE(SCALE_GRAD_COLOR, scale_grad_color, lv_color_t, _color, nonscalar) + //_HASP_ATTRIBUTE(SCALE_END_COLOR, scale_end_color, lv_color_t, _color, nonscalar) -/* attribute hashes */ -/* Object Part Attributes */ -#define ATTR_SIZE 16417 -#define ATTR_RADIUS 20786 -#define ATTR_CLIP_CORNER 9188 -#define ATTR_OPA_SCALE 64875 -#define ATTR_TRANSFORM_HEIGHT 55994 -#define ATTR_TRANSFORM_WIDTH 48627 + /* attribute hashes */ + /* Object Part Attributes */ + #define ATTR_SIZE 16417 + #define ATTR_RADIUS 20786 + #define ATTR_CLIP_CORNER 9188 + #define ATTR_OPA_SCALE 64875 + #define ATTR_TRANSFORM_HEIGHT 55994 + #define ATTR_TRANSFORM_WIDTH 48627 -/* Background Attributes */ -#define ATTR_BG_OPA 48966 -#define ATTR_BG_COLOR 64969 -#define ATTR_BG_GRAD_DIR 41782 -#define ATTR_BG_GRAD_STOP 4025 -#define ATTR_BG_MAIN_STOP 63118 -#define ATTR_BG_BLEND_MODE 31147 -#define ATTR_BG_GRAD_COLOR 44140 + /* Background Attributes */ + #define ATTR_BG_OPA 48966 + #define ATTR_BG_COLOR 64969 + #define ATTR_BG_GRAD_DIR 41782 + #define ATTR_BG_GRAD_STOP 4025 + #define ATTR_BG_MAIN_STOP 63118 + #define ATTR_BG_BLEND_MODE 31147 + #define ATTR_BG_GRAD_COLOR 44140 -/* Padding Attributes */ -#define ATTR_PAD_TOP 59081 -#define ATTR_PAD_LEFT 43123 -#define ATTR_PAD_INNER 9930 -#define ATTR_PAD_RIGHT 65104 -#define ATTR_PAD_BOTTOM 3767 + /* Padding Attributes */ + #define ATTR_PAD_TOP 59081 + #define ATTR_PAD_LEFT 43123 + #define ATTR_PAD_INNER 9930 + #define ATTR_PAD_RIGHT 65104 + #define ATTR_PAD_BOTTOM 3767 -/* Text Attributes */ -#define ATTR_TEXT_OPA 37166 -#define ATTR_TEXT_FONT 22465 -#define ATTR_TEXT_COLOR 23473 -#define ATTR_TEXT_DECOR 1971 -#define ATTR_TEXT_LETTER_SPACE 62079 -#define ATTR_TEXT_SEL_COLOR 32076 -#define ATTR_TEXT_LINE_SPACE 54829 -#define ATTR_TEXT_BLEND_MODE 32195 + /* Text Attributes */ + #define ATTR_TEXT_OPA 37166 + #define ATTR_TEXT_FONT 22465 + #define ATTR_TEXT_COLOR 23473 + #define ATTR_TEXT_DECOR 1971 + #define ATTR_TEXT_LETTER_SPACE 62079 + #define ATTR_TEXT_SEL_COLOR 32076 + #define ATTR_TEXT_LINE_SPACE 54829 + #define ATTR_TEXT_BLEND_MODE 32195 -/* Border Attributes */ -#define ATTR_BORDER_OPA 2061 -#define ATTR_BORDER_SIDE 53962 -#define ATTR_BORDER_POST 49491 -#define ATTR_BORDER_BLEND_MODE 23844 -#define ATTR_BORDER_WIDTH 24531 -#define ATTR_BORDER_COLOR 21264 + /* Border Attributes */ + #define ATTR_BORDER_OPA 2061 + #define ATTR_BORDER_SIDE 53962 + #define ATTR_BORDER_POST 49491 + #define ATTR_BORDER_BLEND_MODE 23844 + #define ATTR_BORDER_WIDTH 24531 + #define ATTR_BORDER_COLOR 21264 -/* Outline Attributes */ -#define ATTR_OUTLINE_OPA 23011 -#define ATTR_OUTLINE_PAD 26038 -#define ATTR_OUTLINE_COLOR 6630 -#define ATTR_OUTLINE_BLEND_MODE 25038 -#define ATTR_OUTLINE_WIDTH 9897 + /* Outline Attributes */ + #define ATTR_OUTLINE_OPA 23011 + #define ATTR_OUTLINE_PAD 26038 + #define ATTR_OUTLINE_COLOR 6630 + #define ATTR_OUTLINE_BLEND_MODE 25038 + #define ATTR_OUTLINE_WIDTH 9897 -/* Shadow Attributes */ -#define ATTR_SHADOW_OPA 38401 -#define ATTR_SHADOW_WIDTH 13255 -#define ATTR_SHADOW_OFS_X 44278 -#define ATTR_SHADOW_OFS_Y 44279 -#define ATTR_SHADOW_SPREAD 21138 -#define ATTR_SHADOW_BLEND_MODE 64048 -#define ATTR_SHADOW_COLOR 9988 + /* Shadow Attributes */ + #define ATTR_SHADOW_OPA 38401 + #define ATTR_SHADOW_WIDTH 13255 + #define ATTR_SHADOW_OFS_X 44278 + #define ATTR_SHADOW_OFS_Y 44279 + #define ATTR_SHADOW_SPREAD 21138 + #define ATTR_SHADOW_BLEND_MODE 64048 + #define ATTR_SHADOW_COLOR 9988 -/* Line Attributes */ -#define ATTR_LINE_OPA 24501 -#define ATTR_LINE_WIDTH 25467 -#define ATTR_LINE_COLOR 22200 -#define ATTR_LINE_DASH_WIDTH 32676 -#define ATTR_LINE_ROUNDED 15042 -#define ATTR_LINE_DASH_GAP 49332 -#define ATTR_LINE_BLEND_MODE 60284 + /* Line Attributes */ + #define ATTR_LINE_OPA 24501 + #define ATTR_LINE_WIDTH 25467 + #define ATTR_LINE_COLOR 22200 + #define ATTR_LINE_DASH_WIDTH 32676 + #define ATTR_LINE_ROUNDED 15042 + #define ATTR_LINE_DASH_GAP 49332 + #define ATTR_LINE_BLEND_MODE 60284 -/* Value Attributes */ -#define ATTR_VALUE_OPA 50482 -#define ATTR_VALUE_STR 1091 -#define ATTR_VALUE_FONT 9405 -#define ATTR_VALUE_ALIGN 27895 -#define ATTR_VALUE_COLOR 52661 -#define ATTR_VALUE_OFS_X 21415 -#define ATTR_VALUE_OFS_Y 21416 -#define ATTR_VALUE_LINE_SPACE 26921 -#define ATTR_VALUE_BLEND_MODE 4287 -#define ATTR_VALUE_LETTER_SPACE 51067 + /* Value Attributes */ + #define ATTR_VALUE_OPA 50482 + #define ATTR_VALUE_STR 1091 + #define ATTR_VALUE_FONT 9405 + #define ATTR_VALUE_ALIGN 27895 + #define ATTR_VALUE_COLOR 52661 + #define ATTR_VALUE_OFS_X 21415 + #define ATTR_VALUE_OFS_Y 21416 + #define ATTR_VALUE_LINE_SPACE 26921 + #define ATTR_VALUE_BLEND_MODE 4287 + #define ATTR_VALUE_LETTER_SPACE 51067 -/* Pattern attributes */ -#define ATTR_PATTERN_BLEND_MODE 43456 -#define ATTR_PATTERN_RECOLOR_OPA 35074 -#define ATTR_PATTERN_RECOLOR 7745 -#define ATTR_PATTERN_REPEAT 31338 -#define ATTR_PATTERN_OPA 43633 -#define ATTR_PATTERN_IMAGE 61292 + /* Pattern attributes */ + #define ATTR_PATTERN_BLEND_MODE 43456 + #define ATTR_PATTERN_RECOLOR_OPA 35074 + #define ATTR_PATTERN_RECOLOR 7745 + #define ATTR_PATTERN_REPEAT 31338 + #define ATTR_PATTERN_OPA 43633 + #define ATTR_PATTERN_IMAGE 61292 -#define ATTR_TRANSITION_PROP_1 49343 -#define ATTR_TRANSITION_PROP_2 49344 -#define ATTR_TRANSITION_PROP_3 49345 -#define ATTR_TRANSITION_PROP_4 49346 -#define ATTR_TRANSITION_PROP_5 49347 -#define ATTR_TRANSITION_PROP_6 49348 -#define ATTR_TRANSITION_TIME 26263 -#define ATTR_TRANSITION_PATH 43343 -#define ATTR_TRANSITION_DELAY 64537 + #define ATTR_TRANSITION_PROP_1 49343 + #define ATTR_TRANSITION_PROP_2 49344 + #define ATTR_TRANSITION_PROP_3 49345 + #define ATTR_TRANSITION_PROP_4 49346 + #define ATTR_TRANSITION_PROP_5 49347 + #define ATTR_TRANSITION_PROP_6 49348 + #define ATTR_TRANSITION_TIME 26263 + #define ATTR_TRANSITION_PATH 43343 + #define ATTR_TRANSITION_DELAY 64537 -#define ATTR_IMAGE_OPA 58140 -#define ATTR_IMAGE_RECOLOR 52204 -#define ATTR_IMAGE_BLEND_MODE 11349 -#define ATTR_IMAGE_RECOLOR_OPA 43949 + #define ATTR_IMAGE_OPA 58140 + #define ATTR_IMAGE_RECOLOR 52204 + #define ATTR_IMAGE_BLEND_MODE 11349 + #define ATTR_IMAGE_RECOLOR_OPA 43949 -#define ATTR_SCALE_END_LINE_WIDTH 30324 -#define ATTR_SCALE_END_BORDER_WIDTH 34380 -#define ATTR_SCALE_BORDER_WIDTH 2440 -#define ATTR_SCALE_GRAD_COLOR 47239 -#define ATTR_SCALE_WIDTH 36017 -#define ATTR_SCALE_END_COLOR 44074 + #define ATTR_SCALE_END_LINE_WIDTH 30324 + #define ATTR_SCALE_END_BORDER_WIDTH 34380 + #define ATTR_SCALE_BORDER_WIDTH 2440 + #define ATTR_SCALE_GRAD_COLOR 47239 + #define ATTR_SCALE_WIDTH 36017 + #define ATTR_SCALE_END_COLOR 44074 -/* Object Attributes */ -#define ATTR_X 120 -#define ATTR_Y 121 -#define ATTR_W 119 -#define ATTR_H 104 -#define ATTR_OPTIONS 29886 -#define ATTR_ENABLED 28193 -#define ATTR_OPACITY 10155 -#define ATTR_TOGGLE 38580 -#define ATTR_HIDDEN 11082 -#define ATTR_VIS 16320 -#define ATTR_MODE 45891 -// #define ATTR_RECT 11204 -#define ATTR_ROWS 52153 -#define ATTR_COLS 36307 -#define ATTR_MIN 46130 -#define ATTR_MAX 45636 -#define ATTR_VAL 15809 -#define ATTR_TXT 9328 -#define ATTR_SRC 4964 -#define ATTR_ID 6715 -#define ATTR_DELETE 50027 + /* Object Attributes */ + #define ATTR_X 120 + #define ATTR_Y 121 + #define ATTR_W 119 + #define ATTR_H 104 + #define ATTR_OPTIONS 29886 + #define ATTR_ENABLED 28193 + #define ATTR_OPACITY 10155 + #define ATTR_TOGGLE 38580 + #define ATTR_HIDDEN 11082 + #define ATTR_VIS 16320 + #define ATTR_MODE 45891 + // #define ATTR_RECT 11204 + #define ATTR_ROWS 52153 + #define ATTR_COLS 36307 + #define ATTR_MIN 46130 + #define ATTR_MAX 45636 + #define ATTR_VAL 15809 + #define ATTR_TXT 9328 + #define ATTR_SRC 4964 + #define ATTR_ID 6715 + #define ATTR_DELETE 50027 -// Gauge -#define ATTR_CRITICAL_VALUE 39281 -#define ATTR_ANGLE 2387 -#define ATTR_LABEL_COUNT 20356 -#define ATTR_LINE_COUNT 57860 -#define ATTR_FORMAT 38871 + // Gauge + #define ATTR_CRITICAL_VALUE 39281 + #define ATTR_ANGLE 2387 + #define ATTR_LABEL_COUNT 20356 + #define ATTR_LINE_COUNT 57860 + #define ATTR_FORMAT 38871 -// Arc -#define ATTR_TYPE 1658 -#define ATTR_ROTATION 44830 -#define ATTR_ADJUSTABLE 19145 -#define ATTR_START_ANGLE 44310 -#define ATTR_END_ANGLE 41103 -#define ATTR_START_ANGLE1 39067 -#define ATTR_END_ANGLE1 33634 + // Arc + #define ATTR_TYPE 1658 + #define ATTR_ROTATION 44830 + #define ATTR_ADJUSTABLE 19145 + #define ATTR_START_ANGLE 44310 + #define ATTR_END_ANGLE 41103 + #define ATTR_START_ANGLE1 39067 + #define ATTR_END_ANGLE1 33634 -// Buttonmatrix -#define ATTR_MAP 45628 + // Buttonmatrix + #define ATTR_MAP 45628 #endif + +/* Named COLOR attributes */ +#define ATTR_RED 177 +#define ATTR_TAN 7873 +#define ATTR_AQUA 3452 +#define ATTR_BLUE 37050 +#define ATTR_CYAN 9763 +#define ATTR_GOLD 53440 +#define ATTR_GRAY 64675 +#define ATTR_GREY 64927 +#define ATTR_LIME 34741 +#define ATTR_NAVY 44918 +#define ATTR_PERU 36344 +#define ATTR_PINK 51958 +#define ATTR_PLUM 64308 +#define ATTR_SNOW 35587 +#define ATTR_TEAL 52412 +#define ATTR_AZURE 44239 +#define ATTR_BEIGE 12132 +#define ATTR_BLACK 26527 +#define ATTR_BLUSH 41376 +#define ATTR_BROWN 10774 +#define ATTR_CORAL 16369 +#define ATTR_GREEN 26019 +#define ATTR_IVORY 1257 +#define ATTR_KHAKI 32162 +#define ATTR_LINEN 30074 +#define ATTR_OLIVE 47963 +#define ATTR_WHEAT 11591 +#define ATTR_WHITE 28649 +#define ATTR_BISQUE 60533 +#define ATTR_INDIGO 46482 +#define ATTR_MAROON 12528 +#define ATTR_ORANGE 21582 +#define ATTR_ORCHID 39235 +#define ATTR_PURPLE 53116 +#define ATTR_SALMON 29934 +#define ATTR_SIENNA 50930 +#define ATTR_SILVER 62989 +#define ATTR_TOMATO 8234 +#define ATTR_VIOLET 61695 +#define ATTR_YELLOW 10484 +#define ATTR_FUCHSIA 5463