Skip to content

Commit

Permalink
本次提交最大的升级是,menuconfig全面采用kconfiglib,对应修改的内容: (#28)
Browse files Browse the repository at this point in the history
(1)升级tools/script升级到最新版本rtt env
(2)python由2.7升级为3.11,并删除python27文件夹
(3)删除tools/bin中老版本menuconfig.exe、pkgs.exe等文件
(4)首次启动脚本env.bat时需联网安装env、scons、kconfiglib等软件包
(5)修改tools/bin/env-init.bat,启动时候创建或激活python venv
  • Loading branch information
ComerLater authored Jun 17, 2024
1 parent e2a0d8d commit dc1dfc6
Show file tree
Hide file tree
Showing 7,019 changed files with 844,457 additions and 1,165,596 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 6 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
*.pyc
*.pickle
/env_log_std
/env_log_err
*.pyc
*.pickle
.venv
__pycache__
/env_log_std
/env_log_err
6 changes: 3 additions & 3 deletions env.bat
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@echo off

if /i "%processor_architecture%"=="x86" (
start .\tools\ConEmu\ConEmu.exe
start %~dp0tools\ConEmu\ConEmu.exe
) else if /i "%processor_architecture%"=="amd64" (
if defined processor_architew6432 (
start .\tools\ConEmu\ConEmu.exe
start %~dp0tools\ConEmu\ConEmu.exe
) else (
start .\tools\ConEmu\ConEmu64.exe
start %~dp0tools\ConEmu\ConEmu64.exe
)
)

Expand Down
Binary file added logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/packages
Submodule packages updated 45 files
+2 −0 iot/Kconfig
+109 −0 iot/qmodbus/Kconfig
+36 −0 iot/qmodbus/package.json
+166 −0 iot/wifi-host-driver/Kconfig
+28 −0 iot/wifi-host-driver/package.json
+4 −0 multimedia/LVGL/LVGL/Kconfig
+27 −0 peripherals/hal-sdk/Infineon/Infineon_capsense/Kconfig
+28 −0 peripherals/hal-sdk/Infineon/Infineon_capsense/package.json
+27 −0 peripherals/hal-sdk/Infineon/Infineon_cat1cm0p/Kconfig
+28 −0 peripherals/hal-sdk/Infineon/Infineon_cat1cm0p/package.json
+27 −0 peripherals/hal-sdk/Infineon/Infineon_cmsis/Kconfig
+28 −0 peripherals/hal-sdk/Infineon/Infineon_cmsis/package.json
+27 −0 peripherals/hal-sdk/Infineon/Infineon_core-lib/Kconfig
+28 −0 peripherals/hal-sdk/Infineon/Infineon_core-lib/package.json
+27 −0 peripherals/hal-sdk/Infineon/Infineon_csdidac/Kconfig
+28 −0 peripherals/hal-sdk/Infineon/Infineon_csdidac/package.json
+27 −0 peripherals/hal-sdk/Infineon/Infineon_mtb-hal-cat1/Kconfig
+28 −0 peripherals/hal-sdk/Infineon/Infineon_mtb-hal-cat1/package.json
+27 −0 peripherals/hal-sdk/Infineon/Infineon_mtb-pdl-cat1/Kconfig
+28 −0 peripherals/hal-sdk/Infineon/Infineon_mtb-pdl-cat1/package.json
+27 −0 peripherals/hal-sdk/Infineon/Infineon_retarget-io/Kconfig
+28 −0 peripherals/hal-sdk/Infineon/Infineon_retarget-io/package.json
+27 −0 peripherals/hal-sdk/Infineon/Infineon_serial-flash/Kconfig
+28 −0 peripherals/hal-sdk/Infineon/Infineon_serial-flash/package.json
+27 −0 peripherals/hal-sdk/Infineon/Infineon_usbdev/Kconfig
+28 −0 peripherals/hal-sdk/Infineon/Infineon_usbdev/package.json
+14 −0 peripherals/hal-sdk/Infineon/Kconfig
+1 −0 peripherals/hal-sdk/Kconfig
+2 −1 peripherals/hal-sdk/stm32/Kconfig
+28 −0 peripherals/hal-sdk/stm32/stm32l4_cmsis_driver/Kconfig
+29 −0 peripherals/hal-sdk/stm32/stm32l4_cmsis_driver/package.json
+28 −0 peripherals/hal-sdk/stm32/stm32l4_hal_driver/Kconfig
+6 −6 peripherals/hal-sdk/stm32/stm32l4_hal_driver/package.json
+0 −27 peripherals/hal-sdk/stm32/stm32l4xx_hal_driver/Kconfig
+2 −0 peripherals/ili9341/Kconfig
+4 −0 peripherals/sensors/mpu6xxx/Kconfig
+27 −0 signalprocess/APID/Kconfig
+28 −0 signalprocess/APID/package.json
+1 −0 signalprocess/Kconfig
+73 −15 system/CherryUSB/Kconfig
+5 −0 system/CherryUSB/package.json
+1 −0 system/Kconfig
+17 −2 system/TinyUSB/Kconfig
+27 −0 system/aUnity/Kconfig
+34 −0 system/aUnity/package.json
12 changes: 6 additions & 6 deletions tools/ConEmu/ConEmu.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<key name="Software">
<key name="ConEmu">
<key name=".Vanilla" modified="2024-02-14 12:44:03" build="230724">
<key name=".Vanilla" modified="2024-06-17 08:58:02" build="230724">
<value name="StartType" type="hex" data="02"/>
<value name="CmdLine" type="string" data=""/>
<value name="StartTasksFile" type="string" data=""/>
Expand Down Expand Up @@ -264,11 +264,11 @@
<value name="Cascaded" type="hex" data="01"/>
<value name="IntegralSize" type="hex" data="00"/>
<value name="WindowMode" type="dword" data="0000051f"/>
<value name="ConWnd X" type="long" data="1083"/>
<value name="ConWnd Y" type="long" data="336"/>
<value name="LastMonitor" type="string" data="0,0,2560,1390"/>
<value name="ConWnd Width" type="dword" data="0000007b"/>
<value name="ConWnd Height" type="dword" data="00000022"/>
<value name="ConWnd X" type="long" data="554"/>
<value name="ConWnd Y" type="long" data="103"/>
<value name="LastMonitor" type="string" data="0,0,1920,1030"/>
<value name="ConWnd Width" type="dword" data="00000078"/>
<value name="ConWnd Height" type="dword" data="00000021"/>
<value name="16bit Height" type="ulong" data="0"/>
<value name="StartCreateDelay" type="ulong" data="100"/>
<value name="ExtendFonts" type="hex" data="00"/>
Expand Down
Binary file removed tools/Python27/DLLs/_bsddb.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/_ctypes.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/_ctypes_test.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/_elementtree.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/_hashlib.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/_msi.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/_multiprocessing.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/_socket.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/_sqlite3.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/_ssl.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/_testcapi.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/_tkinter.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/bz2.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/py.ico
Binary file not shown.
Binary file removed tools/Python27/DLLs/pyc.ico
Binary file not shown.
Binary file removed tools/Python27/DLLs/pyexpat.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/select.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/sqlite3.dll
Binary file not shown.
Binary file removed tools/Python27/DLLs/tcl85.dll
Binary file not shown.
Binary file removed tools/Python27/DLLs/tclpip85.dll
Binary file not shown.
Binary file removed tools/Python27/DLLs/tk85.dll
Binary file not shown.
Binary file removed tools/Python27/DLLs/unicodedata.pyd
Binary file not shown.
Binary file removed tools/Python27/DLLs/winsound.pyd
Binary file not shown.
Binary file removed tools/Python27/Doc/python2718.chm
Binary file not shown.
748 changes: 0 additions & 748 deletions tools/Python27/LICENSE.txt

This file was deleted.

Loading

0 comments on commit dc1dfc6

Please sign in to comment.