Skip to content

Commit d71b7cf

Browse files
committed
MQTT exec/initiate i exec/abort
1 parent 1ac606b commit d71b7cf

27 files changed

+43665
-43635
lines changed

modular-psu-firmware.eez-project

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@
350350
"name": "keypad_text",
351351
"description": "Contains the text entered in keypad.",
352352
"type": "string",
353-
"defaultValue": "abc123|"
353+
"defaultValue": "012345678901234567890123456789abcdefghjkl"
354354
},
355355
{
356356
"name": "keypad_mode",
@@ -10455,7 +10455,8 @@
1045510455
{
1045610456
"type": "DisplayData",
1045710457
"style": {
10458-
"inheritFrom": "edit_value_M_left"
10458+
"inheritFrom": "edit_value_M_left",
10459+
"alignHorizontal": "left-right"
1045910460
},
1046010461
"data": "keypad_text",
1046110462
"left": 0,

src/eez/gui/app_context.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ void AppContext::updatePage(int i, WidgetCursor &widgetCursor) {
337337
widgetCursor.previousState = savedPreviousState;
338338
}
339339

340-
mcu::display::setBufferBounds(m_pageNavigationStack[i].displayBufferIndex, x, y, width, height, withShadow, 255, 0, 0, withShadow ? &rect : nullptr);
340+
mcu::display::setBufferBounds(m_pageNavigationStack[i].displayBufferIndex, x, y, width, height, withShadow, 255, 0, 0, withShadow && activePageHasBackdropHook() ? &rect : nullptr);
341341

342342
m_updatePageIndex = -1;
343343
}

src/eez/gui/data.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,11 @@ Value get(Cursor cursor, int16_t id) {
569569
return value;
570570
}
571571

572+
const char *isValidValue(Cursor cursor, int16_t id, Value value) {
573+
DATA_OPERATION_FUNCTION(id, DATA_OPERATION_IS_VALID_VALUE, cursor, value);
574+
return value.getType() == VALUE_TYPE_STR ? value.getString() : nullptr;
575+
}
576+
572577
Value set(Cursor cursor, int16_t id, Value value) {
573578
DATA_OPERATION_FUNCTION(id, DATA_OPERATION_SET, cursor, value);
574579
return value;

src/eez/gui/data.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ enum DataOperationEnum {
337337
DATA_OPERATION_GET_ACTIVE_COLOR,
338338
DATA_OPERATION_GET_ACTIVE_BACKGROUND_COLOR,
339339
DATA_OPERATION_IS_BLINKING,
340+
DATA_OPERATION_IS_VALID_VALUE,
340341
DATA_OPERATION_SET,
341342
DATA_OPERATION_YT_DATA_GET_REFRESH_COUNTER,
342343
DATA_OPERATION_YT_DATA_GET_SIZE,
@@ -393,6 +394,7 @@ bool getEncoderStepValues(Cursor cursor, int16_t id, StepValues &stepValues);
393394
void getList(Cursor cursor, int16_t id, const Value **labels, int &count);
394395

395396
Value get(Cursor cursor, int16_t id);
397+
const char *isValidValue(Cursor cursor, int16_t id, Value value);
396398
Value set(Cursor cursor, int16_t id, Value value);
397399

398400
uint32_t getTextRefreshRate(Cursor cursor, int16_t id);

src/eez/gui/document_simulator.cpp

Lines changed: 24445 additions & 24443 deletions
Large diffs are not rendered by default.

src/eez/gui/document_simulator.h

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1379,60 +1379,60 @@ enum StylesEnum {
13791379
STYLE_ID_SCROLLBAR_THUMB = 156,
13801380
STYLE_ID_SCROLLBAR_BUTTON = 157,
13811381
STYLE_ID_BOTTOM_BUTTON_TEXTUAL_S_LEFT = 158,
1382-
STYLE_ID_KEY_SPEC_ICONS = 160,
1383-
STYLE_ID_KEY_SPEC_ICONS_DISABLED = 162,
1384-
STYLE_ID_KEY_DISABLED = 163,
1385-
STYLE_ID_EDIT_VALUE_S_CENTERED = 164,
1386-
STYLE_ID_VALUE_M = 172,
1387-
STYLE_ID_DEFAULT_DISABLED_M_LEFT = 175,
1388-
STYLE_ID_YT_GRAPH = 177,
1389-
STYLE_ID_LIST_GRAPH_CURSOR = 178,
1390-
STYLE_ID_YT_GRAPH_U_DEFAULT_LABEL = 179,
1391-
STYLE_ID_YT_GRAPH_I_DEFAULT_LABEL = 180,
1392-
STYLE_ID_ENCODER_CURSOR_14_ENABLED = 181,
1393-
STYLE_ID_VALUE = 185,
1394-
STYLE_ID_DEFAULT_M = 189,
1395-
STYLE_ID_OPTION_TOGGLE_L_CENTER = 190,
1396-
STYLE_ID_EVENT_ERROR = 191,
1397-
STYLE_ID_DEFAULT_DISABLED_S_LEFT = 192,
1398-
STYLE_ID_ICON_AND_TEXT_S = 194,
1399-
STYLE_ID_ICON_AND_TEXT_S_DISABLED = 195,
1400-
STYLE_ID_DEFAULT_DISABLED = 201,
1401-
STYLE_ID_EDIT_VALUE_M_CENTERED = 204,
1402-
STYLE_ID_EDIT_S = 205,
1403-
STYLE_ID_EVENT_WARNING = 224,
1404-
STYLE_ID_DISPLAY_OFF = 225,
1405-
STYLE_ID_DISPLAY_OFF_S = 226,
1406-
STYLE_ID_MON_VALUE_48_RIGHT = 229,
1407-
STYLE_ID_MON_VALUE_20_LEFT = 231,
1408-
STYLE_ID_ENCODER_CURSOR_14_DISABLED = 232,
1409-
STYLE_ID_BAR_GRAPH_U_DEFAULT = 233,
1410-
STYLE_ID_BAR_GRAPH_TEXT = 234,
1411-
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 236,
1412-
STYLE_ID_BAR_GRAPH_I_DEFAULT = 237,
1413-
STYLE_ID_TRIGGER_BUTTON_24 = 239,
1414-
STYLE_ID_MON_VALUE_14_RIGHT = 241,
1415-
STYLE_ID_ENCODER_CURSOR_14_RIGHT_DISABLED = 242,
1416-
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 243,
1417-
STYLE_ID_ENCODER_CURSOR_14_LEFT_DISABLED = 244,
1418-
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 245,
1419-
STYLE_ID_TRIGGER_BUTTON_14 = 246,
1420-
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 252,
1421-
STYLE_ID_INST_SELECTED = 253,
1422-
STYLE_ID_MON_VALUE_38_RIGHT = 254,
1423-
STYLE_ID_CH_PROT_OFF = 256,
1424-
STYLE_ID_CH_PROT_ON = 257,
1425-
STYLE_ID_CH_PROT_TRIPPED = 258,
1426-
STYLE_ID_BUTTON_BGND = 259,
1427-
STYLE_ID_MON_VALUE_24_RIGHT = 261,
1428-
STYLE_ID_MON_VALUE_14_CENTER = 262,
1429-
STYLE_ID_MON_VALUE_20_RIGHT = 268,
1430-
STYLE_ID_MON_VALUE_14_LEFT = 269,
1431-
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 270,
1432-
STYLE_ID_STATUS_LINE_SMALL_TITLE = 274,
1433-
STYLE_ID_EDIT_VALUE_S_CENTERED_STATUS_LINE = 275,
1434-
STYLE_ID_SCROLLBAR_TRACK = 276,
1435-
STYLE_ID_BUTTON_S_DISABLED = 289
1382+
STYLE_ID_KEY_SPEC_ICONS = 161,
1383+
STYLE_ID_KEY_SPEC_ICONS_DISABLED = 163,
1384+
STYLE_ID_KEY_DISABLED = 164,
1385+
STYLE_ID_EDIT_VALUE_S_CENTERED = 165,
1386+
STYLE_ID_VALUE_M = 173,
1387+
STYLE_ID_DEFAULT_DISABLED_M_LEFT = 176,
1388+
STYLE_ID_YT_GRAPH = 178,
1389+
STYLE_ID_LIST_GRAPH_CURSOR = 179,
1390+
STYLE_ID_YT_GRAPH_U_DEFAULT_LABEL = 180,
1391+
STYLE_ID_YT_GRAPH_I_DEFAULT_LABEL = 181,
1392+
STYLE_ID_ENCODER_CURSOR_14_ENABLED = 182,
1393+
STYLE_ID_VALUE = 186,
1394+
STYLE_ID_DEFAULT_M = 190,
1395+
STYLE_ID_OPTION_TOGGLE_L_CENTER = 191,
1396+
STYLE_ID_EVENT_ERROR = 192,
1397+
STYLE_ID_DEFAULT_DISABLED_S_LEFT = 193,
1398+
STYLE_ID_ICON_AND_TEXT_S = 195,
1399+
STYLE_ID_ICON_AND_TEXT_S_DISABLED = 196,
1400+
STYLE_ID_DEFAULT_DISABLED = 202,
1401+
STYLE_ID_EDIT_VALUE_M_CENTERED = 205,
1402+
STYLE_ID_EDIT_S = 206,
1403+
STYLE_ID_EVENT_WARNING = 225,
1404+
STYLE_ID_DISPLAY_OFF = 226,
1405+
STYLE_ID_DISPLAY_OFF_S = 227,
1406+
STYLE_ID_MON_VALUE_48_RIGHT = 230,
1407+
STYLE_ID_MON_VALUE_20_LEFT = 232,
1408+
STYLE_ID_ENCODER_CURSOR_14_DISABLED = 233,
1409+
STYLE_ID_BAR_GRAPH_U_DEFAULT = 234,
1410+
STYLE_ID_BAR_GRAPH_TEXT = 235,
1411+
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 237,
1412+
STYLE_ID_BAR_GRAPH_I_DEFAULT = 238,
1413+
STYLE_ID_TRIGGER_BUTTON_24 = 240,
1414+
STYLE_ID_MON_VALUE_14_RIGHT = 242,
1415+
STYLE_ID_ENCODER_CURSOR_14_RIGHT_DISABLED = 243,
1416+
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 244,
1417+
STYLE_ID_ENCODER_CURSOR_14_LEFT_DISABLED = 245,
1418+
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 246,
1419+
STYLE_ID_TRIGGER_BUTTON_14 = 247,
1420+
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 253,
1421+
STYLE_ID_INST_SELECTED = 254,
1422+
STYLE_ID_MON_VALUE_38_RIGHT = 255,
1423+
STYLE_ID_CH_PROT_OFF = 257,
1424+
STYLE_ID_CH_PROT_ON = 258,
1425+
STYLE_ID_CH_PROT_TRIPPED = 259,
1426+
STYLE_ID_BUTTON_BGND = 260,
1427+
STYLE_ID_MON_VALUE_24_RIGHT = 262,
1428+
STYLE_ID_MON_VALUE_14_CENTER = 263,
1429+
STYLE_ID_MON_VALUE_20_RIGHT = 269,
1430+
STYLE_ID_MON_VALUE_14_LEFT = 270,
1431+
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 271,
1432+
STYLE_ID_STATUS_LINE_SMALL_TITLE = 275,
1433+
STYLE_ID_EDIT_VALUE_S_CENTERED_STATUS_LINE = 276,
1434+
STYLE_ID_SCROLLBAR_TRACK = 277,
1435+
STYLE_ID_BUTTON_S_DISABLED = 290
14361436
};
14371437

14381438
enum ThemesEnum {
@@ -1670,4 +1670,4 @@ enum PagesEnum {
16701670
PAGE_ID_TOUCH_TEST = 165
16711671
};
16721672

1673-
extern const uint8_t assets[403416];
1673+
extern const uint8_t assets[403452];

0 commit comments

Comments
 (0)