sorting by date modified/az in file panel. layer count in print statu…

…s. build workflow.

.github/workflows/build.yml

@@ -2,21 +2,35 @@ name: guppy build
 
 on:
   push:
-    branches: [ "dev_workflow" ]
+    branches: [ "dev", "main" ]
   pull_request:
-    branches: [ "dev_workflow" ]
+    branches: [ "main" ]
 
 jobs:
   build:
+    strategy:
+      matrix:
+        arch: [mips-linux-gnu-, aarch64-none-linux-gnu-]
+        theme: [zbolt, material]
 
     runs-on: ubuntu-22.04
-    container: ballaswag/guppydev:latest
+    container:
+      image: ballaswag/guppydev:latest
+      options: --user 1001
+
+    env:
+      CROSS_COMPILE: ${{ matrix.arch }}
+      GUPPY_THEME: ${{ matrix.theme }}
+
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
-    - run: |
-        echo "CROSS_COMPILE=mips-linux-gnu-" >> $GITHUB_ENV
+
+    - name: set guppyscreen version
+      run: |
+        chmod +x ./version.sh
+        ./version.sh >> $GITHUB_ENV
 
     - name: patch lv_drivers
       run: |
@@ -37,7 +51,12 @@ jobs:
     - name: make guppyscreen
       run: make -j
 
+    - name: package release
+      run: |
+        chmod +x ./release.sh
+        ./release.sh >> $GITHUB_ENV
+
     - uses: actions/upload-artifact@v4
       with:
-        name: guppyscreen
-        path: build/bin/guppyscreen
+        name: ${{ env.GUPPY_ARCHIVE_NAME }}
+        path: ./${{ env.GUPPY_ARCHIVE_NAME }}.tar.gz

Makefile

@@ -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

VERSION

@@ -0,0 +1 @@
+0.0.14

installer.sh

@@ -119,7 +119,8 @@ if [ "$confirm_decreality" = "y" -o "$confirm_decreality" = "Y" ]; then
     rm /etc/init.d/S99start_app
 else
     # disables only display-server and Monitor
-    cp $K1_GUPPY_DIR/k1_mods/S99start_app /etc/init.d/S99start_app
+    mv /usr/bin/Monitor /usr/bin/Monitor.disable
+    mv /usr/bin/display-server /usr/bin/display-server.disable
 fi
 
 printf "${green}Setting up GuppyScreen ${white}\n"

reinstall-creality.sh

@@ -5,6 +5,8 @@ BACKUP_DIR=/usr/data/guppyify-backup
 cp $BACKUP_DIR/S12boot_display /etc/init.d/S12boot_display
 cp $BACKUP_DIR/S50dropbear /etc/init.d/S50dropbear
 cp $BACKUP_DIR/S99start_app /etc/init.d/S99start_app
+mv /usr/bin/Monitor.disable /usr/bin/Monitor
+mv /usr/bin/display-server.disable /usr/bin/display-server
 rm /etc/init.d/S99guppyscreen
 
 killall guppyscreen

release.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+RELEASES_DIR=./releases/guppyscreen
+rm -rf $RELEASES_DIR
+
+mkdir -p $RELEASES_DIR
+"$CROSS_COMPILE"strip ./build/bin/guppyscreen
+cp ./build/bin/guppyscreen $RELEASES_DIR/guppyscreen
+cp -r ./k1/k1_mods $RELEASES_DIR
+cp -r ./k1/scripts $RELEASES_DIR
+cp ./installer.sh $RELEASES_DIR
+cp reinstall-creality.sh $RELEASES_DIR
+
+if [ x"$CROSS_COMPILE" == x"mips-linux-gnu-" ]; then
+    ## k1
+    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 [ x"$GUPPY_THEME" == x"zbolt" ]; then
+	tar czf guppyscreen-zbolt-arm.tar.gz -C releases .
+	echo -n "GUPPY_ARCHIVE_NAME=guppyscreen-zbolt-arm"
+    else
+	tar czf guppyscreen-arm.tar.gz -C releases .
+	echo -n "GUPPY_ARCHIVE_NAME=guppyscreen-arm"
+    fi
+fi

src/console_panel.cpp

@@ -18,7 +18,6 @@ ConsolePanel::ConsolePanel(KWebSocketClient &websocket_client, std::mutex &lock,
   , input(lv_textarea_create(input_cont))
   , kb(lv_keyboard_create(console_cont))
 {
-  lv_obj_set_style_radius(console_cont, 0, 0);  
   lv_obj_align(console_cont, LV_ALIGN_CENTER, 0, 0);
   lv_obj_set_size(console_cont, LV_PCT(100), LV_PCT(100));
   lv_obj_set_flex_flow(console_cont, LV_FLEX_FLOW_COLUMN);

src/file_panel.cpp

@@ -9,7 +9,7 @@
 #include <sstream>
 #include <vector>
 
-FilePanel::FilePanel(lv_obj_t *parent, json &j, const std::string &gcode_path)
+FilePanel::FilePanel(lv_obj_t *parent)
   : file_cont(lv_obj_create(parent))
   , thumbnail(lv_img_create(file_cont))
   , detail_label(lv_label_create(file_cont))
@@ -18,46 +18,50 @@ FilePanel::FilePanel(lv_obj_t *parent, json &j, const std::string &gcode_path)
   lv_obj_clear_flag(file_cont, LV_OBJ_FLAG_SCROLLABLE);  
   lv_obj_align(file_cont, LV_ALIGN_CENTER, 0, 0);
 
-  std::time_t timestamp = j["result"]["modified"].template get<std::time_t>();
-  std::tm lt = *std::localtime(&timestamp);
-  std::stringstream time_stream;
-  time_stream << std::put_time(&lt, "%Y-%m-%d %H:%M");
+  static lv_coord_t grid_main_row_dsc[] = {LV_GRID_FR(3), LV_GRID_FR(2), LV_GRID_TEMPLATE_LAST};
+  static lv_coord_t grid_main_col_dsc[] = {LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
+
+  lv_obj_set_grid_dsc_array(file_cont, grid_main_col_dsc, grid_main_row_dsc);
+
+  lv_obj_set_grid_cell(thumbnail, LV_GRID_ALIGN_CENTER, 0, 1, LV_GRID_ALIGN_CENTER, 0, 1);
+  lv_obj_set_grid_cell(detail_label, LV_GRID_ALIGN_CENTER, 0, 1, LV_GRID_ALIGN_START, 1, 1);
+}
+
+FilePanel::~FilePanel() {
+  if (file_cont != NULL) {
+    lv_obj_del(file_cont);
+    file_cont = NULL;
+  }
+}
 
-  auto v = j["/result/estimated_time"_json_pointer];
+void FilePanel::refresh_view(json &j, const std::string &gcode_path) {
+  auto v = j["/result/modified"_json_pointer];
+  std::stringstream time_stream;  
+  if (!v.is_null()) {
+    std::time_t timestamp = v.template get<std::time_t>();
+    std::tm lt = *std::localtime(&timestamp);
+    time_stream << std::put_time(&lt, "%Y-%m-%d %H:%M");
+  } else {
+    time_stream << "(unknown)";
+  }
+
+  v = j["/result/estimated_time"_json_pointer];
   int eta =  v.is_null() ? -1 : v.template get<int>();
   v = j["/result/filament_weight_total"_json_pointer];
   int fweight = v.is_null() ? -1 : v.template get<int>();
-
+  
   std::string detail = fmt::format("Filament Weight: {} g\nPrint Time: {}\nSize: {} MB\nModified: {}",
 				   fweight > 0 ? std::to_string(fweight) : "(unknown)",
 				   eta > 0 ? KUtils::eta_string(eta) : "(unknown)",
 				   KUtils::bytes_to_mb(j["result"]["size"].template get<size_t>()),
 				   time_stream.str());
 
-  // std::string detail = "Modified: " + time_stream.str() + "\n" +
-  //   "Size: " + std::to_string(j["result"]["size"].template get<size_t>()) + " Bytes";
-
   std::string fullpath = KUtils::get_thumbnail(gcode_path, j);
   lv_label_set_text(detail_label, detail.c_str());
 
   if (fullpath.length() > 0) {
     lv_img_set_src(thumbnail, ("A:" + fullpath).c_str());
-    lv_img_set_zoom(thumbnail, 150);
-  }
-
-  static lv_coord_t grid_main_row_dsc[] = {LV_GRID_FR(3), LV_GRID_FR(2), LV_GRID_TEMPLATE_LAST};
-  static lv_coord_t grid_main_col_dsc[] = {LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
-
-  lv_obj_set_grid_dsc_array(file_cont, grid_main_col_dsc, grid_main_row_dsc);
-
-  lv_obj_set_grid_cell(thumbnail, LV_GRID_ALIGN_CENTER, 0, 1, LV_GRID_ALIGN_CENTER, 0, 1);
-  lv_obj_set_grid_cell(detail_label, LV_GRID_ALIGN_CENTER, 0, 1, LV_GRID_ALIGN_START, 1, 1);
-}
-
-FilePanel::~FilePanel() {
-  if (file_cont != NULL) {
-    lv_obj_del(file_cont);
-    file_cont = NULL;
+    lv_img_set_zoom(thumbnail, 200);
   }
 }
 

src/file_panel.h

@@ -11,10 +11,11 @@ using json = nlohmann::json;
 
 class FilePanel {
  public:
-  FilePanel(lv_obj_t *parent, json &j, const std::string &gcode_path);
+  FilePanel(lv_obj_t *parent);
   ~FilePanel();
 
   void foreground();
+  void refresh_view(json &j, const std::string &gcode_path);  
   lv_obj_t *get_container();
   const char* get_thumbnail_path();
 

src/image_label.cpp

@@ -28,6 +28,7 @@ ImageLabel::ImageLabel(lv_obj_t *parent,
   lv_obj_clear_flag(cont, LV_OBJ_FLAG_SCROLLABLE);
   lv_obj_set_size(cont, LV_PCT(width_pct), LV_PCT(height_pct));
   lv_obj_set_style_border_width(cont, 2, 0);
+  lv_obj_set_style_radius(cont, 4, 0);
 
   lv_img_set_src(image, img);
   lv_label_set_text(label, value);

src/main.cpp

@@ -108,6 +108,7 @@ int main(void)
 
     lv_style_init(&style_container);
     lv_style_set_border_width(&style_container, 0);
+    lv_style_set_radius(&style_container, 0);
 
     lv_style_init(&style_imgbtn_pressed);
     lv_style_set_img_recolor_opa(&style_imgbtn_pressed, LV_OPA_100);

src/main_panel.cpp

@@ -55,8 +55,6 @@ MainPanel::MainPanel(KWebSocketClient &websocket,
     lv_style_set_border_width(&style, 0);
     lv_style_set_bg_color(&style, lv_palette_darken(LV_PALETTE_GREY, 4));
 
-    lv_obj_set_style_radius(main_cont, 0, 0);
-
     ws.register_notify_update(this);    
 }
 
@@ -72,6 +70,7 @@ MainPanel::~MainPanel() {
 void MainPanel::subscribe() {
   spdlog::trace("main panel subscribing");
   ws.send_jsonrpc("printer.gcode.help", [this](json &d) { console_panel.handle_macros(d); });
+  print_panel.subscribe();
 }
 
 PrinterTunePanel& MainPanel::get_tune_panel() {
@@ -175,7 +174,6 @@ void MainPanel::handle_ledpanel_cb(lv_event_t *event) {
 void MainPanel::handle_print_cb(lv_event_t *event) {
   if (lv_event_get_code(event) == LV_EVENT_CLICKED) {
     spdlog::trace("clicked print");
-    print_panel.subscribe();
     print_panel.foreground();
   }
 }
@@ -217,8 +215,6 @@ void MainPanel::create_main(lv_obj_t * parent)
 
     lv_chart_set_div_line_count(temp_chart, 3, 8);
     lv_chart_set_point_count(temp_chart, 250);
-
-    lv_obj_set_style_radius(temp_chart, 0, 0);
 }
 
 void MainPanel::create_sensors(json &temp_sensors) {