科学城双按键

diff --git a/2.sdk/project/7PIN_1_5/images/customer_fs.bin b/2.sdk/project/7PIN_1_5/images/customer_fs.bin
index 9f33589..eed12da 100644 (file)
Binary files a/2.sdk/project/7PIN_1_5/images/customer_fs.bin and b/2.sdk/project/7PIN_1_5/images/customer_fs.bin differ

diff --git a/2.sdk/project/7PIN_1_5/new.bat b/2.sdk/project/7PIN_1_5/new.bat
index 65596b9..ae22264 100644 (file)
--- a/2.sdk/project/7PIN_1_5/new.bat
+++ b/2.sdk/project/7PIN_1_5/new.bat
@@ -5,31 +5,31 @@ del images /q
 @GOTO :STEP1\r
 ..\..\Helios_SDK\tools\ASR_1606\win32\mklfs.exe -c ext -b 4096 -r 4096 -p 4096 -s 1048576 -i .\images\ext_fs.bin\r
 if errorlevel 1 (\r
-    echo "ext_fs.binÉú³Éʧ°Ü !!!!!!!!!!!!!!! "\r
+    echo "ext_fs.bin����ʧ�� !!!!!!!!!!!!!!! "\r
     goto exit\r
 )\r
 if errorlevel 0 (\r
-    echo "ext_fs.binÉú³É³É¹¦ !!!!!!!!!!!!!!! "\r
+    echo "ext_fs.bin���ɳɹ� !!!!!!!!!!!!!!! "\r
 )\r
 :STEP1\r
 \r
 ..\..\Helios_SDK\tools\ASR_1606\win32\mklfs.exe -c usr -b 4096 -r 4096 -p 4096 -s 1376256 -i .\images\customer_fs.bin\r
 if errorlevel 1 (\r
-    echo "customer_fs.binÉú³Éʧ°Ü Çë¼ì²éusrĿ¼ÊÇ·ñ´óÓÚ316K!!!!!!!!!!!!!!!"\r
+    echo "customer_fs.bin����ʧ�� ����usrĿ¼�Ƿ����316K!!!!!!!!!!!!!!!"\r
     goto exit\r
 )\r
 if errorlevel 0 (\r
-    echo "customer_fs.binÉú³É³É¹¦ !!!!!!!!!!!!!!! "\r
+    echo "customer_fs.bin���ɳɹ� !!!!!!!!!!!!!!! "\r
 )\r
 \r
 %copy font\ext_font.bin images\ext_font.bin%\r
 \r
 ..\..\Helios_SDK\tools\common\win32\7z\7z a sdk\system\platform\ASR_1606\boards\EG810MCN_GA_VOLTE\images\firmware_base_release_pack.zip .\images\\r
 if errorlevel 0 (\r
-    echo imagesѹËõ³É¹¦!!!!!!!!!!!!!!\r
+    echo imagesѹ���ɹ�!!!!!!!!!!!!!!\r
 )\r
 if errorlevel 1 (\r
-    echo imagesѹËõʧ°Ü!!!!!!!!!!!!!!!!!!\r
+    echo imagesѹ��ʧ��!!!!!!!!!!!!!!!!!!\r
     goto exit\r
 )\r
 xcopy  sdk\ ..\..\Helios_SDK\ /e/h/y\r

diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py
index e814b2b..c1d8fed 100644 (file)
--- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py
+++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py
@@ -1050,8 +1050,8 @@ class AI_dev(Abstract):
             self.extint_wakeup_cta1_timer = osTimer()
             self.extint_wakeup_cta1.enable()
         else:
-            self.pwk_key = ExtInt(ExtInt.GPIO41, ExtInt.IRQ_RISING_FALLING, ExtInt.PULL_PU, self.pwk_extint_cb)
-            # self.pwk_key = ExtInt(ExtInt.GPIO26, ExtInt.IRQ_RISING_FALLING, ExtInt.PULL_PU, self.pwk_extint_cb)
+            # self.pwk_key = ExtInt(ExtInt.GPIO41, ExtInt.IRQ_RISING_FALLING, ExtInt.PULL_PU, self.pwk_extint_cb)
+            self.pwk_key = ExtInt(ExtInt.GPIO26, ExtInt.IRQ_RISING_FALLING, ExtInt.PULL_PU, self.pwk_extint_cb)
             self.extint_AI = ExtInt(ExtInt.GPIO22,ExtInt.IRQ_RISING_FALLING, ExtInt.PULL_PU, self.keyAI_extint_cb)
 
         self.extint_AI.enable()
@@ -1901,6 +1901,7 @@ class device_res_author(Abstract):
                 url = "https://dmp-api.qipai.com/qp-dmp-api/dev/time"
                 #url = "https://dmp-dev.raisound.com/dmp-api/dev/time"
                 url = "http://dmp.raisound.com/bz-api/dev/time"#金三
+                url = "http://kxc.raisound.com/bz-api/dev/time"#科学城demo
             print("dev_NTP:{}".format(url))
             response = request.get(url,timeout=5)
             data = response.json()
@@ -2034,6 +2035,7 @@ class device_res_author(Abstract):
                     url = "https://dmp-api.qipai.com/qp-dmp-api/dev/auth/active"
                     url = "http://dmp.raisound.com/bz-api/dev/auth/active"#金三
                     # url = "https://dmp-dev.raisound.com/dmp-api/dev/auth/active"
+                    url = "http://kxc.raisound.com/bz-api/dev/auth/active"#科学城demo
                 print("dev_active:{}".format(url))
                 data =ujson.dumps(data)
                 response = None
@@ -2148,6 +2150,7 @@ class device_res_author(Abstract):
                 else:
                     sign_url = "https://dmp-api.qipai.com/qp-dmp-api/dev/auth/sign_in"
                     sign_url = "http://dmp.raisound.com/bz-api/dev/auth/sign_in"#金三
+                    sign_url = "http://kxc.raisound.com/bz-api/dev/auth/sign_in"#科学城demo
                     # sign_url = "https://dmp-dev.raisound.com/dmp-api/dev/auth/sign_in" #登入地址
                 #获取验证码
                 #url = "http://dmp.qipai.com.cn:30461/dev/device/bind-code/860132066060377"
@@ -2263,6 +2266,7 @@ class device_res_author(Abstract):
             else:
                 dev_tokenip = "https://dmp-api.qipai.com/qp-dmp-api/dev/auth/token"
                 dev_tokenip = "http://dmp.raisound.com/bz-api/dev/auth/token"#金三
+                dev_tokenip = "http://kxc.raisound.com/bz-api/dev/auth/token"#科学城demo
                 # dev_tokenip = "https://dmp-dev.raisound.com/dmp-api/dev/auth/token" #设备新令牌更新地址
                      
             token = self.dev_token
@@ -2710,6 +2714,7 @@ class AI_VC(Abstract):
                 #self.server_ip="ai.qipai.com"
                 self.server_ip="dmp-api.qipai.com/qp-amp-api"
                 self.server_ip="115.190.94.208:22080"
+                self.server_ip="kxc.raisound.com/amp-api"#科学城demo
                 #self.server_ip="sevenpin1.qipai.com.cn:22082"
             elif dev_type == "G10":
                 self.server_ip="115.190.94.208:22080"
@@ -5475,6 +5480,7 @@ class AI_VC(Abstract):
                         #EventMesh.publish("sleep_BT")#休眠蓝牙
                     else:
                         #utime.sleep_ms(1000)
+                        
                         EventMesh.publish("publish_AI_btnInfo",{"func":self.VC_Play_End})
                         #EventMesh.publish("publish_AI_btnInfo",{"func":self.chenggong_tone})
                         EventMesh.publish("publish_AI_btnInfo",{"func":self.VC_Speech_Start_now})#开始录音

diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py
index c1ae9ce..b77b699 100644 (file)
--- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py
+++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py
@@ -1461,6 +1461,7 @@ class SockMangager(Abstract):
                 self.connect_web_timer_count = 0
                 url_t = "wss://dmp-api.qipai.com/qp-iot-api/ws-hub/dev/v1?qp-dt={}".format(token)#柒牌测试
                 url_t = "ws://wsiot-nocdn.raisound.com/ws-hub/dev/v1?bz-dt={}".format(token)#北科三代
+                url_t = "ws://kxc.raisound.com/iot-api/ws-hub/dev/v1?bz-dt={}".format(token)#科学城demo
                 # url_t = "wss://dmp-dev.raisound.com/iot-api/ws-hub/dev/v1?bz-dt={}".format(token)#北科测试
                 try:
                     self.iot_protocol_client=uwebsocket.Client.connect(url_t, debug=True)