From 046902d47f0d3f2a62b9ea0f597067d5dec66c8e Mon Sep 17 00:00:00 2001 From: Krishnan Winter Date: Fri, 25 Oct 2024 12:30:12 +1100 Subject: [PATCH 1/2] kitty: add deploy config option Signed-off-by: Krishnan Winter --- examples/kitty/kitty.mk | 11 +++++++++-- examples/kitty/manifest.py | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/examples/kitty/kitty.mk b/examples/kitty/kitty.mk index 0abefca6..3768c221 100644 --- a/examples/kitty/kitty.mk +++ b/examples/kitty/kitty.mk @@ -37,6 +37,13 @@ else $(error Unsupported MICROKIT_BOARD given) endif +# If the KITTY_CONFIG is in deploy, then we will set the exec module +# of Micropython to be the "deploy.py" file resident in the client directory. +ifeq ($(strip $(KITTY_CONFIG)), deploy) +export EXEC_FILE := deploy.py +export EXEC_MODULE := EXEC_MODULE=$(EXEC_FILE) +endif + VMM_IMAGE_DIR := ${KITTY_DIR}/board/$(MICROKIT_BOARD)/framebuffer_vmm_images VMM_SRC_DIR := ${KITTY_DIR}/src/vmm DTS := $(VMM_IMAGE_DIR)/linux.dts @@ -145,9 +152,8 @@ vmm.elf: ${VMM_OBJS} libvmm.a # Build with two threads in parallel nproc=2 - micropython.elf: mpy-cross libsddf_util_debug.a libco.a config.py manifest.py \ - kitty.py pn532.py font_height50.py font_height35.py writer.py \ + kitty.py pn532.py font_height50.py font_height35.py writer.py deploy.py\ $(LIONSOS)/dep/libmicrokitco/Makefile make -C $(LIONSOS)/components/micropython -j$(nproc) \ MICROKIT_SDK=$(MICROKIT_SDK) \ @@ -161,6 +167,7 @@ micropython.elf: mpy-cross libsddf_util_debug.a libco.a config.py manifest.py \ CONFIG_INCLUDE=$(abspath $(CONFIG_INCLUDE)) \ ENABLE_I2C=1 \ ENABLE_FRAMEBUFFER=1 \ + $(EXEC_MODULE) \ V=1 config.py: ${KITTY_DIR}/board/$(MICROKIT_BOARD)/config.py diff --git a/examples/kitty/manifest.py b/examples/kitty/manifest.py index 34bc548b..1d656901 100644 --- a/examples/kitty/manifest.py +++ b/examples/kitty/manifest.py @@ -9,4 +9,5 @@ module("font_height35.py") module("font_height50.py") module("writer.py") -module("config.py") \ No newline at end of file +module("config.py") +module("deploy.py") \ No newline at end of file From 0829450ecdaabb2a9ff6f7984cf53797576f1132 Mon Sep 17 00:00:00 2001 From: Krishnan Winter Date: Fri, 25 Oct 2024 12:37:47 +1100 Subject: [PATCH 2/2] kitty: add example deploy script Signed-off-by: Krishnan Winter --- examples/kitty/client/deploy.py | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 examples/kitty/client/deploy.py diff --git a/examples/kitty/client/deploy.py b/examples/kitty/client/deploy.py new file mode 100644 index 00000000..d2eb615d --- /dev/null +++ b/examples/kitty/client/deploy.py @@ -0,0 +1,8 @@ +# Copyright 2024, UNSW +# SPDX-License-Identifier: BSD-2-Clause + +import kitty + +print("We are starting kitty.") + +kitty.run("fridge.keg.cse.unsw.edu.au") \ No newline at end of file