Merge branch 'setup_patch'

chbpku · Jul 8, 2019 · 6032aff · 6032aff
2 parents cda9a51 + c49f155
commit 6032aff
Show file tree

Hide file tree

Showing 69 changed files with 231 additions and 327 deletions.
diff --git a/Setup/README.md b/Setup/README.md
@@ -1,9 +1,21 @@
 dxkStickIDE可以运行在Windows和macOS等多种操作系统，请根据需要下载。
 
-# macOS系统安装注意
-macOS安装时需打开信任第三方应用的设置，方法为：
-- 运行dmg镜像内 __安装前运行.sh__
-- 或直接在控制台输入 __sudo spctl --master-disable__ 命令并执行。
+# 安装操作
+1. 安装纯净版thonny3.1.2:  
+    * 推荐: 
+        * [Windows (exe格式)](https://github.com/thonny/thonny/releases/download/v3.1.2/thonny-3.1.2.exe)
+        * [Mac (dmg格式)](https://github.com/thonny/thonny/releases/download/v3.1.2/thonny-3.1.2.dmg)
+        * [Linux (检测系统版本安装脚本)](https://github.com/thonny/thonny/releases/download/v3.1.2/thonny-3.1.2.bash)
+    * 其它版本:
+        * [Windows (免安装版)](https://github.com/thonny/thonny/releases/download/v3.1.2/thonny-3.1.2-portable-win.zip)
+        * [Linux (x86_64架构, tar.gz格式)](https://github.com/thonny/thonny/releases/download/v3.1.2/thonny-3.1.2-x86_64.tar.gz)
+        * [Linux (i686架构, tar.gz格式)](https://github.com/thonny/thonny/releases/download/v3.1.2/thonny-3.1.2-i686.tar.gz)
+
+1. 下载setup.zip并解压其中plugins_setup文件夹
+
+1. 打开Thonny, 运行该文件夹下*setup.py*文件
+    * 安装汉化插件**thonny_translate**
+    * 安装dxkStick支持插件**microbit_dxk**
 
 # win7系统安装注意
 win7系统需要安装驱动程序，可以下载本目录下的【mbedWinSerial_16466.exe】，或者在【 https://os.mbed.com/docs/latest/tutorials/windows-serial-driver.html 】下载。
diff --git a/Setup/setup_Linux_i686.tar.gz b/Setup/setup_Linux_i686.tar.gz
diff --git a/Setup/setup_Linux_x86_64.tar.gz b/Setup/setup_Linux_x86_64.tar.gz
diff --git a/Setup/setup_macOS.dmg b/Setup/setup_macOS.dmg
diff --git a/Setup/setup_windows.exe b/Setup/setup_windows.exe
diff --git a/microbit_dxk/dummy_modules/antigravity.py b/microbit_dxk/dummy_modules/antigravity.py
diff --git a/microbit_dxk/dummy_modules/array.py b/microbit_dxk/dummy_modules/array.py
diff --git a/microbit_dxk/dummy_modules/audio.py b/microbit_dxk/dummy_modules/audio.py
diff --git a/microbit_dxk/dummy_modules/love.py b/microbit_dxk/dummy_modules/love.py
diff --git a/microbit_dxk/dummy_modules/math.py b/microbit_dxk/dummy_modules/math.py
diff --git a/microbit_dxk/dummy_modules/microbit.py b/microbit_dxk/dummy_modules/microbit.py
diff --git a/microbit_dxk/dummy_modules/micropython.py b/microbit_dxk/dummy_modules/micropython.py
diff --git a/microbit_dxk/dummy_modules/music.py b/microbit_dxk/dummy_modules/music.py
diff --git a/microbit_dxk/dummy_modules/neopixel.py b/microbit_dxk/dummy_modules/neopixel.py
diff --git a/microbit_dxk/dummy_modules/os.py b/microbit_dxk/dummy_modules/os.py
diff --git a/microbit_dxk/dummy_modules/radio.py b/microbit_dxk/dummy_modules/radio.py
diff --git a/microbit_dxk/dummy_modules/random.py b/microbit_dxk/dummy_modules/random.py
diff --git a/microbit_dxk/dummy_modules/speech.py b/microbit_dxk/dummy_modules/speech.py
diff --git a/microbit_dxk/dummy_modules/sys.py b/microbit_dxk/dummy_modules/sys.py
diff --git a/microbit_dxk/dummy_modules/this.py b/microbit_dxk/dummy_modules/this.py
diff --git a/microbit_dxk/dummy_modules/ustruct.py b/microbit_dxk/dummy_modules/ustruct.py
diff --git a/plugins_setup/dxk_compact_ext/clock.py b/plugins_setup/dxk_compact_ext/clock.py
@@ -0,0 +1,12 @@
+from mb import _exe,gc
+_=[0]*6
+def time(addr):
+	_exe(addr,b'getT',6,1)
+	try:
+		for i in range(6):
+			_[i]=t[i]-1
+		return tuple(_)
+	except:pass
+def set_time(Y,M,D,h,m,s,addr):
+	_exe(addr,b"setT%c%c%c%c%c%c"%(Y,M,D,h,m,s))
+gc()