Skip to content

Commit

Permalink
release.
Browse files Browse the repository at this point in the history
  • Loading branch information
ballaswag committed Dec 19, 2023
1 parent 1606914 commit eb5e890
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
arch: [mips-linux-gnu-, aarch64-none-linux-gnu-]
zbolt: [0, 1]
theme: [zbolt, material]

runs-on: ubuntu-22.04
container:
Expand All @@ -20,7 +20,7 @@ jobs:

env:
CROSS_COMPILE: ${{ matrix.arch }}
ZBOLT: ${{ matrix.zbolt }}
GUPPY_THEME: ${{ matrix.theme }}

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ include $(LVGL_DIR)/lv_drivers/lv_drivers.mk

CSRCS += $(wildcard $(LVGL_DIR)/assets/*.c)

ifdef ZBOLT
ifeq ($(GUPPY_THEME),"zbolt")
CSRCS += $(wildcard $(LVGL_DIR)/assets/zbolt/*.c)
DEFINES += -D ZBOLT
else
Expand Down
4 changes: 2 additions & 2 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ cp reinstall-creality.sh $RELEASES_DIR

if [ x"$CROSS_COMPILE" == x"mips-linux-gnu-" ]; then
## k1
if [ $ZBOLT -eq 1 ]; then
if [ x"$GUPPY_THEME" == x"zbolt" ]; then
tar czf guppyscreen-zbolt.tar.gz -C releases .
echo -n "GUPPY_ARCHIVE_NAME=guppyscreen-zbolt"
else
tar czf guppyscreen.tar.gz -C releases .
echo -n "GUPPY_ARCHIVE_NAME=guppyscreen"
fi
else
if [ $ZBOLT -eq 1 ]; then
if [ x"$GUPPY_THEME" == x"zbolt" ]; then
tar czf guppyscreen-zbolt-arm.tar.gz -C releases .
echo -n "GUPPY_ARCHIVE_NAME=guppyscreen-zbolt-arm"
else
Expand Down
2 changes: 1 addition & 1 deletion src/print_panel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ void PrintPanel::handle_print_callback(lv_event_t *event) {
// json::parse(R"({"script":"PRINT_PREPARE_CLEAR"})"));

json fname_input = {{"filename", cur_file->full_path }};
// ws.send_jsonrpc("printer.print.start", fname_input);
ws.send_jsonrpc("printer.print.start", fname_input);
print_status.reset();
print_status.foreground();

Expand Down

0 comments on commit eb5e890

Please sign in to comment.