diff --git a/port/cmsis-pack/pikascript/PikaTech.PikaScript.pdsc b/port/cmsis-pack/pikascript/PikaTech.PikaScript.pdsc
index 479aefd54..31bddc776 100644
--- a/port/cmsis-pack/pikascript/PikaTech.PikaScript.pdsc
+++ b/port/cmsis-pack/pikascript/PikaTech.PikaScript.pdsc
@@ -16,7 +16,7 @@
https://github.com/pikasTech/pikascript.git
-
+
- PikaScript v1.10.3
@@ -143,8 +143,7 @@
PikaScript Kernel
-
-
+
@@ -184,7 +183,6 @@
-
@@ -192,25 +190,22 @@
-
-
-
#define RTE_Script_PikaScript
-
+
The standard library for PikaScript
-
+
@@ -272,6 +267,13 @@
+
+
+
+
+
+ The lvgl module for PikaScript
+
diff --git a/port/cmsis-pack/pikascript/PikaTech.PikaScript.xml b/port/cmsis-pack/pikascript/PikaTech.PikaScript.xml
index 381432701..052599d17 100644
--- a/port/cmsis-pack/pikascript/PikaTech.PikaScript.xml
+++ b/port/cmsis-pack/pikascript/PikaTech.PikaScript.xml
@@ -143,9 +143,7 @@
PikaScript Kernel
-
- @KERNAL
-
+@KERNAL
@@ -153,25 +151,29 @@
-
-
-
#define RTE_Script_PikaScript
-
+
The standard library for PikaScript
- @LIB
+@LIB
+
+
+
+
+ The lvgl module for PikaScript
+
+@LVGL_LIB
diff --git a/port/cmsis-pack/pikascript/makepdsc.py b/port/cmsis-pack/pikascript/makepdsc.py
index 636e50b30..f32e0b692 100644
--- a/port/cmsis-pack/pikascript/makepdsc.py
+++ b/port/cmsis-pack/pikascript/makepdsc.py
@@ -1,8 +1,10 @@
import os
version = "1.10.3"
+version_lvgl = "0.2.0"
date = "2022-08-26"
+
class Group:
path: str
files: list
@@ -63,14 +65,22 @@ api_h = Group("apiH", "pikascript-api", ".h", format=formath)
api_bat = Group("apiBat", "pikascript-api", "", format='@del "%s"', dvd="\\")
collect("kernal", [kernal_c, kernal_h, kernal_cfg])
-collect("lib", [lib_c, lib_h, api_c, api_h, lvgl_c, lvgl_h])
+collect("lib", [lib_c, lib_h, api_c, api_h])
+collect('lib_lvgl', [lvgl_c, lvgl_h])
collect("clean", [api_bat], subfix=".bat")
pdsc_xml_str = open('PikaTech.PikaScript.xml', 'r').read()
kernal_xml_str = open('kernal.xml', 'r').read()
lib_xml_str = open('lib.xml', 'r').read()
+lib_lvgl_xml_str = open('lib_lvgl.xml', 'r').read()
-pdsc_gen_str = pdsc_xml_str.replace('@KERNAL', kernal_xml_str).replace('@LIB', lib_xml_str).replace('@VERSION', version)
+pdsc_gen_str = pdsc_xml_str\
+ .replace('@LVGL_LIB', lib_lvgl_xml_str)\
+ .replace('@LVGL_VERSION', version_lvgl)\
+ .replace('@KERNAL', kernal_xml_str)\
+ .replace('@LIB', lib_xml_str)\
+ .replace('@VERSION', version)\
+ .replace('@DATE', date)\
with open('PikaTech.PikaScript.pdsc', 'w') as f:
f.write(pdsc_gen_str)
@@ -79,3 +89,4 @@ with open('PikaTech.PikaScript.pdsc', 'w') as f:
# rm lib.xml
os.remove('kernal.xml')
os.remove('lib.xml')
+os.remove('lib_lvgl.xml')