From 409d2bebf5ea73ca16485c8edaf276cf76a865b8 Mon Sep 17 00:00:00 2001
From: pikastech <liang6516@outlook.com>
Date: Tue, 28 Dec 2021 16:46:32 +0800
Subject: [PATCH] update core for g030, update keil project

---
 .../.settings/language.settings.xml                    |  2 +-
 bsp/stm32g030c8/MDK-ARM/stm32g030c8.uvprojx            | 10 ++++++++++
 bsp/stm32g030c8/pikascript/requestment.txt             |  4 ++--
 bsp/stm32g070cb/MDK-ARM/stm32g070.uvprojx              |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/bsp/simulation-rtt-qemu-arm2d/.settings/language.settings.xml b/bsp/simulation-rtt-qemu-arm2d/.settings/language.settings.xml
index 652416087..4ab3efb69 100644
--- a/bsp/simulation-rtt-qemu-arm2d/.settings/language.settings.xml
+++ b/bsp/simulation-rtt-qemu-arm2d/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="502669077505605869" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="526094377533236683" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/bsp/stm32g030c8/MDK-ARM/stm32g030c8.uvprojx b/bsp/stm32g030c8/MDK-ARM/stm32g030c8.uvprojx
index ec5e4082d..d37722b4a 100644
--- a/bsp/stm32g030c8/MDK-ARM/stm32g030c8.uvprojx
+++ b/bsp/stm32g030c8/MDK-ARM/stm32g030c8.uvprojx
@@ -816,6 +816,11 @@
               <FileType>1</FileType>
               <FilePath>..\pikascript\pikascript-api\PikaPiZero_LCD-api.c</FilePath>
             </File>
+            <File>
+              <FileName>PikaStdLib_RangeObj-api.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\pikascript\pikascript-api\PikaStdLib_RangeObj-api.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -921,6 +926,11 @@
               <FileType>1</FileType>
               <FilePath>..\pikascript\pikascript-lib\PikaStdDevice\PikaStdDevice_GPIO.c</FilePath>
             </File>
+            <File>
+              <FileName>PikaStdLib_RangeObj.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_RangeObj.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
diff --git a/bsp/stm32g030c8/pikascript/requestment.txt b/bsp/stm32g030c8/pikascript/requestment.txt
index f58d2a791..ff79a4ea6 100644
--- a/bsp/stm32g030c8/pikascript/requestment.txt
+++ b/bsp/stm32g030c8/pikascript/requestment.txt
@@ -1,5 +1,5 @@
-pikascript-core==v1.2.9
-PikaStdLib==v1.2.5
+pikascript-core==v1.3.0
+PikaStdLib==v1.3.0
 PikaStdDevice==v1.4.3
 PikaPiZero==v1.1.2
 STM32G030Booter==v1.2.7
diff --git a/bsp/stm32g070cb/MDK-ARM/stm32g070.uvprojx b/bsp/stm32g070cb/MDK-ARM/stm32g070.uvprojx
index e93bb53be..a97b7e289 100644
--- a/bsp/stm32g070cb/MDK-ARM/stm32g070.uvprojx
+++ b/bsp/stm32g070cb/MDK-ARM/stm32g070.uvprojx
@@ -314,7 +314,7 @@
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
-            <Optim>5</Optim>
+            <Optim>6</Optim>
             <oTime>0</oTime>
             <SplitLS>0</SplitLS>
             <OneElfS>1</OneElfS>