Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SDK
Submodule SDK updated 1 files
+61 −27 tools/scons/push.py
2 changes: 2 additions & 0 deletions ext_components/cp0_lvgl/SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ if "CONFIG_CP0_LVGL_COMPONENT_ENABLED" in os.environ or "CONFIG_SIGSLOT_COMPONEN
SRCS += Glob('src/*.c*')
if 'CONFIG_V9_5_LV_USE_SDL' in os.environ:
DEFINITIONS += ['-DHAL_PLATFORM_SDL=1']
DEFINITIONS += pkg_config_cflags("sdl2")
REQUIREMENTS += pkg_config_ldflags("sdl2")
SRCS += Glob('src/sdl/*.c*')
else:
SRCS += Glob('src/cp0/*.c*')
Expand Down
2 changes: 1 addition & 1 deletion projects/APPLaunch/main/ui/page_app/ui_app_st.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class UISTPage : public AppPage

UISTPage() : AppPage()
{
set_page_title("ST");
set_page_title("CLI");
reset_terminal();
create_ui();
bind_events();
Expand Down
2 changes: 1 addition & 1 deletion projects/APPLaunch/setup.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ssh]
local_file_path = dist
remote_file_path = /home/pi/dist
remote_host = 192.168.28.114
remote_host = 192.168.28.187
remote_port = 22
username = pi
password = pi
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
79 changes: 79 additions & 0 deletions projects/ZClaw/SConstruct
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
from pathlib import Path
import os, sys
import platform
import subprocess
"""
The default cross-compilation toolchain can be specified in a
custom `config_defaults.mk` file and passed via the `CONFIG_DEFAULT_FILE`
environment variable.

export CONFIG_DEFAULT_FILE=linux_x86_cross_cp0_config_defaults.mk
scons -j8
"""


cross_package_enabled = False

local_path = Path(os.getcwd())
sdk_path = local_path.parent.parent / "SDK"
version_file = local_path.parent.parent / "ext_components" / "cp0_lvgl" / "sdk_version.txt"

version = version_file.read_text(encoding="utf-8")
static_lib_path = sdk_path / "github_source" / f"static_lib_{version}"

if os.environ.get("CardputerZero", '') == 'y':
os.environ["CONFIG_DEFAULT_FILE"] = "linux_x86_cross_cp0_config_defaults.mk"

if os.environ.get("CONFIG_DEFAULT_FILE") == None:
if platform.machine() == 'x86_64':
os.environ["CONFIG_DEFAULT_FILE"] = "linux_x86_sdl2_config_defaults.mk"

if "cross" in os.environ.get("CONFIG_DEFAULT_FILE", ''):
cross_package_enabled = True
config_tmp_path = Path("build") / "config" / "config_tmp.mk"
sysroot_path_str = static_lib_path.as_posix().replace('"', r'\"')
config_tmp_content = (
f'CONFIG_TOOLCHAIN_SYSROOT="{sysroot_path_str}"\n'
)
if not config_tmp_path.exists() or config_tmp_path.read_text() != config_tmp_content:
config_tmp_path.parent.mkdir(parents=True, exist_ok=True)
config_tmp_path.write_text(config_tmp_content)

os.environ["SDK_PATH"] = str(sdk_path)
os.environ["EXT_COMPONENTS_PATH"] = str(sdk_path.parent / "ext_components")

env = SConscript(
str(sdk_path / "tools" / "scons" / "project.py"),
variant_dir=os.getcwd(),
duplicate=0,
)

# static_lib is only needed for cross-compilation, skip in SDL mode.
if cross_package_enabled:
update = False
if not static_lib_path.exists():
update = True
else:
try:
with open(str(static_lib_path / "version"), "r") as f:
if version != f.read().strip():
update = True
except Exception:
update = True

if update:
with open(env["PROJECT_TOOL_S"]) as f:
exec(f.read())
try:
import tarfile

tarfile.TarFile.extraction_filter = staticmethod(
tarfile.fully_trusted_filter
)
except AttributeError:
pass
down_url = (
"https://github.com/CardputerZero/M5CardputerZero-UserDemo/"
"releases/download/{}/sdk_bsp.tar.gz"
).format(version)
check_wget_down(down_url, "static_lib_{}.tar.gz".format(version))
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
82 changes: 82 additions & 0 deletions projects/ZClaw/config_defaults.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@


CONFIG_LVGL_COMPONENT_ENABLED=y
CONFIG_LVGL_9_5_SRC=y




CONFIG_V9_5_LV_USE_CLIB_MALLOC=y
CONFIG_V9_5_LV_USE_CLIB_STRING=y
CONFIG_V9_5_LV_USE_CLIB_SPRINTF=y

# CONFIG_V9_5_LV_USE_LINUX_FBDEV=y

CONFIG_V9_5_LV_USE_DEMO_MUSIC=y


# CONFIG_V9_5_LV_DRAW_SW_ASM_NEON=y
# CONFIG_V9_5_LV_USE_DRAW_SW_ASM=1

# CONFIG_SMOOTH_UI_TOOLKIT_ENABLED=y


CONFIG_V9_5_LV_FS_DEFAULT_DRIVER_LETTER=65
CONFIG_V9_5_LV_USE_FS_POSIX=y
CONFIG_V9_5_LV_FS_POSIX_LETTER=65
CONFIG_V9_5_LV_FS_POSIX_PATH="/usr/share/APPLaunch/"
CONFIG_V9_5_LV_FS_POSIX_CACHE_SIZE=0


CONFIG_V9_5_LV_USE_LODEPNG=y

CONFIG_V9_5_LV_USE_VECTOR_GRAPHIC=y
CONFIG_V9_5_LV_USE_THORVG=y
CONFIG_V9_5_LV_USE_THORVG_INTERNAL=y








CONFIG_V9_5_LV_FONT_MONTSERRAT_8=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_10=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_12=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_14=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_16=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_18=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_20=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_22=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_24=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_26=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_28=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_30=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_32=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_34=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_36=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_38=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_40=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_42=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_44=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_46=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_48=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_28_COMPRESSED=y
CONFIG_V9_5_LV_FONT_DEJAVU_16_PERSIAN_HEBREW=y
CONFIG_V9_5_LV_FONT_SOURCE_HAN_SANS_SC_14_CJK=y
CONFIG_V9_5_LV_FONT_SOURCE_HAN_SANS_SC_16_CJK=y
CONFIG_V9_5_LV_FONT_UNSCII_8=y
CONFIG_V9_5_LV_FONT_UNSCII_16=y

CONFIG_V9_5_LV_FONT_DEFAULT_MONTSERRAT_14=y
CONFIG_V9_5_LV_USE_FREETYPE=y
CONFIG_V9_5_LV_FREETYPE_CACHE_FT_GLYPH_CNT=512




CONFIG_V9_5_LV_USE_DEMO_WIDGETS=y
CONFIG_SIGSLOT_COMPONENT_ENABLED=y
CONFIG_CP0_LVGL_COMPONENT_ENABLED=y
CONFIG_EVENTPP_ENABLED=y
102 changes: 102 additions & 0 deletions projects/ZClaw/linux_x86_cross_cp0_config_defaults.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@



CONFIG_TOOLCHAIN_PREFIX="aarch64-linux-gnu-"




CONFIG_LVGL_COMPONENT_ENABLED=y
CONFIG_LVGL_9_5_SRC=y




CONFIG_V9_5_LV_USE_CLIB_MALLOC=y
CONFIG_V9_5_LV_USE_CLIB_STRING=y
CONFIG_V9_5_LV_USE_CLIB_SPRINTF=y

# CONFIG_V9_5_LV_USE_LINUX_FBDEV=y

CONFIG_V9_5_LV_USE_DEMO_MUSIC=y


# CONFIG_V9_5_LV_DRAW_SW_ASM_NEON=y
# CONFIG_V9_5_LV_USE_DRAW_SW_ASM=1

# CONFIG_SMOOTH_UI_TOOLKIT_ENABLED=y


CONFIG_V9_5_LV_FS_DEFAULT_DRIVER_LETTER=65
CONFIG_V9_5_LV_USE_FS_POSIX=y
CONFIG_V9_5_LV_FS_POSIX_LETTER=65
CONFIG_V9_5_LV_FS_POSIX_PATH="/usr/share/APPLaunch/"
CONFIG_V9_5_LV_FS_POSIX_CACHE_SIZE=0


CONFIG_V9_5_LV_USE_LODEPNG=y

CONFIG_V9_5_LV_USE_VECTOR_GRAPHIC=y
CONFIG_V9_5_LV_USE_THORVG=y
CONFIG_V9_5_LV_USE_THORVG_INTERNAL=y








CONFIG_V9_5_LV_FONT_MONTSERRAT_8=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_10=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_12=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_14=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_16=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_18=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_20=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_22=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_24=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_26=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_28=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_30=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_32=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_34=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_36=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_38=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_40=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_42=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_44=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_46=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_48=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_28_COMPRESSED=y
CONFIG_V9_5_LV_FONT_DEJAVU_16_PERSIAN_HEBREW=y
CONFIG_V9_5_LV_FONT_SOURCE_HAN_SANS_SC_14_CJK=y
CONFIG_V9_5_LV_FONT_SOURCE_HAN_SANS_SC_16_CJK=y
CONFIG_V9_5_LV_FONT_UNSCII_8=y
CONFIG_V9_5_LV_FONT_UNSCII_16=y

CONFIG_V9_5_LV_FONT_DEFAULT_MONTSERRAT_14=y
CONFIG_V9_5_LV_USE_FREETYPE=y
CONFIG_V9_5_LV_FREETYPE_CACHE_FT_GLYPH_CNT=512




CONFIG_V9_5_LV_USE_DEMO_WIDGETS=y

CONFIG_V9_5_LV_USE_GIF=y

CONFIG_V9_5_LV_USE_LINUX_FBDEV=y
CONFIG_V9_5_LV_DRAW_SW_ASM_NEON=y
CONFIG_V9_5_LV_USE_DRAW_SW_ASM=1
CONFIG_V9_5_LV_USE_EVDEV=y
CONFIG_V9_5_LV_OS_PTHREAD=y
CONFIG_V9_5_LV_DRAW_THREAD_STACK_SIZE=65536
CONFIG_V9_5_LV_DRAW_THREAD_PRIO=3
CONFIG_MINIAUDIO_COMPONENT_ENABLED=y

CONFIG_SIGSLOT_COMPONENT_ENABLED=y
CONFIG_CP0_LVGL_COMPONENT_ENABLED=y
CONFIG_EVENTPP_ENABLED=y
CONFIG_RADIOLIB_COMPONENT_ENABLED=y

94 changes: 94 additions & 0 deletions projects/ZClaw/linux_x86_sdl2_config_defaults.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
# CONFIG_TOOLCHAIN_PATH="/opt/homebrew/bin"
# CONFIG_TOOLCHAIN_PREFIX="aarch64-linux-gnu-"




CONFIG_LVGL_COMPONENT_ENABLED=y
CONFIG_LVGL_9_5_SRC=y




CONFIG_V9_5_LV_USE_CLIB_MALLOC=y
CONFIG_V9_5_LV_USE_CLIB_STRING=y
CONFIG_V9_5_LV_USE_CLIB_SPRINTF=y

# CONFIG_V9_5_LV_USE_LINUX_FBDEV=y

CONFIG_V9_5_LV_USE_DEMO_MUSIC=y


# CONFIG_V9_5_LV_DRAW_SW_ASM_NEON=y
# CONFIG_V9_5_LV_USE_DRAW_SW_ASM=1

# CONFIG_SMOOTH_UI_TOOLKIT_ENABLED=y


CONFIG_V9_5_LV_FS_DEFAULT_DRIVER_LETTER=65
CONFIG_V9_5_LV_USE_FS_POSIX=y
CONFIG_V9_5_LV_FS_POSIX_LETTER=65
CONFIG_V9_5_LV_FS_POSIX_CACHE_SIZE=0


CONFIG_V9_5_LV_USE_LODEPNG=y

CONFIG_V9_5_LV_USE_VECTOR_GRAPHIC=y
CONFIG_V9_5_LV_USE_THORVG=y
CONFIG_V9_5_LV_USE_THORVG_INTERNAL=y








CONFIG_V9_5_LV_FONT_MONTSERRAT_8=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_10=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_12=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_14=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_16=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_18=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_20=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_22=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_24=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_26=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_28=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_30=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_32=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_34=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_36=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_38=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_40=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_42=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_44=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_46=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_48=y
CONFIG_V9_5_LV_FONT_MONTSERRAT_28_COMPRESSED=y
CONFIG_V9_5_LV_FONT_DEJAVU_16_PERSIAN_HEBREW=y
CONFIG_V9_5_LV_FONT_SOURCE_HAN_SANS_SC_14_CJK=y
CONFIG_V9_5_LV_FONT_SOURCE_HAN_SANS_SC_16_CJK=y
CONFIG_V9_5_LV_FONT_UNSCII_8=y
CONFIG_V9_5_LV_FONT_UNSCII_16=y

CONFIG_V9_5_LV_FONT_DEFAULT_MONTSERRAT_14=y




CONFIG_V9_5_LV_USE_DEMO_WIDGETS=y

CONFIG_V9_5_LV_USE_GIF=y

CONFIG_V9_5_LV_USE_SDL=y
CONFIG_V9_5_LV_FS_POSIX_PATH="./"
CONFIG_V9_5_LV_OS_PTHREAD=y
CONFIG_V9_5_LV_DRAW_THREAD_STACK_SIZE=65536
CONFIG_V9_5_LV_DRAW_THREAD_PRIO=3
CONFIG_MINIAUDIO_COMPONENT_ENABLED=y

CONFIG_SIGSLOT_COMPONENT_ENABLED=y
CONFIG_CP0_LVGL_COMPONENT_ENABLED=y
CONFIG_EVENTPP_ENABLED=y
CONFIG_RADIOLIB_COMPONENT_ENABLED=y
Loading
Loading