From b2abeff9ad9fe5182afd0fd7d3e730c0894ff361 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Thu, 6 Aug 2020 10:15:19 -0300
Subject: [PATCH] MKS Robin Nano CI Tests (#18927)
---
.github/workflows/test-builds.yml | 2 +-
.../src/lcd/extui/lib/mks_ui/pic_manager.cpp | 3 +-
buildroot/tests/mks_robin_nano-tests | 15 -------
buildroot/tests/mks_robin_nano35-tests | 39 +++++++++++++++++++
4 files changed, 41 insertions(+), 18 deletions(-)
delete mode 100644 buildroot/tests/mks_robin_nano-tests
create mode 100644 buildroot/tests/mks_robin_nano35-tests
diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index bcc42fbd60..fdb81fbdc9 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -78,6 +78,7 @@ jobs:
- mks_robin_pro
- STM32F103RET6_creality
- LERDGEX
+ - mks_robin_nano35
# Put lengthy tests last
@@ -94,7 +95,6 @@ jobs:
#- at90usb1286_dfu
#- STM32F103CB_malyan
#- mks_robin_mini
- #- mks_robin_nano
steps:
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/pic_manager.cpp b/Marlin/src/lcd/extui/lib/mks_ui/pic_manager.cpp
index 3f87c5183f..072213e499 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/pic_manager.cpp
+++ b/Marlin/src/lcd/extui/lib/mks_ui/pic_manager.cpp
@@ -510,9 +510,8 @@ uint8_t public_buf[512];
uint8_t pic_counter = 0;
W25QXX.SPI_FLASH_BufferRead(&pic_counter, PIC_COUNTER_ADDR, 1);
SERIAL_ECHOLNPAIR("Total assets loaded: ", pic_counter);
+ SERIAL_ECHOLNPAIR("Total Uncompressed: ", totalSizes, ", Compressed: ", totalCompressed);
#endif
-
- SERIAL_ECHOLNPAIR("Total Uncompressed: ", totalSizes, ", Compressed: ", totalCompressed);
}
#if HAS_SPI_FLASH_FONT
diff --git a/buildroot/tests/mks_robin_nano-tests b/buildroot/tests/mks_robin_nano-tests
deleted file mode 100644
index d3df7e2e5a..0000000000
--- a/buildroot/tests/mks_robin_nano-tests
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-#
-# Build tests for MKS Robin nano
-# (STM32F1 genericSTM32F103VE)
-#
-
-# exit on first failure
-set -e
-
-use_example_configs Mks/Robin
-opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO
-exec_test $1 $2 "MKS Robin nano"
-
-# cleanup
-restore_configs
diff --git a/buildroot/tests/mks_robin_nano35-tests b/buildroot/tests/mks_robin_nano35-tests
new file mode 100644
index 0000000000..ac72050875
--- /dev/null
+++ b/buildroot/tests/mks_robin_nano35-tests
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+#
+# Build tests for MKS Robin nano
+# (STM32F1 genericSTM32F103VE)
+#
+
+# exit on first failure
+set -e
+
+use_example_configs Mks/Robin
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO
+opt_disable TFT_320x240
+opt_enable TOUCH_SCREEN
+opt_enable FSMC_GRAPHICAL_TFT
+exec_test $1 $2 "MKS Robin nano v1.2 Emulated DOGM FSMC"
+
+use_example_configs Mks/Robin
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
+opt_disable TFT_320x240
+opt_enable TOUCH_SCREEN
+opt_enable SPI_GRAPHICAL_TFT
+exec_test $1 $2 "MKS Robin v2 nano Emulated DOGM SPI"
+
+use_example_configs Mks/Robin
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO
+opt_disable TFT_320x240
+opt_disable TOUCH_SCREEN
+opt_enable TFT_LVGL_UI_FSMC
+exec_test $1 $2 "MKS Robin nano v1.2 LVGL FSMC"
+
+use_example_configs Mks/Robin
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
+opt_disable TFT_320x240
+opt_disable TOUCH_SCREEN
+opt_enable TFT_LVGL_UI_SPI
+exec_test $1 $2 "MKS Robin v2 nano LVGL SPI"
+
+# cleanup
+restore_configs