diff --git a/internal_filesystem/lib/mpos/board/lilygo_t_display_s3.py b/internal_filesystem/lib/mpos/board/lilygo_t_display_s3.py index cd939eab..522f55d3 100644 --- a/internal_filesystem/lib/mpos/board/lilygo_t_display_s3.py +++ b/internal_filesystem/lib/mpos/board/lilygo_t_display_s3.py @@ -41,8 +41,8 @@ mpos.ui.main_display = st7789.ST7789( frame_buffer2=fb2, display_width=170, display_height=320, - #color_space=lv.COLOR_FORMAT.RGB565, # gives bad colors - color_space=lv.COLOR_FORMAT.RGB888, + color_space=lv.COLOR_FORMAT.RGB565, + # color_space=lv.COLOR_FORMAT.RGB888, # not supported on qemu color_byte_order=st7789.BYTE_ORDER_RGB, # rgb565_byte_swap=False, # always False is data_bus.get_lane_count() == 8 power_pin=9, # Must set RD pin to high, otherwise blank screen as soon as LVGL's task_handler starts diff --git a/internal_filesystem/lib/mpos/board/qemu.py b/internal_filesystem/lib/mpos/board/qemu.py index 5242ad3d..9cd5412e 100644 --- a/internal_filesystem/lib/mpos/board/qemu.py +++ b/internal_filesystem/lib/mpos/board/qemu.py @@ -39,7 +39,7 @@ mpos.ui.main_display = st7789.ST7789( frame_buffer2=fb2, display_width=170, display_height=320, - color_space=lv.COLOR_FORMAT.RGB565, # gives bad colors + color_space=lv.COLOR_FORMAT.RGB565, #color_space=lv.COLOR_FORMAT.RGB888, # not supported by qemu color_byte_order=st7789.BYTE_ORDER_RGB, # rgb565_byte_swap=False, # always False is data_bus.get_lane_count() == 8 @@ -195,7 +195,6 @@ def keypad_read_cb(indev, data): if data.state == lv.INDEV_STATE.PRESSED and data.key == lv.KEY.ESC: mpos.ui.back_screen() -''' group = lv.group_create() group.set_default() @@ -209,5 +208,5 @@ indev.set_display(disp) # different from display indev.enable(True) # NOQA from mpos import InputManager InputManager.register_indev(indev) -''' + print("qemu.py finished") diff --git a/internal_filesystem/lib/mpos/main.py b/internal_filesystem/lib/mpos/main.py index 2a480e74..40f3d779 100644 --- a/internal_filesystem/lib/mpos/main.py +++ b/internal_filesystem/lib/mpos/main.py @@ -93,24 +93,19 @@ def detect_board(): import machine unique_id_prefixes = machine.unique_id()[0:3] - print("qemu ?") - if unique_id_prefixes[0] == 0x10: - return "qemu" + print("(emulated) lilygo_t_display_s3 ?") + if unique_id_prefixes == b'\x10\x01\x00' or unique_id_prefixes == b'\xc0\x4e\x30': + return "lilygo_t_display_s3" # display gets confused by the i2c stuff below print("odroid_go ?") if unique_id_prefixes[0] == 0x30: return "odroid_go" - print("lilygo_t_display_s3 ?") - if unique_id_prefixes == b'\xc0\x4e\x30': - return "lilygo_t_display_s3" # display gets confused by the i2c stuff below - print("fri3d_2026 ?") if unique_id_prefixes == b'\xdc\xb4\xd9': # or: if single_address_i2c_scan(i2c0, 0x6A): # IMU currently not installed on prototype board return "fri3d_2026" - # Then do I2C-based board detection print("matouch_esp32_s3_spi_ips_2_8_with_camera_ov3660 ?") if i2c0 := fail_save_i2c(sda=39, scl=38):