Skip to content

Commit 7fd5b58

Browse files
committed
pbio/sys/hmi_lcd: Implement partial EV3 UI.
Select slots and apps on different tabs, and add exit UI.
1 parent 7426d0b commit 7fd5b58

13 files changed

Lines changed: 1517 additions & 138 deletions

File tree

bricks/_common/sources.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ PBIO_SRC_C = $(addprefix lib/pbio/,\
246246
sys/command.c \
247247
sys/core.c \
248248
sys/hmi_ev3.c \
249+
sys/hmi_ev3_ui.c \
249250
sys/hmi_none.c \
250251
sys/hmi_nxt.c \
251252
sys/hmi_pup.c \

lib/pbio/platform/ev3/pbsysconfig.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
#define PBSYS_CONFIG_HMI (1)
1515
#define PBSYS_CONFIG_HMI_STOP_BUTTON (1 << 7) // top left, back button
1616
#define PBSYS_CONFIG_HMI_EV3 (1)
17-
#define PBSYS_CONFIG_HMI_NUM_SLOTS (5)
17+
#define PBSYS_CONFIG_HMI_EV3_UI (1)
18+
#define PBSYS_CONFIG_HMI_NUM_SLOTS (4)
1819
#define PBSYS_CONFIG_HOST (1)
1920
#define PBSYS_CONFIG_HOST_STDIN_BUF_SIZE (21)
2021
#define PBSYS_CONFIG_MAIN (1)
2122
#define PBSYS_CONFIG_STORAGE (1)
22-
#define PBSYS_CONFIG_STORAGE_NUM_SLOTS (5)
23+
#define PBSYS_CONFIG_STORAGE_NUM_SLOTS (PBSYS_CONFIG_HMI_NUM_SLOTS)
2324
#define PBSYS_CONFIG_STORAGE_USER_DATA_SIZE (512)
2425
#define PBSYS_CONFIG_STATUS_LIGHT (1)
2526
#define PBSYS_CONFIG_STATUS_LIGHT_BATTERY (0)

lib/pbio/platform/virtual_hub/animation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
# Virtual display settings
1818
DISPLAY_WIDTH = 178
1919
DISPLAY_HEIGHT = 128
20-
DISPLAY_SCALE = 2 # Scale factor for display on screen
21-
DISPLAY_POS = (450, 50) # Position on main screen
20+
DISPLAY_SCALE = 6 # Scale factor for display on screen
21+
DISPLAY_POS = (50, 50) # Position on main screen
2222

2323
PBIO_PYBRICKS_EVENT_STATUS_REPORT = 0
2424
PBIO_PYBRICKS_EVENT_WRITE_STDOUT = 1

lib/pbio/platform/virtual_hub/pbsysconfig.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
#define PBSYS_CONFIG_HOST (1)
1313
#define PBSYS_CONFIG_HOST_STDIN_BUF_SIZE (21)
1414
#define PBSYS_CONFIG_HMI (1)
15-
#define PBSYS_CONFIG_HMI_STOP_BUTTON (1 << 5) // center
15+
#define PBSYS_CONFIG_HMI_STOP_BUTTON (1 << 7) // center
1616
#define PBSYS_CONFIG_HMI_VIRTUAL (1)
17+
#define PBSYS_CONFIG_HMI_EV3_UI (1)
1718
#define PBSYS_CONFIG_HMI_NUM_SLOTS (4)
1819
#define PBSYS_CONFIG_HUB_LIGHT_MATRIX (0)
1920
#define PBSYS_CONFIG_MAIN (1)
Lines changed: 207 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)