update: 更新少量配置文件

bsp/air302/userdoc/user_readme.txt

@@ -9,3 +9,5 @@
 uart0, 波特率6M 8N1, 用于读取底层日志
 uart1, 波特率921600 8N1, 用于下载固件/脚本/输出日志
 uart2, 用户使用
+
+QQ群: 972784352

bsp/air640w/air640w.py

@@ -14,33 +14,21 @@ import json
 import configparser
 config = configparser.ConfigParser()
 config['air640w'] = {
-    # ============================================================
-    # 不要修改PLAT_ROOT!不要修改PLAT_ROOT!不要修改PLAT_ROOT!
-    # PLAT_ROOT仅供SDK源码开发者使用!!!!
-    # 不要把PLAT_ROOT指向任何存在的路径!!!!!
-    "PLAT_ROOT" : "D:\\github\\air640w\\sdk\\PLAT\\",
-    # ============================================================
     "FTC_PATH" : ".\\",
-    "EC_PATH" : ".\\air640w_dev.ec",
-    "USER_PATH": ".\\user\\",
+    "USER_PATH": ".\\demo\\73.mqtt2",
     "LIB_PATH" : ".\\lib\\",
     "DEMO_PATH": ".\\demo\\",
     "TOOLS_PATH": ".\\tools\\",
     "MAIN_LUA_DEBUG" : "false",
     "LUA_DEBUG" : "false",
-    "COM_PORT" : "COM28"
+    "COM_PORT" : "COM59"
 }
 if os.path.exists("local.ini") :
     config.read("local.ini")
-if os.path.exists(config["air640w"]["PLAT_ROOT"]):
-    PLAT_ROOT = os.path.abspath(config["air640w"]["PLAT_ROOT"]) + os.sep # 源码地址
-else:
-    PLAT_ROOT = config["air640w"]["PLAT_ROOT"] 
-FTC_PATH = os.path.abspath(config["air640w"]["FTC_PATH"])  + os.sep   # FlashToolCLI刷机工具的目录
-EC_PATH = os.path.abspath(config["air640w"]["EC_PATH"])               # EC后缀的固件路径
+FTC_PATH = os.path.abspath(config["air640w"]["FTC_PATH"])  + os.sep   # 工作目录
 USER_PATH = os.path.abspath(config["air640w"]["USER_PATH"]) + os.sep  # 用户脚本所在的目录
-LIB_PATH = os.path.abspath(config["air640w"]["LIB_PATH"])  + os.sep   # 用户脚本所在的目录
-DEMO_PATH = os.path.abspath(config["air640w"]["DEMO_PATH"])  + os.sep # 用户脚本所在的目录
+LIB_PATH = os.path.abspath(config["air640w"]["LIB_PATH"])  + os.sep   # 库脚本所在的目录
+DEMO_PATH = os.path.abspath(config["air640w"]["DEMO_PATH"])  + os.sep # demo脚本所在的目录,仅用于固件发布包
 MAIN_LUA_DEBUG = config["air640w"]["MAIN_LUA_DEBUG"] == "true"
 LUA_DEBUG = config["air640w"]["LUA_DEBUG"] == "true"
 COM_PORT = config["air640w"]["COM_PORT"]
@@ -53,10 +41,7 @@ TOOLS_PATH = os.path.abspath(config["air640w"]["TOOLS_PATH"])  + os.sep
 '''
 def get_git_revision_short_hash():
     try :
-        if os.path.exists(PLAT_ROOT):
-            return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'], cwd=PLAT_ROOT).strip()
-        else:
-            return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).strip()
+        return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).strip()
     except:
         return ""
 
@@ -68,11 +53,11 @@ def usage():
     python air640w.py [action]
 
     lfs   - 编译文件系统
-    dlrom - 下载底层固件
+    dlrom - 下载底层固件(暂不支持)
     dlfs  - 下载lua脚本(即整个文件系统)
     dlfull- 下载底层和lua脚本
     pkg   - 生成发布用的压缩包
-    build - 构建源码(仅内部使用)
+    build - 构建源码(仅内部使用,暂不可用)
 
     用例1, 生成文件系统并下载到开发板
     python air640w.py lfs dlfs
@@ -91,7 +76,6 @@ def usage():
 执行打包程序,内部使用
 '''
 def _pkg():
-    # TODO 扩展为用户可用的打包ec固件的工具
     if os.path.exists("tmp"):
         shutil.rmtree("tmp")
 
@@ -223,7 +207,7 @@ def _lfs(_path=None):
         # 如果是lua文件, 编译之
         if name.endswith(".lua") :
             cmd = [TOOLS_PATH + "luac_536_32bits.exe"]
-            print ("Using Lua 32bits!!!")
+            #print ("Using Lua 32bits!!!")
             if name.endswith("main.lua") :
                 if not MAIN_LUA_DEBUG :
                     cmd += ["-s"]
@@ -262,6 +246,7 @@ def _lfs(_path=None):
                 # 写入文件内容
                 _path = os.path.join(root, name)
                 _size = os.path.getsize(_path)
+                print(_path, _size)
                 f.write(struct.pack("<HHI", 0x0202, 0x00, _size))
                 with open(_path, "rb") as f2 :
                     shutil.copyfileobj(f2, f, _size)
@@ -276,7 +261,6 @@ def main():
     while len(sys.argv) > argc :
         if sys.argv[argc] == "build" :
             print("Action Build ----------------------------------")
-            #subprocess.check_call([PLAT_ROOT + "KeilBuild.bat"], cwd=PLAT_ROOT)
         elif sys.argv[argc] == "lfs" :
             print("Action mklfs ----------------------------------")
             _lfs()

bsp/air640w/rtt/.config

@@ -44,12 +44,12 @@ CONFIG_RT_USING_MUTEX=y
 CONFIG_RT_USING_EVENT=y
 CONFIG_RT_USING_MAILBOX=y
 CONFIG_RT_USING_MESSAGEQUEUE=y
-# CONFIG_RT_USING_SIGNALS is not set
+CONFIG_RT_USING_SIGNALS=y
 
 #
 # Memory Management
 #
-# CONFIG_RT_USING_MEMPOOL is not set
+CONFIG_RT_USING_MEMPOOL=y
 # CONFIG_RT_USING_MEMHEAP is not set
 # CONFIG_RT_USING_NOHEAP is not set
 CONFIG_RT_USING_SMALL_MEM=y
@@ -62,7 +62,7 @@ CONFIG_RT_USING_HEAP=y
 #
 CONFIG_RT_USING_DEVICE=y
 # CONFIG_RT_USING_DEVICE_OPS is not set
-# CONFIG_RT_USING_INTERRUPT_INFO is not set
+CONFIG_RT_USING_INTERRUPT_INFO=y
 CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_CONSOLEBUF_SIZE=512
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart0"
@@ -137,6 +137,7 @@ CONFIG_RT_USING_I2C=y
 # CONFIG_RT_I2C_DEBUG is not set
 CONFIG_RT_USING_I2C_BITOPS=y
 # CONFIG_RT_I2C_BITOPS_DEBUG is not set
+# CONFIG_RT_USING_PHY is not set
 CONFIG_RT_USING_PIN=y
 # CONFIG_RT_USING_ADC is not set
 # CONFIG_RT_USING_DAC is not set
@@ -237,6 +238,7 @@ CONFIG_RT_USING_LIBC=y
 CONFIG_RT_USING_POSIX=y
 # CONFIG_RT_USING_POSIX_MMAP is not set
 # CONFIG_RT_USING_POSIX_TERMIOS is not set
+# CONFIG_RT_USING_POSIX_GETLINE is not set
 # CONFIG_RT_USING_POSIX_AIO is not set
 # CONFIG_RT_USING_MODULE is not set
 
@@ -276,6 +278,7 @@ CONFIG_RT_USING_LWIP=y
 CONFIG_RT_USING_LWIP202=y
 # CONFIG_RT_USING_LWIP212 is not set
 # CONFIG_RT_USING_LWIP_IPV6 is not set
+CONFIG_RT_LWIP_MEM_ALIGNMENT=4
 CONFIG_RT_LWIP_IGMP=y
 CONFIG_RT_LWIP_ICMP=y
 # CONFIG_RT_LWIP_SNMP is not set
@@ -329,10 +332,7 @@ CONFIG_LWIP_NETIF_LOOPBACK=0
 # AT commands
 #
 # CONFIG_RT_USING_AT is not set
-CONFIG_LWIP_USING_DHCPD=y
-CONFIG_DHCPD_SERVER_IP="192.168.169.1"
-# CONFIG_DHCPD_USING_ROUTER is not set
-# CONFIG_LWIP_USING_CUSTOMER_DNS_SERVER is not set
+# CONFIG_LWIP_USING_DHCPD is not set
 
 #
 # VBUS(Virtual Software BUS)
@@ -382,16 +382,6 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
 # CONFIG_PKG_USING_PAHOMQTT is not set
 # CONFIG_PKG_USING_UMQTT is not set
 # CONFIG_PKG_USING_WEBCLIENT is not set
-# CONFIG_WEBCLIENT_NOT_USE_TLS is not set
-# CONFIG_WEBCLIENT_USING_SAL_TLS is not set
-# CONFIG_WEBCLIENT_USING_MBED_TLS is not set
-# CONFIG_PKG_USING_WEBCLIENT_V212 is not set
-# CONFIG_PKG_USING_WEBCLIENT_V211 is not set
-# CONFIG_PKG_USING_WEBCLIENT_V210 is not set
-# CONFIG_PKG_USING_WEBCLIENT_V201 is not set
-# CONFIG_PKG_USING_WEBCLIENT_V200 is not set
-# CONFIG_PKG_USING_WEBCLIENT_V100 is not set
-# CONFIG_PKG_USING_WEBCLIENT_LATEST_VERSION is not set
 # CONFIG_PKG_USING_WEBNET is not set
 # CONFIG_PKG_USING_MONGOOSE is not set
 # CONFIG_PKG_USING_MYMQTT is not set
@@ -434,6 +424,7 @@ CONFIG_NETUTILS_NTP_HOSTNAME2="ntp.rt-thread.org"
 CONFIG_NETUTILS_NTP_HOSTNAME3="edu.ntp.org.cn"
 # CONFIG_PKG_NETUTILS_TELNET is not set
 # CONFIG_PKG_NETUTILS_TCPDUMP is not set
+# CONFIG_PKG_USING_NETUTILS_V120 is not set
 CONFIG_PKG_USING_NETUTILS_V110=y
 # CONFIG_PKG_USING_NETUTILS_V100 is not set
 # CONFIG_PKG_USING_NETUTILS_LATEST_VERSION is not set
@@ -474,6 +465,10 @@ CONFIG_PKG_NETUTILS_VER="v1.1.0"
 # CONFIG_PKG_USING_RT_CJSON_TOOLS is not set
 # CONFIG_PKG_USING_AGILE_TELNET is not set
 # CONFIG_PKG_USING_NMEALIB is not set
+# CONFIG_PKG_USING_AGILE_JSMN is not set
+# CONFIG_PKG_USING_PDULIB is not set
+# CONFIG_PKG_USING_BTSTACK is not set
+# CONFIG_PKG_USING_LORAWAN_ED_STACK is not set
 
 #
 # security packages
@@ -484,6 +479,7 @@ CONFIG_PKG_NETUTILS_VER="v1.1.0"
 # CONFIG_PKG_USING_TFM is not set
 CONFIG_PKG_USING_YD_CRYPTO=y
 CONFIG_PKG_YD_CRYPTO_PATH="/packages/security/yd_crypto"
+# CONFIG_PKG_USING_YD_CRYPTO_V1101 is not set
 CONFIG_PKG_USING_YD_CRYPTO_LATEST_VERSION=y
 CONFIG_PKG_YD_CRYPTO_VER="latest"
 
@@ -502,6 +498,7 @@ CONFIG_PKG_YD_CRYPTO_VER="latest"
 # CONFIG_PKG_USING_STEMWIN is not set
 # CONFIG_PKG_USING_WAVPLAYER is not set
 # CONFIG_PKG_USING_TJPGD is not set
+# CONFIG_PKG_USING_HELIX is not set
 
 #
 # tools packages
@@ -522,6 +519,7 @@ CONFIG_PKG_YD_CRYPTO_VER="latest"
 # CONFIG_PKG_USING_BS8116A is not set
 # CONFIG_PKG_USING_GPS_RMC is not set
 # CONFIG_PKG_USING_URLENCODE is not set
+# CONFIG_PKG_USING_UMCN is not set
 
 #
 # system packages
@@ -548,7 +546,15 @@ CONFIG_PKG_YD_CRYPTO_VER="latest"
 # CONFIG_PKG_USING_RAMDISK is not set
 # CONFIG_PKG_USING_MININI is not set
 # CONFIG_PKG_USING_QBOOT is not set
+# CONFIG_PKG_USING_PPOOL is not set
+
+#
+# Micrium: Micrium software products porting for RT-Thread
+#
 # CONFIG_PKG_USING_UCOSIII_WRAPPER is not set
+# CONFIG_PKG_USING_UC_CRC is not set
+# CONFIG_PKG_USING_UC_CLK is not set
+# CONFIG_PKG_USING_UC_COMMON is not set
 
 #
 # peripheral libraries and drivers
@@ -634,6 +640,10 @@ CONFIG_PKG_WM_LIBRARIES_VER="latest"
 # CONFIG_PKG_USING_PAJ7620 is not set
 # CONFIG_PKG_USING_AGILE_CONSOLE is not set
 # CONFIG_PKG_USING_LD3320 is not set
+# CONFIG_PKG_USING_WK2124 is not set
+# CONFIG_PKG_USING_LY68L6400 is not set
+# CONFIG_PKG_USING_DM9051 is not set
+# CONFIG_PKG_USING_SSD1306 is not set
 
 #
 # miscellaneous packages
@@ -668,9 +678,14 @@ CONFIG_PKG_WM_LIBRARIES_VER="latest"
 # CONFIG_PKG_USING_ELAPACK is not set
 # CONFIG_PKG_USING_ARMv7M_DWT is not set
 # CONFIG_PKG_USING_VT100 is not set
+# CONFIG_PKG_USING_TETRIS is not set
 # CONFIG_PKG_USING_ULAPACK is not set
 # CONFIG_PKG_USING_UKAL is not set
 # CONFIG_PKG_USING_CRCLIB is not set
+# CONFIG_PKG_USING_THREES is not set
+# CONFIG_PKG_USING_2048 is not set
+# CONFIG_PKG_USING_LWGPS is not set
+# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set
 
 #
 # Env config

bsp/air640w/rtt/rtconfig.h

@@ -28,15 +28,18 @@
 #define RT_USING_EVENT
 #define RT_USING_MAILBOX
 #define RT_USING_MESSAGEQUEUE
+#define RT_USING_SIGNALS
 
 /* Memory Management */
 
+#define RT_USING_MEMPOOL
 #define RT_USING_SMALL_MEM
 #define RT_USING_HEAP
 
 /* Kernel Device Object */
 
 #define RT_USING_DEVICE
+#define RT_USING_INTERRUPT_INFO
 #define RT_USING_CONSOLE
 #define RT_CONSOLEBUF_SIZE 512
 #define RT_CONSOLE_DEVICE_NAME "uart0"
@@ -175,6 +178,7 @@
 
 #define RT_USING_LWIP
 #define RT_USING_LWIP202
+#define RT_LWIP_MEM_ALIGNMENT 4
 #define RT_LWIP_IGMP
 #define RT_LWIP_ICMP
 #define RT_LWIP_DNS
@@ -217,8 +221,6 @@
 
 /* AT commands */
 
-#define LWIP_USING_DHCPD
-#define DHCPD_SERVER_IP "192.168.169.1"
 
 /* VBUS(Virtual Software BUS) */
 
@@ -281,6 +283,9 @@
 /* system packages */
 
 
+/* Micrium: Micrium software products porting for RT-Thread */
+
+
 /* peripheral libraries and drivers */
 
 #define PKG_USING_U8G2