From: Caisking <3449750381@qq.com>
Date: Thu, 18 Jul 2024 08:37:55 +0000 (+0800)
Subject: 同步lzma配置
X-Git-Tag: release_V1.2.70_20241020_135402~702^2~42
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F549%2F2;p=mirrors%2FFD230.git
同步lzma配置
---
diff --git a/.gitignore b/.gitignore
index 357b1a6c6..2a5b10553 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@ code/sdk/build/config/target_config/brandy/mk_fs_image/z1/file_tmp.bin
tools/dial_converter_tool/__pycache__/**
tools/dial_converter_tool/out/**
tools/dial_converter_tool/dial/**
-tools/dial_converter_tool/dial_lzma/**
tools/image_converter_tool/__pycache__/**
tools/image_converter_tool/include/**
tools/image_converter_tool/output/**
diff --git a/tools/dial_converter_tool/dial_lzma/101/sport.lzma b/tools/dial_converter_tool/dial_lzma/101/sport.lzma
new file mode 100644
index 000000000..df0fb4eee
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/101/sport.lzma differ
diff --git a/tools/dial_converter_tool/dial_lzma/101/sport.png b/tools/dial_converter_tool/dial_lzma/101/sport.png
new file mode 100644
index 000000000..7b684e6ef
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/101/sport.png differ
diff --git "a/tools/dial_converter_tool/dial_lzma/101/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/101/\350\257\264\346\230\216.txt"
new file mode 100644
index 000000000..18d09fec2
--- /dev/null
+++ "b/tools/dial_converter_tool/dial_lzma/101/\350\257\264\346\230\216.txt"
@@ -0,0 +1,3 @@
+䏿åï¼è¿å¨
+è±æåï¼Sport
+æ ç¾ï¼ç»å
¸æé è¿å¨
\ No newline at end of file
diff --git a/tools/dial_converter_tool/dial_lzma/102/kaleidoscope.lzma b/tools/dial_converter_tool/dial_lzma/102/kaleidoscope.lzma
new file mode 100644
index 000000000..500614381
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/102/kaleidoscope.lzma differ
diff --git a/tools/dial_converter_tool/dial_lzma/102/kaleidoscope.png b/tools/dial_converter_tool/dial_lzma/102/kaleidoscope.png
new file mode 100644
index 000000000..3f00083f2
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/102/kaleidoscope.png differ
diff --git "a/tools/dial_converter_tool/dial_lzma/102/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/102/\350\257\264\346\230\216.txt"
new file mode 100644
index 000000000..1e9a45cef
--- /dev/null
+++ "b/tools/dial_converter_tool/dial_lzma/102/\350\257\264\346\230\216.txt"
@@ -0,0 +1,3 @@
+䏿åï¼ä¸è±ç
+è±æåï¼Kaleidoscope
+æ ç¾ï¼ç»å
¸æéï¼å¨æ
\ No newline at end of file
diff --git a/tools/dial_converter_tool/dial_lzma/1028/KUMI.lzma b/tools/dial_converter_tool/dial_lzma/1028/KUMI.lzma
new file mode 100644
index 000000000..976e837a6
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/1028/KUMI.lzma differ
diff --git a/tools/dial_converter_tool/dial_lzma/1028/KUMI.png b/tools/dial_converter_tool/dial_lzma/1028/KUMI.png
new file mode 100644
index 000000000..ee19ac9d1
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/1028/KUMI.png differ
diff --git "a/tools/dial_converter_tool/dial_lzma/1028/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/1028/\350\257\264\346\230\216.txt"
new file mode 100644
index 000000000..374c9c847
--- /dev/null
+++ "b/tools/dial_converter_tool/dial_lzma/1028/\350\257\264\346\230\216.txt"
@@ -0,0 +1,3 @@
+䏿åï¼KUMI
+è±æåï¼KUMI
+æ ç¾ï¼æ°ç 表ç
\ No newline at end of file
diff --git a/tools/dial_converter_tool/dial_lzma/103/jellyfish-app.png b/tools/dial_converter_tool/dial_lzma/103/jellyfish-app.png
new file mode 100644
index 000000000..a795ad77e
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/103/jellyfish-app.png differ
diff --git a/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma b/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma
new file mode 100644
index 000000000..636be6b98
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma differ
diff --git "a/tools/dial_converter_tool/dial_lzma/103/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/103/\350\257\264\346\230\216.txt"
new file mode 100644
index 000000000..cca31731d
--- /dev/null
+++ "b/tools/dial_converter_tool/dial_lzma/103/\350\257\264\346\230\216.txt"
@@ -0,0 +1,3 @@
+䏿åï¼æ°´æ¯
+è±æåï¼Jellyfish
+æ ç¾ï¼æ°ç 表çï¼å¨ç©
\ No newline at end of file
diff --git a/tools/dial_converter_tool/dial_lzma/104/dog.lzma b/tools/dial_converter_tool/dial_lzma/104/dog.lzma
new file mode 100644
index 000000000..d91b1555a
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/104/dog.lzma differ
diff --git a/tools/dial_converter_tool/dial_lzma/104/dog.png b/tools/dial_converter_tool/dial_lzma/104/dog.png
new file mode 100644
index 000000000..0ec165546
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/104/dog.png differ
diff --git "a/tools/dial_converter_tool/dial_lzma/104/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/104/\350\257\264\346\230\216.txt"
new file mode 100644
index 000000000..5d5bd58b5
--- /dev/null
+++ "b/tools/dial_converter_tool/dial_lzma/104/\350\257\264\346\230\216.txt"
@@ -0,0 +1,3 @@
+䏿åï¼å°ç
+è±æåï¼Dog
+æ ç¾ï¼ç»å
¸æéï¼å¨ç©
\ No newline at end of file
diff --git a/tools/dial_converter_tool/dial_lzma/105/kitty.lzma b/tools/dial_converter_tool/dial_lzma/105/kitty.lzma
new file mode 100644
index 000000000..bbdd418c7
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/105/kitty.lzma differ
diff --git a/tools/dial_converter_tool/dial_lzma/105/kitty.png b/tools/dial_converter_tool/dial_lzma/105/kitty.png
new file mode 100644
index 000000000..8bf1d8315
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/105/kitty.png differ
diff --git "a/tools/dial_converter_tool/dial_lzma/105/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/105/\350\257\264\346\230\216.txt"
new file mode 100644
index 000000000..7445a7ffc
--- /dev/null
+++ "b/tools/dial_converter_tool/dial_lzma/105/\350\257\264\346\230\216.txt"
@@ -0,0 +1,3 @@
+䏿åï¼å°ç«
+è±æåï¼Kitty
+æ ç¾ï¼æ°ç 表çï¼å¨æï¼å¨ç©
\ No newline at end of file
diff --git a/tools/dial_converter_tool/dial_lzma/1052/classic.lzma b/tools/dial_converter_tool/dial_lzma/1052/classic.lzma
new file mode 100644
index 000000000..e83cc22a6
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/1052/classic.lzma differ
diff --git a/tools/dial_converter_tool/dial_lzma/1052/classic.png b/tools/dial_converter_tool/dial_lzma/1052/classic.png
new file mode 100644
index 000000000..c28154e59
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/1052/classic.png differ
diff --git "a/tools/dial_converter_tool/dial_lzma/1052/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/1052/\350\257\264\346\230\216.txt"
new file mode 100644
index 000000000..065092c6f
--- /dev/null
+++ "b/tools/dial_converter_tool/dial_lzma/1052/\350\257\264\346\230\216.txt"
@@ -0,0 +1,3 @@
+䏿åï¼æéå ä½
+è±æåï¼Classic_Geometry
+æ ç¾ï¼ç»å
¸æé
\ No newline at end of file
diff --git a/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma b/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma
new file mode 100644
index 000000000..c5fb8934d
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma differ
diff --git a/tools/dial_converter_tool/dial_lzma/106/galaxy.png b/tools/dial_converter_tool/dial_lzma/106/galaxy.png
new file mode 100644
index 000000000..a7a11bb5e
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/106/galaxy.png differ
diff --git "a/tools/dial_converter_tool/dial_lzma/106/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/106/\350\257\264\346\230\216.txt"
new file mode 100644
index 000000000..8d6decaf4
--- /dev/null
+++ "b/tools/dial_converter_tool/dial_lzma/106/\350\257\264\346\230\216.txt"
@@ -0,0 +1,3 @@
+䏿åï¼æç©º
+è±æåï¼Galaxy
+æ ç¾ï¼æ°ç 表çï¼è¿å¨
\ No newline at end of file
diff --git a/tools/dial_converter_tool/dial_lzma/107/geometry.lzma b/tools/dial_converter_tool/dial_lzma/107/geometry.lzma
new file mode 100644
index 000000000..ac2229828
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/107/geometry.lzma differ
diff --git a/tools/dial_converter_tool/dial_lzma/107/geometry.png b/tools/dial_converter_tool/dial_lzma/107/geometry.png
new file mode 100644
index 000000000..5e74676a8
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/107/geometry.png differ
diff --git "a/tools/dial_converter_tool/dial_lzma/107/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/107/\350\257\264\346\230\216.txt"
new file mode 100644
index 000000000..bb6cd9f3f
--- /dev/null
+++ "b/tools/dial_converter_tool/dial_lzma/107/\350\257\264\346\230\216.txt"
@@ -0,0 +1,3 @@
+䏿åï¼æ°ç å ä½
+è±æåï¼Digital_Geometry
+æ ç¾ï¼æ°ç 表çï¼å¨æ
\ No newline at end of file
diff --git a/tools/dial_converter_tool/dial_lzma/108/maomao.lzma b/tools/dial_converter_tool/dial_lzma/108/maomao.lzma
new file mode 100644
index 000000000..3097fe6f6
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/108/maomao.lzma differ
diff --git a/tools/dial_converter_tool/dial_lzma/108/maomao.png b/tools/dial_converter_tool/dial_lzma/108/maomao.png
new file mode 100644
index 000000000..51a0f5217
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/108/maomao.png differ
diff --git "a/tools/dial_converter_tool/dial_lzma/108/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/108/\350\257\264\346\230\216.txt"
new file mode 100644
index 000000000..92fc4adbc
--- /dev/null
+++ "b/tools/dial_converter_tool/dial_lzma/108/\350\257\264\346\230\216.txt"
@@ -0,0 +1,3 @@
+䏿åï¼æè´¢ç«
+è±æåï¼Luckycat
+æ ç¾ï¼ç»å
¸æéï¼å¨ç©
\ No newline at end of file
diff --git a/tools/dial_converter_tool/dial_lzma/109/succulents.lzma b/tools/dial_converter_tool/dial_lzma/109/succulents.lzma
new file mode 100644
index 000000000..5a04f6cc4
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/109/succulents.lzma differ
diff --git a/tools/dial_converter_tool/dial_lzma/109/succulents.png b/tools/dial_converter_tool/dial_lzma/109/succulents.png
new file mode 100644
index 000000000..f20518d25
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/109/succulents.png differ
diff --git "a/tools/dial_converter_tool/dial_lzma/109/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/109/\350\257\264\346\230\216.txt"
new file mode 100644
index 000000000..4b8774f27
--- /dev/null
+++ "b/tools/dial_converter_tool/dial_lzma/109/\350\257\264\346\230\216.txt"
@@ -0,0 +1,3 @@
+䏿åï¼å¤è
+è±æåï¼Succulents
+æ ç¾ï¼æ°ç 表çï¼æ¤ç©
\ No newline at end of file
diff --git a/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma b/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma
new file mode 100644
index 000000000..01c136c5e
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma differ
diff --git a/tools/dial_converter_tool/dial_lzma/110/spaceman.png b/tools/dial_converter_tool/dial_lzma/110/spaceman.png
new file mode 100644
index 000000000..a9d708a10
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/110/spaceman.png differ
diff --git "a/tools/dial_converter_tool/dial_lzma/110/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/110/\350\257\264\346\230\216.txt"
new file mode 100644
index 000000000..a3c8b2557
--- /dev/null
+++ "b/tools/dial_converter_tool/dial_lzma/110/\350\257\264\346\230\216.txt"
@@ -0,0 +1,3 @@
+䏿åï¼å®èªå
+è±æåï¼Spaceman
+æ ç¾ï¼æ°ç 表çï¼å¨æï¼äººç©
\ No newline at end of file
diff --git a/tools/dial_converter_tool/dial_lzma/111/satellite.lzma b/tools/dial_converter_tool/dial_lzma/111/satellite.lzma
new file mode 100644
index 000000000..b68cb7f40
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/111/satellite.lzma differ
diff --git a/tools/dial_converter_tool/dial_lzma/111/satellite.png b/tools/dial_converter_tool/dial_lzma/111/satellite.png
new file mode 100644
index 000000000..ba7d6fc0f
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/111/satellite.png differ
diff --git "a/tools/dial_converter_tool/dial_lzma/111/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/111/\350\257\264\346\230\216.txt"
new file mode 100644
index 000000000..ddad8ddac
--- /dev/null
+++ "b/tools/dial_converter_tool/dial_lzma/111/\350\257\264\346\230\216.txt"
@@ -0,0 +1,3 @@
+䏿åï¼å«æ
+è±æåï¼Satellite
+æ ç¾ï¼æ°ç 表çï¼å¨æ
\ No newline at end of file
diff --git a/tools/dial_converter_tool/instance/101/sport.xml b/tools/dial_converter_tool/instance/101/sport.xml
index 3db248be2..63b0225bd 100644
--- a/tools/dial_converter_tool/instance/101/sport.xml
+++ b/tools/dial_converter_tool/instance/101/sport.xml
@@ -1,15 +1,40 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/tools/dial_converter_tool/instance/109/succulents.xml b/tools/dial_converter_tool/instance/109/succulents.xml
index 985984bb4..bfb26e509 100644
--- a/tools/dial_converter_tool/instance/109/succulents.xml
+++ b/tools/dial_converter_tool/instance/109/succulents.xml
@@ -11,11 +11,11 @@
-
+
-
+
diff --git a/tools/dial_converter_tool/instance/110/spaceman.xml b/tools/dial_converter_tool/instance/110/spaceman.xml
index 770893c34..f56d43500 100644
--- a/tools/dial_converter_tool/instance/110/spaceman.xml
+++ b/tools/dial_converter_tool/instance/110/spaceman.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/tools/dial_converter_tool/instance/111/satellite.xml b/tools/dial_converter_tool/instance/111/satellite.xml
index 363d928c5..9c9622bfb 100644
--- a/tools/dial_converter_tool/instance/111/satellite.xml
+++ b/tools/dial_converter_tool/instance/111/satellite.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/tools/dial_converter_tool/make_tools/compressdial.sh b/tools/dial_converter_tool/make_tools/compressdial.sh
index f960d923b..db1fa0b26 100644
--- a/tools/dial_converter_tool/make_tools/compressdial.sh
+++ b/tools/dial_converter_tool/make_tools/compressdial.sh
@@ -1,4 +1,7 @@
#!/bin/bash
+# è¿åä¸ä¸çº§ç®å½
+cd ..
+
dialist=`ls instance/`
for dial in $dialist
do
diff --git a/tools/dial_converter_tool/make_tools/gen_dial_bin.sh b/tools/dial_converter_tool/make_tools/gen_dial_bin.sh
index f7c84cac0..9a5d89f35 100644
--- a/tools/dial_converter_tool/make_tools/gen_dial_bin.sh
+++ b/tools/dial_converter_tool/make_tools/gen_dial_bin.sh
@@ -1,10 +1,48 @@
#!/bin/bash
-dialist=`ls instance/`
-for dial in $dialist
-do
-dialfilecount=`find instance/$dial |wc -l`
-dialfilesize=`du -s instance/$dial|awk '{print $1}'`
-echo $dial [$dialfilecount] $dialfilesize
-python main.py -dir instance/$dial -output dial
-../../code/sdk/tools/bin/lzma_tool/lzma_tool -d12 -lc0 -lp0 e dial/$dial.bin dial_lzma/$dial.lzma
-done
+
+# è¿åä¸ä¸çº§ç®å½
+cd ..
+
+# æ£æ¥å¹¶å建 out å dial_lzma ç®å½
+mkdir -p out dial_lzma
+
+# è·å instance ç®å½ä¸çææåç®å½å表
+subdirs=(instance/*/)
+for subdir in "${subdirs[@]}"; do
+ # æååç®å½åç§°
+ dial=$(basename "$subdir")
+
+ # æ¥æ¾åç®å½ä¸ç XML æä»¶å¹¶æåæä»¶å
+ xml_file=$(find "$subdir" -maxdepth 1 -type f -name "*.xml" -printf "%f\n" | head -n 1)
+ if [ -z "$xml_file" ]; then
+ echo "Error: XML file not found in $subdir"
+ continue
+ fi
+
+ # è®¡ç®æä»¶æ°éå大å°
+ dialfilecount=$(find "$subdir" -maxdepth 1 -type f | wc -l)
+ dialfilesize=$(du -sh "$subdir" | awk '{print $1}')
+
+ # è¾åºç»è®¡ä¿¡æ¯
+ echo "Processing $dial [$dialfilecount files, $dialfilesize size]"
+
+ # è°ç¨ main.py å¤çåç®å½ä¸çæä»¶
+ if ! python main.py -dir "$subdir" -output out/; then
+ echo "Error processing directory $dial"
+ continue
+ fi
+
+ # å缩 .bin æä»¶å° .lzma æä»¶
+ bin_file="out/${xml_file%.xml}.bin"
+ lzma_file="dial_lzma/$dial/${xml_file%.xml}.lzma"
+
+ # å建å¿
è¦çç®å½
+ mkdir -p "$(dirname "$lzma_file")"
+
+ # ä½¿ç¨ lzma_tool å缩æä»¶
+ if ! ../lzma_tool/lzma_tool -d12 -lc0 -lp0 e "$bin_file" "$lzma_file"; then
+ echo "Compression failed for $dial"
+ else
+ echo "Compression successful for $dial"
+ fi
+done
\ No newline at end of file
diff --git "a/tools/dial_converter_tool/make_tools/\350\241\250\347\233\230\345\210\266\344\275\234\350\204\232\346\234\254\344\275\277\347\224\250\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/make_tools/\350\241\250\347\233\230\345\210\266\344\275\234\350\204\232\346\234\254\344\275\277\347\224\250\350\257\264\346\230\216.txt"
index 07860112c..b091aa46d 100644
--- "a/tools/dial_converter_tool/make_tools/\350\241\250\347\233\230\345\210\266\344\275\234\350\204\232\346\234\254\344\275\277\347\224\250\350\257\264\346\230\216.txt"
+++ "b/tools/dial_converter_tool/make_tools/\350\241\250\347\233\230\345\210\266\344\275\234\350\204\232\346\234\254\344\275\277\347\224\250\350\257\264\346\230\216.txt"
@@ -1,7 +1,7 @@
å¨liunxç¯å¢è¿è¡è¡¨çèæ¬
-ä¸è½½å¯¹åºæ¨¡å
+#ä¸è½½å¯¹åºæ¨¡å
pip install -i https://pypi.tuna.tsinghua.edu.cn/simple Pillow
pip install -i https://pypi.tuna.tsinghua.edu.cn/simple opencv-python
@@ -11,5 +11,8 @@ pip install -i https://pypi.tuna.tsinghua.edu.cn/simple matplotlib
chmod +x make_dial.sh
./make_dial.sh
-å¶ä½è¿è¡å个表ç
-python ./main.py -dir ./instance/1028/ -output ./out/
\ No newline at end of file
+#å¶ä½è¿è¡å个表ç
+python ./main.py -dir ./instance/1028/ -output ./out/
+
+#使ç¨lzma_toolå·¥å
·éè¦èµæé
+ chmod +x ../lzma_tool/lzma_tool
\ No newline at end of file