upgrade haas_python for fast porting purpose

Signed-off-by: ethan.lcz <ethan.lcz@alibaba-inc.com>

README.md

@@ -1,188 +1,53 @@
-[![CI badge](https://github.com/micropython/micropython/workflows/unix%20port/badge.svg)](https://github.com/micropython/micropython/actions?query=branch%3Amaster+event%3Apush) [![codecov](https://codecov.io/gh/micropython/micropython/branch/master/graph/badge.svg?token=I92PfD05sD)](https://codecov.io/gh/micropython/micropython)
 
-The MicroPython project
+HaaS Python 工程
 =======================
-<p align="center">
-  <img src="https://raw.githubusercontent.com/micropython/micropython/master/logo/upython-with-micro.jpg" alt="MicroPython Logo"/>
-</p>
-
-This is the MicroPython project, which aims to put an implementation
-of Python 3.x on microcontrollers and small embedded systems.
-You can find the official website at [micropython.org](http://www.micropython.org).
-
-WARNING: this project is in beta stage and is subject to changes of the
-code-base, including project-wide name changes and API changes.
-
-MicroPython implements the entire Python 3.4 syntax (including exceptions,
-`with`, `yield from`, etc., and additionally `async`/`await` keywords from
-Python 3.5). The following core datatypes are provided: `str` (including
-basic Unicode support), `bytes`, `bytearray`, `tuple`, `list`, `dict`, `set`,
-`frozenset`, `array.array`, `collections.namedtuple`, classes and instances.
-Builtin modules include `sys`, `time`, and `struct`, etc. Select ports have
-support for `_thread` module (multithreading). Note that only a subset of
-Python 3 functionality is implemented for the data types and modules.
-
-MicroPython can execute scripts in textual source form or from precompiled
-bytecode, in both cases either from an on-device filesystem or "frozen" into
-the MicroPython executable.
-
-See the repository http://github.com/micropython/pyboard for the MicroPython
-board (PyBoard), the officially supported reference electronic circuit board.
-
-Major components in this repository:
-- py/ -- the core Python implementation, including compiler, runtime, and
-  core library.
-- mpy-cross/ -- the MicroPython cross-compiler which is used to turn scripts
-  into precompiled bytecode.
-- ports/unix/ -- a version of MicroPython that runs on Unix.
-- ports/stm32/ -- a version of MicroPython that runs on the PyBoard and similar
-  STM32 boards (using ST's Cube HAL drivers).
-- ports/minimal/ -- a minimal MicroPython port. Start with this if you want
-  to port MicroPython to another microcontroller.
-- tests/ -- test framework and test scripts.
-- docs/ -- user documentation in Sphinx reStructuredText format. Rendered
-  HTML documentation is available at http://docs.micropython.org.
-
-Additional components:
-- ports/bare-arm/ -- a bare minimum version of MicroPython for ARM MCUs. Used
-  mostly to control code size.
-- ports/teensy/ -- a version of MicroPython that runs on the Teensy 3.1
-  (preliminary but functional).
-- ports/pic16bit/ -- a version of MicroPython for 16-bit PIC microcontrollers.
-- ports/cc3200/ -- a version of MicroPython that runs on the CC3200 from TI.
-- ports/esp8266/ -- a version of MicroPython that runs on Espressif's ESP8266 SoC.
-- ports/esp32/ -- a version of MicroPython that runs on Espressif's ESP32 SoC.
-- ports/nrf/ -- a version of MicroPython that runs on Nordic's nRF51 and nRF52 MCUs.
-- extmod/ -- additional (non-core) modules implemented in C.
-- tools/ -- various tools, including the pyboard.py module.
-- examples/ -- a few example Python scripts.
-
-The subdirectories above may include READMEs with additional info.
-
-"make" is used to build the components, or "gmake" on BSD-based systems.
-You will also need bash, gcc, and Python 3.3+ available as the command `python3`
-(if your system only has Python 2.7 then invoke make with the additional option
-`PYTHON=python2`).
-
-The MicroPython cross-compiler, mpy-cross
------------------------------------------
-
-Most ports require the MicroPython cross-compiler to be built first.  This
-program, called mpy-cross, is used to pre-compile Python scripts to .mpy
-files which can then be included (frozen) into the firmware/executable for
-a port.  To build mpy-cross use:
-
-    $ cd mpy-cross
-    $ make
-
-The Unix version
-----------------
-
-The "unix" port requires a standard Unix environment with gcc and GNU make.
-x86 and x64 architectures are supported (i.e. x86 32- and 64-bit), as well
-as ARM and MIPS. Making full-featured port to another architecture requires
-writing some assembly code for the exception handling and garbage collection.
-Alternatively, fallback implementation based on setjmp/longjmp can be used.
-
-To build (see section below for required dependencies):
-
-    $ cd ports/unix
-    $ make submodules
-    $ make
-
-Then to give it a try:
-
-    $ ./micropython
-    >>> list(5 * x + y for x in range(10) for y in [4, 2, 1])
-
-Use `CTRL-D` (i.e. EOF) to exit the shell.
-Learn about command-line options (in particular, how to increase heap size
-which may be needed for larger applications):
 
-    $ ./micropython -h
+HaaS Python是阿里云IoT团队最新研发的一套低代码编程框架，兼容MicroPython编程规范，依托HaaS平台软硬件积木提供AI、支付、蓝牙配网、云连接、UI等物联网场景常用的能力，从而解决了物联网应用开发难的问题。有了Python轻应用框架，物联网编程不再局限于专业软件开发人员，一般的技术员也可以快速实现复杂的物联网需求。
+更多HaaS Python介绍和开发资料见[HaaS Python官网](https://haas.iot.aliyun.com/haasapi/index.html?spm=a2cpu.b16145223.0.0.595660b1dZDX71#/)，[创意案例](https://haas.iot.aliyun.com/solution)，[硬件积木](https://haas.iot.aliyun.com/solution/hardware)
 
-Run complete testsuite:
+HaaS Python is a set of low-code programming frameworks newly developed by Alibaba Cloud IoT team. It is compatible with MicroPython programming specifications. It relies on the hardware and software building blocks of the HaaS platform to provide capabilities commonly used in IoT scenarios such as AI, payment, Bluetooth network configuration, cloud connection, and UI. Solve the difficult problem of IoT application development. With the Python light application framework, IoT programming is no longer limited to professional software developers, and general technicians can quickly implement complex IoT requirements.
+For more HaaS Python introduction and development materials, see [HaaS Python official website](https://haas.iot.aliyun.com/haasapi/index.html?spm=a2cpu.b16145223.0.0.595660b1dZDX71#/), [Creative Case](https://haas.iot.aliyun.com/solution), [Hardware Building Blocks](https://haas.iot.aliyun.com/solution/hardware)
 
-    $ make test
+该仓库包含的主要组件为：
 
-Unix version comes with a builtin package manager called upip, e.g.:
+- py/ -- 核心 Python 实现，包括编译器、运行时和核心库。
+- mpy-cross/ -- 用于将转换脚本预编译为字节码的交叉编译器。
+- external/ -- 扩展三方C组件。
+- modules/ -- 扩展 Python 接口。
+- tests/ -- 测试框架和测试脚本。
+- docs/ -- HaaS Python官方文档及相关案例。
 
-    $ ./micropython -m upip install micropython-pystone
-    $ ./micropython -m pystone
+附加部分:
+- ports/esp32/ -- 运行在Espressif的ESP32 SoC上的HaaS Python版本。
+- ports/stm32/ -- 在PyBoard和类似的STM32板上运行的HaaS Python版本（使用ST的Cube HAL驱动程序）。
+- ports/rp2/ -- 运行在Raspberry-Pi-Pico SoC上的HaaS Python版本。
+- ports/haas/ -- 运行在 [AliOS-Things](https://github.com/alibaba/AliOS-Things) 系统， HaaS1000 SoC上的HaaS Python版本。
+- extmod/ -- 用C实现的附加（非核心）模块。
+- tools/ -- 各种工具，包括 pyboard.py 模块。
+- examples/ -- 一些示例 Python 脚本。
 
-Browse available modules on
-[PyPI](https://pypi.python.org/pypi?%3Aaction=search&term=micropython).
-Standard library modules come from
-[micropython-lib](https://github.com/micropython/micropython-lib) project.
-
-External dependencies
----------------------
-
-Building MicroPython ports may require some dependencies installed.
-
-For Unix port, `libffi` library and `pkg-config` tool are required. On
-Debian/Ubuntu/Mint derivative Linux distros, install `build-essential`
-(includes toolchain and make), `libffi-dev`, and `pkg-config` packages.
-
-Other dependencies can be built together with MicroPython. This may
-be required to enable extra features or capabilities, and in recent
-versions of MicroPython, these may be enabled by default. To build
-these additional dependencies, in the port directory you're
-interested in (e.g. `ports/unix/`) first execute:
-
-    $ make submodules
+HaaS Python 交叉编译器 mpy-cross
+-----------------------------------------
 
-This will fetch all the relevant git submodules (sub repositories) that
-the port needs.  Use the same command to get the latest versions of
-submodules as they are updated from time to time. After that execute:
+大多数端口都需要先构建 HaaS Python 交叉编译器。这个名为 mpy-cross 的程序用于将 Python 脚本预编译为 .mpy 文件，然后可以将这些文件包含（冻结）到固件/可执行文件的端口中。
 
-    $ make deplibs
 
-This will build all available dependencies (regardless whether they
-are used or not). If you intend to build MicroPython with additional
-options (like cross-compiling), the same set of options should be passed
-to `make deplibs`. To actually enable/disable use of dependencies, edit
-`ports/unix/mpconfigport.mk` file, which has inline descriptions of the options.
-For example, to build SSL module (required for `upip` tool described above,
-and so enabled by default), `MICROPY_PY_USSL` should be set to 1.
+构建 mpy-cross 使用:
 
-For some ports, building required dependences is transparent, and happens
-automatically.  But they still need to be fetched with the `make submodules`
-command.
+    $ cd mpy-cross
+    $ make
 
 The STM32 version
 -----------------
 
-The "stm32" port requires an ARM compiler, arm-none-eabi-gcc, and associated
-bin-utils.  For those using Arch Linux, you need arm-none-eabi-binutils,
-arm-none-eabi-gcc and arm-none-eabi-newlib packages.  Otherwise, try here:
-https://launchpad.net/gcc-arm-embedded
-
-To build:
+“stm32” 端口需要 ARM 编译器 arm-none-eabi-gcc 和相关的 bin-utils。
+使用下面的命令编译：
 
     $ cd ports/stm32
-    $ make submodules
     $ make
 
-You then need to get your board into DFU mode.  On the pyboard, connect the
-3V3 pin to the P1/DFU pin with a wire (on PYBv1.0 they are next to each other
-on the bottom left of the board, second row from the bottom).
-
-Then to flash the code via USB DFU to your device:
-
-    $ make deploy
-
-This will use the included `tools/pydfu.py` script.  If flashing the firmware
-does not work it may be because you don't have the correct permissions, and
-need to use `sudo make deploy`.
-See the README.md file in the ports/stm32/ directory for further details.
-
 Contributing
 ------------
 
-MicroPython is an open-source project and welcomes contributions. To be
-productive, please be sure to follow the
-[Contributors' Guidelines](https://github.com/micropython/micropython/wiki/ContributorGuidelines)
-and the [Code Conventions](https://github.com/micropython/micropython/blob/master/CODECONVENTIONS.md).
-Note that MicroPython is licenced under the MIT license, and all contributions
-should follow this license.
+HaaS Python 是一个开源项目，欢迎贡献。
+HaaS Python 在 MIT 许可下获得许可，所有贡献都应遵循此许可。

external/activation/include/activation.h

@@ -46,7 +46,7 @@ Connection: Keep-Alive\r\n\r\n%s\r\n"
 #define ACTIVATION_AOS_VERSION_PREFIX          "AOS-R-"
 #define ACTIVATION_AOS_VERSION_POSTFIX_MAX_LEN (8)
 
-#define MAX_WAIT_MS                            (12 * 1000)
+#define MAX_WAIT_MS                            (5 * 1000)
 #define DELAY_PERIOD_MS                        (100)
 
 /* tigger activation report */

external/activation/src/activation.c

@@ -180,7 +180,7 @@ int32_t activation_parse_data(char *response_data)
     char *result_end;
     int32_t len;
 
-    ACTIVATION_DEBUG("response data: %s\n", response_data);
+    ACTIVATION_ERR("response data: %s\n", response_data);
     result_start = strstr(response_data, ACTIVATION_RESPONSE_RESULT_START);
     result_end = strstr(result_start, ACTIVATION_RESPONSE_RESULT_END);
     if ((result_start != NULL) && (result_end != NULL)) {

external/external.mk

@@ -41,8 +41,4 @@ ifeq ($(AOS_AMP_TASK), 1)
     include $(EXTERNAL_DIR)/amp_task/amp_task.mk
 endif
 
-# SRC_HAAS += $(foreach dir, $(SRCDIRS_HAAS), $(wildcard $(dir)/*.c))
-# $(info 'SRC_HAAS = $(SRC_HAAS)')
-
 INC += $(addprefix -I, ${INC_HAAS})
-# $(info 'INC = $(INC)')

modules/adaptor/esp32/c3/systemAdaptor.py

@@ -0,0 +1,43 @@
+from machine import Pin
+
+def getSupportedPinMode():
+    pinMode = {
+        'input': Pin.IN,
+        'output': Pin.OUT,
+        'opendrain': Pin.OPEN_DRAIN
+    }
+    return pinMode
+
+def getChipName():
+    return "esp32"
+
+def getDataPath():
+    return "/"
+
+def getPinMap():
+    pinMap = {
+        I2C0 : {
+            PORT_NUM : 0,
+            I2C0_SCL : 4,
+            I2C0_SDA : 5,
+        },
+        SPI3 : {
+            PORT_NUM : 3,
+            SPI3_MOSI : 7,
+            SPI3_SCLK : 6,
+            SPI3_MOSO : 2,
+            SPI3_CS: 10,
+        },
+        UART1 : {
+            PORT_NUM : 1,
+            UART_TXD : 9,
+            UART_RXD : 3,
+        },
+        ADC0: 36,
+        ADC1: 39,
+        ADC2: 34, 
+        ADC3: 35,
+        ADC4: 32,
+        ADC5: 33
+    }
+    return pinMap

modules/adaptor/esp32/m5stack/systemAdaptor.py

@@ -0,0 +1,43 @@
+from machine import Pin
+
+def getSupportedPinMode():
+    pinMode = {
+        'input': Pin.IN,
+        'output': Pin.OUT,
+        'opendrain': Pin.OPEN_DRAIN
+    }
+    return pinMode
+
+def getChipName():
+    return "esp32"
+
+def getDataPath():
+    return "/"
+
+def getPinMap():
+    pinMap = {
+        I2C0 : {
+            PORT_NUM : 0,
+            I2C0_SCL : 22,
+            I2C0_SDA : 21,
+        },
+        SPI3 : {
+            PORT_NUM : 3,
+            SPI3_MOSI : 23,
+            SPI3_SCLK : 18,
+            SPI3_MOSO : 19,
+            SPI3_CS: 5,
+        },
+        UART2 : {
+            PORT_NUM : 2,
+            UART_TXD : 14,
+            UART_RXD : 13,
+        },
+        ADC0: 36,
+        ADC1: 39,
+        ADC2: 34, 
+        ADC3: 35,
+        ADC4: 32,
+        ADC5: 33
+    }
+    return pinMap

modules/adaptor/esp32/nodemcu32s/systemAdaptor.py

@@ -0,0 +1,47 @@
+from machine import Pin
+
+def getSupportedPinMode():
+    pinMode = {
+        'input': Pin.IN,
+        'output': Pin.OUT,
+        'irq': Pin.IN,
+        'opendrain' : Pin.OPEN_DRAIN,
+        'rising' : Pin.IRQ_RISING,
+        'falling' : Pin.IRQ_FALLING
+    }
+    return pinMode
+
+def getChipName():
+    return "esp32"
+
+def getDataPath():
+    return "/"
+
+
+def getPinMap():
+    pinMap = {
+        "I2C0" : {
+            "PORT": 0,
+            "SCL" : 22,
+            "SDA" : 21,
+        },
+        "SPI3" : {
+            "PORT": 2,
+            "MOSI" : 23,
+            "SCLK" : 18,
+            "MOSO" : 19,
+            "CS": 5,
+        },
+        "UART2" : {
+            "PORT": 2,
+            "TX" : 17,
+            "RX" : 16,
+        },
+        "ADC0": 36,
+        "ADC3": 39,
+        "ADC4": 32, 
+        "ADC5": 33,
+        "ADC6": 34,
+        "ADC7": 35
+    }
+    return pinMap