From 69397de2b361a76d0d17abc0efc9cad96108c4b5 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Thu, 4 Feb 2021 22:07:37 +0800 Subject: [PATCH 01/64] Update project.py --- tools/cmake/project.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cmake/project.py b/tools/cmake/project.py index 7f9fd1063..b1dcbdc18 100644 --- a/tools/cmake/project.py +++ b/tools/cmake/project.py @@ -47,9 +47,9 @@ metavar='PREFIX', default="") project_parser.add_argument('--config_file', - help='config file path, e.g. config_defaults.mk', + help='config file path, e.g. config_defaults_kmodel_v4_support.mk', metavar='PATH', - default="{}/config_defaults.mk".format(project_path)) + default="{}/config_defaults_kmodel_v4_support.mk".format(project_path)) project_parser.add_argument('--verbose', help='for build command, execute `make VERBOSE=1` to compile', action="store_true", From 4e7c673bb48f31cd3e64e9dc55824335958b4956 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Thu, 4 Feb 2021 22:28:43 +0800 Subject: [PATCH 02/64] Update config_defaults_kmodel_v4_support.mk --- .../maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk index c7b1658f5..2c8b057fd 100644 --- a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk +++ b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk @@ -33,7 +33,7 @@ CONFIG_COMPONENT_DRIVERS_ENABLE=y # # SD card # -CONFIG_SPI_SD_CARD_FORCE_HIGH_SPEED=y +CONFIG_SPI_SD_CARD_FORCE_HIGH_SPEED=n # end of SD card # @@ -76,7 +76,7 @@ CONFIG_MAIXPY_GC_HEAP_SIZE=0x80000 # CONFIG_MAIXPY_TOUCH_SCREEN_ENABLE is not set CONFIG_MAIXPY_OMV_MINIMUM=y # CONFIG_MAIXPY_OMV_CONV_YUV_FAST is not set -CONFIG_MAIXPY_OMV_DOUBLE_BUFF=y +CONFIG_MAIXPY_OMV_DOUBLE_BUFF=n # CONFIG_MAIXPY_MIC_ARRAY_ENABLE is not set # CONFIG_MAIXPY_LVGL_ENABLE is not set # CONFIG_MAIXPY_LODEPNG_ENABLE is not set From 8a129762f83ee5a66cdf7bbf96f8bcf71715b129 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Thu, 4 Feb 2021 22:32:54 +0800 Subject: [PATCH 03/64] Update config_defaults_kmodel_v4_support.mk --- .../config_defaults_kmodel_v4_support.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk index 2c8b057fd..dc8078227 100644 --- a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk +++ b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk @@ -24,7 +24,7 @@ CONFIG_SENSOR_FREQ=24000000 CONFIG_CPU_DEFAULT_FREQ=400000000 # end of Board config -CONFIG_COMPONENT_DRIVERS_ENABLE=y +CONFIG_COMPONENT_DRIVERS_ENABLE=n # # Drivers configuration @@ -49,7 +49,7 @@ CONFIG_SPI_SD_CARD_FORCE_HIGH_SPEED=n # end of HTPA thermal sensor # end of Drivers configuration -CONFIG_COMPONENT_KENDRYTE_SDK_ENABLE=y +CONFIG_COMPONENT_KENDRYTE_SDK_ENABLE=n # # Kendryte SDK configurations @@ -59,7 +59,7 @@ CONFIG_SDK_LOG_LEVEL=5 # CONFIG_MIC_ARRAY_ENABLE is not set # end of Kendryte SDK configurations -CONFIG_COMPONENT_MICROPYTHON_ENABLE=y +CONFIG_COMPONENT_MICROPYTHON_ENABLE=n # # Micropython configurations @@ -74,7 +74,7 @@ CONFIG_MAIXPY_GC_HEAP_SIZE=0x80000 # CONFIG_MAIXPY_NES_ENABLE is not set # CONFIG_MAIXPY_VIDEO_ENABLE is not set # CONFIG_MAIXPY_TOUCH_SCREEN_ENABLE is not set -CONFIG_MAIXPY_OMV_MINIMUM=y +CONFIG_MAIXPY_OMV_MINIMUM=n # CONFIG_MAIXPY_OMV_CONV_YUV_FAST is not set CONFIG_MAIXPY_OMV_DOUBLE_BUFF=n # CONFIG_MAIXPY_MIC_ARRAY_ENABLE is not set @@ -83,7 +83,7 @@ CONFIG_MAIXPY_OMV_DOUBLE_BUFF=n # CONFIG_MAIXPY_WS2812_ENABLE is not set # CONFIG_MAIXPY_HTPA_ENABLE is not set # CONFIG_MICROPYTHON_ULAB_ENALBE is not set -CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y +CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=n # CONFIG_MAIXPY_SPEECH_RECOGNIZER_ENABLE is not set # CONFIG_MICROPY_SSL_ENABLE is not set # end of Modules configurations @@ -92,8 +92,8 @@ CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y # Builtin py modules configurations # # CONFIG_MAIXPY_BUILTIN_PY_PYE is not set -CONFIG_MAIXPY_BUILTIN_PY_BOARD=y -CONFIG_MAIXPY_BUILTIN_PY_FPIOA_MANAGER=y +CONFIG_MAIXPY_BUILTIN_PY_BOARD=n +CONFIG_MAIXPY_BUILTIN_PY_FPIOA_MANAGER=n # end of Builtin py modules configurations # @@ -146,7 +146,7 @@ CONFIG_SPIFFS_META_LENGTH=0 # end of Debug Configuration # end of SPIFFS Configuration -CONFIG_COMPONENT_UTILS_ENABLE=y +CONFIG_COMPONENT_UTILS_ENABLE=n # end of Components configuration # From 27d3c31a610256ae90a3e5d01484b9c2740805de Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Thu, 4 Feb 2021 22:38:31 +0800 Subject: [PATCH 04/64] Update config_defaults_kmodel_v4_support.mk --- .../config_defaults_kmodel_v4_support.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk index dc8078227..1112989e4 100644 --- a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk +++ b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk @@ -24,7 +24,7 @@ CONFIG_SENSOR_FREQ=24000000 CONFIG_CPU_DEFAULT_FREQ=400000000 # end of Board config -CONFIG_COMPONENT_DRIVERS_ENABLE=n +CONFIG_COMPONENT_DRIVERS_ENABLE=y # # Drivers configuration @@ -59,7 +59,7 @@ CONFIG_SDK_LOG_LEVEL=5 # CONFIG_MIC_ARRAY_ENABLE is not set # end of Kendryte SDK configurations -CONFIG_COMPONENT_MICROPYTHON_ENABLE=n +CONFIG_COMPONENT_MICROPYTHON_ENABLE=y # # Micropython configurations @@ -111,7 +111,7 @@ CONFIG_BUILTIN_PY_DIR="" # CONFIG_COMPONENT_LIB_SIPEED_KPU_SRC_ENABLE is not set # end of Others -CONFIG_COMPONENT_SPIFFS_ENABLE=y +CONFIG_COMPONENT_SPIFFS_ENABLE=n # # SPIFFS Configuration @@ -120,8 +120,8 @@ CONFIG_COMPONENT_SPIFFS_ENABLE=y # # SPIFFS Cache Configuration # -CONFIG_SPIFFS_CACHE=y -CONFIG_SPIFFS_CACHE_WR=y +CONFIG_SPIFFS_CACHE=n +CONFIG_SPIFFS_CACHE_WR=n # CONFIG_SPIFFS_CACHE_STATS is not set # end of SPIFFS Cache Configuration @@ -131,8 +131,8 @@ CONFIG_SPIFFS_EREASE_SIZE=0x1000 CONFIG_SPIFFS_LOGICAL_BLOCK_SIZE=0x20000 CONFIG_SPIFFS_LOGICAL_PAGE_SIZE=0x1000 CONFIG_SPIFFS_OBJ_NAME_LEN=128 -CONFIG_SPIFFS_USE_MAGIC=y -CONFIG_SPIFFS_USE_MAGIC_LENGTH=y +CONFIG_SPIFFS_USE_MAGIC=n +CONFIG_SPIFFS_USE_MAGIC_LENGTH=n CONFIG_SPIFFS_META_LENGTH=0 # From b5e9665cde1c2fa20742d4fa777a77f356d97bcd Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Thu, 4 Feb 2021 22:44:25 +0800 Subject: [PATCH 05/64] Update config_defaults.mk --- projects/maixpy_k210_minimum/config_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/maixpy_k210_minimum/config_defaults.mk b/projects/maixpy_k210_minimum/config_defaults.mk index bd9d90f48..c7b1658f5 100644 --- a/projects/maixpy_k210_minimum/config_defaults.mk +++ b/projects/maixpy_k210_minimum/config_defaults.mk @@ -83,7 +83,7 @@ CONFIG_MAIXPY_OMV_DOUBLE_BUFF=y # CONFIG_MAIXPY_WS2812_ENABLE is not set # CONFIG_MAIXPY_HTPA_ENABLE is not set # CONFIG_MICROPYTHON_ULAB_ENALBE is not set -# CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT is not set +CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y # CONFIG_MAIXPY_SPEECH_RECOGNIZER_ENABLE is not set # CONFIG_MICROPY_SSL_ENABLE is not set # end of Modules configurations From fc264ee14b2cfa06b1e208699774bcd726153928 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 5 Feb 2021 00:36:57 +0800 Subject: [PATCH 06/64] Update config_defaults_kmodel_v4_support.mk --- .../maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk index 1112989e4..7572cbf30 100644 --- a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk +++ b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk @@ -49,7 +49,7 @@ CONFIG_SPI_SD_CARD_FORCE_HIGH_SPEED=n # end of HTPA thermal sensor # end of Drivers configuration -CONFIG_COMPONENT_KENDRYTE_SDK_ENABLE=n +CONFIG_COMPONENT_KENDRYTE_SDK_ENABLE= # # Kendryte SDK configurations From f45f7c02d3ed8b241c0efe922264d9c13639cd51 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 5 Feb 2021 00:38:57 +0800 Subject: [PATCH 07/64] Update config_defaults_kmodel_v4_support.mk --- .../maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk index 7572cbf30..baf1513c9 100644 --- a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk +++ b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk @@ -49,7 +49,7 @@ CONFIG_SPI_SD_CARD_FORCE_HIGH_SPEED=n # end of HTPA thermal sensor # end of Drivers configuration -CONFIG_COMPONENT_KENDRYTE_SDK_ENABLE= +CONFIG_COMPONENT_KENDRYTE_SDK_ENABLE=y # # Kendryte SDK configurations From f21b66485d71f5bb87d8d38a9b3bd7acaed526ea Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 5 Feb 2021 00:42:31 +0800 Subject: [PATCH 08/64] Update config_defaults_kmodel_v4_support.mk --- .../maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk index baf1513c9..15310bdee 100644 --- a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk +++ b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk @@ -74,7 +74,7 @@ CONFIG_MAIXPY_GC_HEAP_SIZE=0x80000 # CONFIG_MAIXPY_NES_ENABLE is not set # CONFIG_MAIXPY_VIDEO_ENABLE is not set # CONFIG_MAIXPY_TOUCH_SCREEN_ENABLE is not set -CONFIG_MAIXPY_OMV_MINIMUM=n +CONFIG_MAIXPY_OMV_MINIMUM=y # CONFIG_MAIXPY_OMV_CONV_YUV_FAST is not set CONFIG_MAIXPY_OMV_DOUBLE_BUFF=n # CONFIG_MAIXPY_MIC_ARRAY_ENABLE is not set From 42fb7b014e16d7234049186bfc20016beb6bb95f Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 5 Feb 2021 00:45:30 +0800 Subject: [PATCH 09/64] Update config_defaults_kmodel_v4_support.mk --- .../config_defaults_kmodel_v4_support.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk index 15310bdee..2ca2b1932 100644 --- a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk +++ b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk @@ -49,7 +49,7 @@ CONFIG_SPI_SD_CARD_FORCE_HIGH_SPEED=n # end of HTPA thermal sensor # end of Drivers configuration -CONFIG_COMPONENT_KENDRYTE_SDK_ENABLE=y +CONFIG_COMPONENT_KENDRYTE_SDK_ENABLE=n # # Kendryte SDK configurations @@ -59,7 +59,7 @@ CONFIG_SDK_LOG_LEVEL=5 # CONFIG_MIC_ARRAY_ENABLE is not set # end of Kendryte SDK configurations -CONFIG_COMPONENT_MICROPYTHON_ENABLE=y +CONFIG_COMPONENT_MICROPYTHON_ENABLE=n # # Micropython configurations @@ -74,7 +74,7 @@ CONFIG_MAIXPY_GC_HEAP_SIZE=0x80000 # CONFIG_MAIXPY_NES_ENABLE is not set # CONFIG_MAIXPY_VIDEO_ENABLE is not set # CONFIG_MAIXPY_TOUCH_SCREEN_ENABLE is not set -CONFIG_MAIXPY_OMV_MINIMUM=y +CONFIG_MAIXPY_OMV_MINIMUM=n # CONFIG_MAIXPY_OMV_CONV_YUV_FAST is not set CONFIG_MAIXPY_OMV_DOUBLE_BUFF=n # CONFIG_MAIXPY_MIC_ARRAY_ENABLE is not set @@ -92,7 +92,7 @@ CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=n # Builtin py modules configurations # # CONFIG_MAIXPY_BUILTIN_PY_PYE is not set -CONFIG_MAIXPY_BUILTIN_PY_BOARD=n +CONFIG_MAIXPY_BUILTIN_PY_BOARD=y CONFIG_MAIXPY_BUILTIN_PY_FPIOA_MANAGER=n # end of Builtin py modules configurations From c858fc20201b82f5cb7c65bd0450e8eed1e7553e Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 5 Feb 2021 00:47:08 +0800 Subject: [PATCH 10/64] Update config_defaults_kmodel_v4_support.mk --- .../maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk index 2ca2b1932..a6a34444c 100644 --- a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk +++ b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk @@ -83,7 +83,7 @@ CONFIG_MAIXPY_OMV_DOUBLE_BUFF=n # CONFIG_MAIXPY_WS2812_ENABLE is not set # CONFIG_MAIXPY_HTPA_ENABLE is not set # CONFIG_MICROPYTHON_ULAB_ENALBE is not set -CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=n +CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y # CONFIG_MAIXPY_SPEECH_RECOGNIZER_ENABLE is not set # CONFIG_MICROPY_SSL_ENABLE is not set # end of Modules configurations From afaf4294d26150e64efc92ee17f65871bdaef9ad Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 5 Feb 2021 00:50:59 +0800 Subject: [PATCH 11/64] Update config_defaults_kmodel_v4_support.mk --- .../maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk index a6a34444c..4deea63a3 100644 --- a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk +++ b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk @@ -74,7 +74,7 @@ CONFIG_MAIXPY_GC_HEAP_SIZE=0x80000 # CONFIG_MAIXPY_NES_ENABLE is not set # CONFIG_MAIXPY_VIDEO_ENABLE is not set # CONFIG_MAIXPY_TOUCH_SCREEN_ENABLE is not set -CONFIG_MAIXPY_OMV_MINIMUM=n +CONFIG_MAIXPY_OMV_MINIMUM=y # CONFIG_MAIXPY_OMV_CONV_YUV_FAST is not set CONFIG_MAIXPY_OMV_DOUBLE_BUFF=n # CONFIG_MAIXPY_MIC_ARRAY_ENABLE is not set From f9cb0051bc25d4f5159d4a39a93cdc819fb1ff86 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 5 Feb 2021 00:53:17 +0800 Subject: [PATCH 12/64] Update config_defaults_kmodel_v4_support.mk --- .../config_defaults_kmodel_v4_support.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk index 4deea63a3..c7a5e520b 100644 --- a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk +++ b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk @@ -24,7 +24,7 @@ CONFIG_SENSOR_FREQ=24000000 CONFIG_CPU_DEFAULT_FREQ=400000000 # end of Board config -CONFIG_COMPONENT_DRIVERS_ENABLE=y +CONFIG_COMPONENT_DRIVERS_ENABLE=n # # Drivers configuration @@ -59,7 +59,7 @@ CONFIG_SDK_LOG_LEVEL=5 # CONFIG_MIC_ARRAY_ENABLE is not set # end of Kendryte SDK configurations -CONFIG_COMPONENT_MICROPYTHON_ENABLE=n +CONFIG_COMPONENT_MICROPYTHON_ENABLE=y # # Micropython configurations @@ -74,7 +74,7 @@ CONFIG_MAIXPY_GC_HEAP_SIZE=0x80000 # CONFIG_MAIXPY_NES_ENABLE is not set # CONFIG_MAIXPY_VIDEO_ENABLE is not set # CONFIG_MAIXPY_TOUCH_SCREEN_ENABLE is not set -CONFIG_MAIXPY_OMV_MINIMUM=y +CONFIG_MAIXPY_OMV_MINIMUM=n # CONFIG_MAIXPY_OMV_CONV_YUV_FAST is not set CONFIG_MAIXPY_OMV_DOUBLE_BUFF=n # CONFIG_MAIXPY_MIC_ARRAY_ENABLE is not set @@ -83,7 +83,7 @@ CONFIG_MAIXPY_OMV_DOUBLE_BUFF=n # CONFIG_MAIXPY_WS2812_ENABLE is not set # CONFIG_MAIXPY_HTPA_ENABLE is not set # CONFIG_MICROPYTHON_ULAB_ENALBE is not set -CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y +CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=n # CONFIG_MAIXPY_SPEECH_RECOGNIZER_ENABLE is not set # CONFIG_MICROPY_SSL_ENABLE is not set # end of Modules configurations @@ -92,7 +92,7 @@ CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y # Builtin py modules configurations # # CONFIG_MAIXPY_BUILTIN_PY_PYE is not set -CONFIG_MAIXPY_BUILTIN_PY_BOARD=y +CONFIG_MAIXPY_BUILTIN_PY_BOARD=n CONFIG_MAIXPY_BUILTIN_PY_FPIOA_MANAGER=n # end of Builtin py modules configurations From e625b7d38877b23055448dcebc47587022523033 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 5 Feb 2021 01:02:00 +0800 Subject: [PATCH 13/64] Update project.py --- tools/cmake/project.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cmake/project.py b/tools/cmake/project.py index b1dcbdc18..fa9b313f7 100644 --- a/tools/cmake/project.py +++ b/tools/cmake/project.py @@ -47,9 +47,9 @@ metavar='PREFIX', default="") project_parser.add_argument('--config_file', - help='config file path, e.g. config_defaults_kmodel_v4_support.mk', + help='config file path, e.g. config_with_ide_support.mk', metavar='PATH', - default="{}/config_defaults_kmodel_v4_support.mk".format(project_path)) + default="{}/config_with_ide_support.mk".format(project_path)) project_parser.add_argument('--verbose', help='for build command, execute `make VERBOSE=1` to compile', action="store_true", From c745f40185b649d53c65ccc2bea92387dbd0a78b Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Thu, 19 Aug 2021 23:35:04 +0800 Subject: [PATCH 14/64] Update machine_spi.c --- .../micropython/port/src/standard_lib/machine/machine_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/micropython/port/src/standard_lib/machine/machine_spi.c b/components/micropython/port/src/standard_lib/machine/machine_spi.c index c1b8f2807..079587fc5 100644 --- a/components/micropython/port/src/standard_lib/machine/machine_spi.c +++ b/components/micropython/port/src/standard_lib/machine/machine_spi.c @@ -145,7 +145,7 @@ void mp_soft_spi_transfer(void *self_in, size_t len, const uint8_t *src, uint8_t // printk("%s %d %d %d\r\n", __func__, self->pin_sck, self->pin_d[0], self->pin_d[1]); // only MSB transfer is implemented - + mp_raise_msg(&mp_type_OSError, "HI!!"); // If a port defines MICROPY_HW_SOFTSPI_MIN_DELAY, and the configured // delay_half is equal to this value, then the software SPI implementation // will run as fast as possible, limited only by CPU speed and GPIO time. @@ -722,4 +722,4 @@ const mp_obj_type_t machine_hw_spi_type = { .locals_dict = (mp_obj_dict_t *) &mp_machine_spi_locals_dict, }; -#endif //MICROPY_PY_MACHINE_HW_SPI \ No newline at end of file +#endif //MICROPY_PY_MACHINE_HW_SPI From c0497a4f9be3ade1a781a22204d59955a6cde2cb Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Thu, 19 Aug 2021 23:50:41 +0800 Subject: [PATCH 15/64] Update machine_spi.c --- .../micropython/port/src/standard_lib/machine/machine_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/micropython/port/src/standard_lib/machine/machine_spi.c b/components/micropython/port/src/standard_lib/machine/machine_spi.c index 079587fc5..8f68145a6 100644 --- a/components/micropython/port/src/standard_lib/machine/machine_spi.c +++ b/components/micropython/port/src/standard_lib/machine/machine_spi.c @@ -142,10 +142,10 @@ void mp_soft_spi_transfer(void *self_in, size_t len, const uint8_t *src, uint8_t machine_hw_spi_obj_t *self = (machine_hw_spi_obj_t*)self_in; uint32_t delay_half = self->delay_half; - // printk("%s %d %d %d\r\n", __func__, self->pin_sck, self->pin_d[0], self->pin_d[1]); + printf("Alan"); // only MSB transfer is implemented - mp_raise_msg(&mp_type_OSError, "HI!!"); + // If a port defines MICROPY_HW_SOFTSPI_MIN_DELAY, and the configured // delay_half is equal to this value, then the software SPI implementation // will run as fast as possible, limited only by CPU speed and GPIO time. From 75037f6ea87b78d9d9b58a2e5cf89609395fc5cd Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 00:03:55 +0800 Subject: [PATCH 16/64] Update machine_spi.c --- .../micropython/port/src/standard_lib/machine/machine_spi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/micropython/port/src/standard_lib/machine/machine_spi.c b/components/micropython/port/src/standard_lib/machine/machine_spi.c index 8f68145a6..d95a4f41f 100644 --- a/components/micropython/port/src/standard_lib/machine/machine_spi.c +++ b/components/micropython/port/src/standard_lib/machine/machine_spi.c @@ -142,7 +142,7 @@ void mp_soft_spi_transfer(void *self_in, size_t len, const uint8_t *src, uint8_t machine_hw_spi_obj_t *self = (machine_hw_spi_obj_t*)self_in; uint32_t delay_half = self->delay_half; - printf("Alan"); + // only MSB transfer is implemented @@ -524,6 +524,7 @@ STATIC void mp_machine_spi_transfer(mp_obj_t self, size_t len, const void *src, } STATIC mp_obj_t mp_machine_spi_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { + printf("Alan"); enum { ARG_write, ARG_cs, From f5cbf26a3194ab2a1279d20d5b28440754045397 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 00:11:55 +0800 Subject: [PATCH 17/64] Update machine_spi.c --- .../micropython/port/src/standard_lib/machine/machine_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/micropython/port/src/standard_lib/machine/machine_spi.c b/components/micropython/port/src/standard_lib/machine/machine_spi.c index d95a4f41f..bb0f8f35c 100644 --- a/components/micropython/port/src/standard_lib/machine/machine_spi.c +++ b/components/micropython/port/src/standard_lib/machine/machine_spi.c @@ -523,8 +523,7 @@ STATIC void mp_machine_spi_transfer(mp_obj_t self, size_t len, const void *src, spi_p->transfer(s, len, src, dest, cs); } -STATIC mp_obj_t mp_machine_spi_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { - printf("Alan"); +STATIC mp_obj_t mp_machine_spi_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_write, ARG_cs, @@ -554,6 +553,7 @@ STATIC mp_obj_t mp_machine_spi_read(size_t n_args, const mp_obj_t *pos_args, mp_ vstr_t vstr; vstr_init_len(&vstr, mp_obj_get_int(pos_args[1])); memset(vstr.buf, args[ARG_write].u_int, vstr.len); + printf("Alan"); mp_machine_spi_transfer(self, vstr.len, vstr.buf, vstr.buf, cs); return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); } From ca477cb69e40cc481b9c9e210f5aa38a5b68318c Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 00:21:10 +0800 Subject: [PATCH 18/64] Update machine_spi.c --- .../micropython/port/src/standard_lib/machine/machine_spi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/micropython/port/src/standard_lib/machine/machine_spi.c b/components/micropython/port/src/standard_lib/machine/machine_spi.c index bb0f8f35c..ef1f3a663 100644 --- a/components/micropython/port/src/standard_lib/machine/machine_spi.c +++ b/components/micropython/port/src/standard_lib/machine/machine_spi.c @@ -521,6 +521,7 @@ STATIC void mp_machine_spi_transfer(mp_obj_t self, size_t len, const void *src, mp_obj_base_t *s = (mp_obj_base_t*)MP_OBJ_TO_PTR(self); mp_machine_hw_spi_p_t *spi_p = (mp_machine_hw_spi_p_t*)s->type->protocol; spi_p->transfer(s, len, src, dest, cs); + printf("Alan"); } STATIC mp_obj_t mp_machine_spi_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { @@ -553,7 +554,7 @@ STATIC mp_obj_t mp_machine_spi_read(size_t n_args, const mp_obj_t *pos_args, mp_ vstr_t vstr; vstr_init_len(&vstr, mp_obj_get_int(pos_args[1])); memset(vstr.buf, args[ARG_write].u_int, vstr.len); - printf("Alan"); + mp_machine_spi_transfer(self, vstr.len, vstr.buf, vstr.buf, cs); return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); } From aecd4d86a0f0c21c37da5a30cdb7701ed4178043 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 00:28:58 +0800 Subject: [PATCH 19/64] Update machine_spi.c --- .../micropython/port/src/standard_lib/machine/machine_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/micropython/port/src/standard_lib/machine/machine_spi.c b/components/micropython/port/src/standard_lib/machine/machine_spi.c index ef1f3a663..58b69262c 100644 --- a/components/micropython/port/src/standard_lib/machine/machine_spi.c +++ b/components/micropython/port/src/standard_lib/machine/machine_spi.c @@ -520,8 +520,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_spi_deinit_obj, machine_spi_deinit); STATIC void mp_machine_spi_transfer(mp_obj_t self, size_t len, const void *src, void *dest, int cs) { mp_obj_base_t *s = (mp_obj_base_t*)MP_OBJ_TO_PTR(self); mp_machine_hw_spi_p_t *spi_p = (mp_machine_hw_spi_p_t*)s->type->protocol; - spi_p->transfer(s, len, src, dest, cs); printf("Alan"); + spi_p->transfer(s, len, src, dest, cs); } STATIC mp_obj_t mp_machine_spi_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { From 8029e176f22be96159579bdb0142fb7563fd2925 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 00:43:28 +0800 Subject: [PATCH 20/64] Update machine_spi.c --- .../micropython/port/src/standard_lib/machine/machine_spi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/micropython/port/src/standard_lib/machine/machine_spi.c b/components/micropython/port/src/standard_lib/machine/machine_spi.c index 58b69262c..e335d9b7a 100644 --- a/components/micropython/port/src/standard_lib/machine/machine_spi.c +++ b/components/micropython/port/src/standard_lib/machine/machine_spi.c @@ -220,7 +220,7 @@ STATIC void machine_hw_spi_deinit(mp_obj_base_t *self_in) { STATIC void machine_hw_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest, int cs) { machine_hw_spi_obj_t *self = MP_OBJ_TO_PTR(self_in); - + printf("Alan"); if (self->state == MACHINE_HW_SPI_STATE_DEINIT) { mp_raise_msg(&mp_type_OSError, "[MAIXPY]SPI: transfer on deinitialized SPI"); return; @@ -520,7 +520,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_spi_deinit_obj, machine_spi_deinit); STATIC void mp_machine_spi_transfer(mp_obj_t self, size_t len, const void *src, void *dest, int cs) { mp_obj_base_t *s = (mp_obj_base_t*)MP_OBJ_TO_PTR(self); mp_machine_hw_spi_p_t *spi_p = (mp_machine_hw_spi_p_t*)s->type->protocol; - printf("Alan"); spi_p->transfer(s, len, src, dest, cs); } From 4baa8892e11283a95bc5438c37965ca8d0dc8eb0 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 00:44:11 +0800 Subject: [PATCH 21/64] Update machine_spi.c --- .../micropython/port/src/standard_lib/machine/machine_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/micropython/port/src/standard_lib/machine/machine_spi.c b/components/micropython/port/src/standard_lib/machine/machine_spi.c index e335d9b7a..86acf5fc4 100644 --- a/components/micropython/port/src/standard_lib/machine/machine_spi.c +++ b/components/micropython/port/src/standard_lib/machine/machine_spi.c @@ -220,11 +220,11 @@ STATIC void machine_hw_spi_deinit(mp_obj_base_t *self_in) { STATIC void machine_hw_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest, int cs) { machine_hw_spi_obj_t *self = MP_OBJ_TO_PTR(self_in); - printf("Alan"); if (self->state == MACHINE_HW_SPI_STATE_DEINIT) { mp_raise_msg(&mp_type_OSError, "[MAIXPY]SPI: transfer on deinitialized SPI"); return; } + printf("Alan"); #if MICROPY_PY_MACHINE_SW_SPI if(self->id == SPI_SOFTWARE) { From e5d1a482a0945255a232727869b2da1f838ebb78 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 00:52:57 +0800 Subject: [PATCH 22/64] Update machine_spi.c --- .../micropython/port/src/standard_lib/machine/machine_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/micropython/port/src/standard_lib/machine/machine_spi.c b/components/micropython/port/src/standard_lib/machine/machine_spi.c index 86acf5fc4..ee3c28ac0 100644 --- a/components/micropython/port/src/standard_lib/machine/machine_spi.c +++ b/components/micropython/port/src/standard_lib/machine/machine_spi.c @@ -224,13 +224,13 @@ STATIC void machine_hw_spi_transfer(mp_obj_base_t *self_in, size_t len, const ui mp_raise_msg(&mp_type_OSError, "[MAIXPY]SPI: transfer on deinitialized SPI"); return; } - printf("Alan"); #if MICROPY_PY_MACHINE_SW_SPI if(self->id == SPI_SOFTWARE) { mp_soft_spi_transfer(self, len, src, dest); return; } + printf("Alan"); #endif if(dest==NULL) sipeed_spi_transfer_data_standard(self->id, cs, src, NULL, len, 0); From 016bd6d2312ded5f95dceb7eeefbd8e636e2491e Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 01:00:22 +0800 Subject: [PATCH 23/64] Update machine_spi.c --- .../micropython/port/src/standard_lib/machine/machine_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/micropython/port/src/standard_lib/machine/machine_spi.c b/components/micropython/port/src/standard_lib/machine/machine_spi.c index ee3c28ac0..b53c6bcd6 100644 --- a/components/micropython/port/src/standard_lib/machine/machine_spi.c +++ b/components/micropython/port/src/standard_lib/machine/machine_spi.c @@ -230,7 +230,7 @@ STATIC void machine_hw_spi_transfer(mp_obj_base_t *self_in, size_t len, const ui mp_soft_spi_transfer(self, len, src, dest); return; } - printf("Alan"); + #endif if(dest==NULL) sipeed_spi_transfer_data_standard(self->id, cs, src, NULL, len, 0); From ad23e997bb08c0b6cc07e08b85e01aeb781e5848 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 01:03:08 +0800 Subject: [PATCH 24/64] Update sipeed_spi.c --- components/kendryte_sdk/src/sipeed_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/kendryte_sdk/src/sipeed_spi.c b/components/kendryte_sdk/src/sipeed_spi.c index f863c6489..fe6a71c4b 100644 --- a/components/kendryte_sdk/src/sipeed_spi.c +++ b/components/kendryte_sdk/src/sipeed_spi.c @@ -211,7 +211,7 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select } } - + printf("Alan"); while ((spi_handle->sr & 0x05) != 0x04) ; while (rx_len) From 9d774bd1326c8b9db2d19a8b234a78a290d2bfbb Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 01:12:01 +0800 Subject: [PATCH 25/64] Update sipeed_spi.c --- components/kendryte_sdk/src/sipeed_spi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/kendryte_sdk/src/sipeed_spi.c b/components/kendryte_sdk/src/sipeed_spi.c index fe6a71c4b..1497447ca 100644 --- a/components/kendryte_sdk/src/sipeed_spi.c +++ b/components/kendryte_sdk/src/sipeed_spi.c @@ -211,7 +211,6 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select } } - printf("Alan"); while ((spi_handle->sr & 0x05) != 0x04) ; while (rx_len) @@ -221,16 +220,19 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select switch(frame_width) { case SPI_TRANS_INT: + printf("Alan1"); fifo_len = fifo_len / 4 * 4; for (index = 0; index < fifo_len / 4; index++) ((uint32_t *)rx_buff)[index_rx++] = spi_handle->dr[0]; break; case SPI_TRANS_SHORT: + printf("Alan2"); fifo_len = fifo_len / 2 * 2; for (index = 0; index < fifo_len / 2; index++) ((uint16_t *)rx_buff)[index_rx++] = (uint16_t)spi_handle->dr[0]; break; default: + printf("Alan3"); for (index = 0; index < fifo_len; index++) rx_buff[index_rx++] = (uint8_t)spi_handle->dr[0]; break; From a81250c275a1521ee68084a083177c780c50b00d Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 01:26:56 +0800 Subject: [PATCH 26/64] Update sipeed_spi.c --- components/kendryte_sdk/src/sipeed_spi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/kendryte_sdk/src/sipeed_spi.c b/components/kendryte_sdk/src/sipeed_spi.c index 1497447ca..21e83d97e 100644 --- a/components/kendryte_sdk/src/sipeed_spi.c +++ b/components/kendryte_sdk/src/sipeed_spi.c @@ -215,24 +215,23 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select ; while (rx_len) { + printf(rx_len); fifo_len = spi_handle->rxflr; + printf(fifo_len); fifo_len = fifo_len < rx_len ? fifo_len : rx_len; switch(frame_width) { case SPI_TRANS_INT: - printf("Alan1"); fifo_len = fifo_len / 4 * 4; for (index = 0; index < fifo_len / 4; index++) ((uint32_t *)rx_buff)[index_rx++] = spi_handle->dr[0]; break; case SPI_TRANS_SHORT: - printf("Alan2"); fifo_len = fifo_len / 2 * 2; for (index = 0; index < fifo_len / 2; index++) ((uint16_t *)rx_buff)[index_rx++] = (uint16_t)spi_handle->dr[0]; break; default: - printf("Alan3"); for (index = 0; index < fifo_len; index++) rx_buff[index_rx++] = (uint8_t)spi_handle->dr[0]; break; From 5019894c2afd3202ffdab18de7943f3842890785 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 01:36:41 +0800 Subject: [PATCH 27/64] Update sipeed_spi.c --- components/kendryte_sdk/src/sipeed_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/kendryte_sdk/src/sipeed_spi.c b/components/kendryte_sdk/src/sipeed_spi.c index 21e83d97e..1f8cea34a 100644 --- a/components/kendryte_sdk/src/sipeed_spi.c +++ b/components/kendryte_sdk/src/sipeed_spi.c @@ -215,9 +215,9 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select ; while (rx_len) { - printf(rx_len); + printf("%d",rx_len); fifo_len = spi_handle->rxflr; - printf(fifo_len); + printf("%d",fifo_len); fifo_len = fifo_len < rx_len ? fifo_len : rx_len; switch(frame_width) { From 499981e4601700c0d544ae262f376107ae1b4205 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 01:44:15 +0800 Subject: [PATCH 28/64] Update sipeed_spi.c --- components/kendryte_sdk/src/sipeed_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/kendryte_sdk/src/sipeed_spi.c b/components/kendryte_sdk/src/sipeed_spi.c index 1f8cea34a..3335dc2b7 100644 --- a/components/kendryte_sdk/src/sipeed_spi.c +++ b/components/kendryte_sdk/src/sipeed_spi.c @@ -215,9 +215,9 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select ; while (rx_len) { - printf("%d",rx_len); + printf("All: %d\n",rx_len); fifo_len = spi_handle->rxflr; - printf("%d",fifo_len); + printf("sub: %d\n",fifo_len); fifo_len = fifo_len < rx_len ? fifo_len : rx_len; switch(frame_width) { From 251ab2b72f58ee3472ea1f27cd152b836779119e Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 02:09:08 +0800 Subject: [PATCH 29/64] Update sipeed_spi.c --- components/kendryte_sdk/src/sipeed_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/kendryte_sdk/src/sipeed_spi.c b/components/kendryte_sdk/src/sipeed_spi.c index 3335dc2b7..71d6e9856 100644 --- a/components/kendryte_sdk/src/sipeed_spi.c +++ b/components/kendryte_sdk/src/sipeed_spi.c @@ -137,7 +137,7 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select sipeed_spi_set_tmod(spi_num, SPI_TMOD_TRANS_RECV); volatile spi_t *spi_handle = spi[spi_num]; - + prinf("First: %d\n",spi_handle->rxflr); uint8_t dfs_offset; switch(spi_num){ case 0: From b1483f15de2ff2445ab1f1158a4ab88d08394a65 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 02:13:59 +0800 Subject: [PATCH 30/64] Update sipeed_spi.c --- components/kendryte_sdk/src/sipeed_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/kendryte_sdk/src/sipeed_spi.c b/components/kendryte_sdk/src/sipeed_spi.c index 71d6e9856..e6f864079 100644 --- a/components/kendryte_sdk/src/sipeed_spi.c +++ b/components/kendryte_sdk/src/sipeed_spi.c @@ -137,7 +137,7 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select sipeed_spi_set_tmod(spi_num, SPI_TMOD_TRANS_RECV); volatile spi_t *spi_handle = spi[spi_num]; - prinf("First: %d\n",spi_handle->rxflr); + printf("First: %d\n",spi_handle->rxflr); uint8_t dfs_offset; switch(spi_num){ case 0: From 839c99f7958215b9167f8bbdcbf42a21380642f2 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 02:23:18 +0800 Subject: [PATCH 31/64] Update sipeed_spi.c --- components/kendryte_sdk/src/sipeed_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/kendryte_sdk/src/sipeed_spi.c b/components/kendryte_sdk/src/sipeed_spi.c index e6f864079..7dac2d321 100644 --- a/components/kendryte_sdk/src/sipeed_spi.c +++ b/components/kendryte_sdk/src/sipeed_spi.c @@ -137,7 +137,6 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select sipeed_spi_set_tmod(spi_num, SPI_TMOD_TRANS_RECV); volatile spi_t *spi_handle = spi[spi_num]; - printf("First: %d\n",spi_handle->rxflr); uint8_t dfs_offset; switch(spi_num){ case 0: @@ -158,6 +157,7 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select spi_handle->ssienr = 0x01; spi_handle->ser = 1U << chip_select; uint32_t index_tx = 0, index_rx = 0; + printf("First: %d\n",spi_handle->rxflr); while (tx_len) { fifo_len = 32 - spi_handle->txflr; From 09a58cc5c9107211823a0aee426f32b66adce53a Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 02:31:08 +0800 Subject: [PATCH 32/64] Update sipeed_spi.c --- components/kendryte_sdk/src/sipeed_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/kendryte_sdk/src/sipeed_spi.c b/components/kendryte_sdk/src/sipeed_spi.c index 7dac2d321..45bc10595 100644 --- a/components/kendryte_sdk/src/sipeed_spi.c +++ b/components/kendryte_sdk/src/sipeed_spi.c @@ -157,7 +157,6 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select spi_handle->ssienr = 0x01; spi_handle->ser = 1U << chip_select; uint32_t index_tx = 0, index_rx = 0; - printf("First: %d\n",spi_handle->rxflr); while (tx_len) { fifo_len = 32 - spi_handle->txflr; @@ -177,6 +176,7 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select default: for (index = 0; index < fifo_len; index++) spi_handle->dr[0] = tx_buff[index_tx++]; + printf("First: %d\n",spi_handle->rxflr); break; } tx_len -= fifo_len; From 4e4b72bcc026d82ff4692b51a17f7d5596fc8391 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 02:47:01 +0800 Subject: [PATCH 33/64] Update sipeed_spi.c --- components/kendryte_sdk/src/sipeed_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/kendryte_sdk/src/sipeed_spi.c b/components/kendryte_sdk/src/sipeed_spi.c index 45bc10595..e7ee4aeb4 100644 --- a/components/kendryte_sdk/src/sipeed_spi.c +++ b/components/kendryte_sdk/src/sipeed_spi.c @@ -176,13 +176,13 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select default: for (index = 0; index < fifo_len; index++) spi_handle->dr[0] = tx_buff[index_tx++]; - printf("First: %d\n",spi_handle->rxflr); break; } tx_len -= fifo_len; while(rx_len) { fifo_len = spi_handle->rxflr; + printf("First: %d\n",fifo_len); if(fifo_len==0) { if(index_tx - index_rx < 32) From 71e1a857b082c5364c128c8525a70c3bc89d8e56 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 03:00:36 +0800 Subject: [PATCH 34/64] Update sipeed_spi.c --- components/kendryte_sdk/src/sipeed_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/kendryte_sdk/src/sipeed_spi.c b/components/kendryte_sdk/src/sipeed_spi.c index e7ee4aeb4..a57343b1c 100644 --- a/components/kendryte_sdk/src/sipeed_spi.c +++ b/components/kendryte_sdk/src/sipeed_spi.c @@ -182,7 +182,6 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select while(rx_len) { fifo_len = spi_handle->rxflr; - printf("First: %d\n",fifo_len); if(fifo_len==0) { if(index_tx - index_rx < 32) @@ -211,6 +210,7 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select } } + printf("First: %d\n",spi_handle->rxflr); while ((spi_handle->sr & 0x05) != 0x04) ; while (rx_len) From d500595393e6ed621184189a97360bb5767fa333 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 03:09:58 +0800 Subject: [PATCH 35/64] Update sipeed_spi.c --- components/kendryte_sdk/src/sipeed_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/kendryte_sdk/src/sipeed_spi.c b/components/kendryte_sdk/src/sipeed_spi.c index a57343b1c..079bba4dd 100644 --- a/components/kendryte_sdk/src/sipeed_spi.c +++ b/components/kendryte_sdk/src/sipeed_spi.c @@ -209,10 +209,10 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select rx_len -= fifo_len; } - } - printf("First: %d\n",spi_handle->rxflr); + } while ((spi_handle->sr & 0x05) != 0x04) ; + printf("First: %d\n",spi_handle->rxflr); while (rx_len) { printf("All: %d\n",rx_len); From 31ceff8a1be1e340009d85b32cfd087068c2299e Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 15:53:38 +0800 Subject: [PATCH 36/64] Update sipeed_spi.c --- components/kendryte_sdk/src/sipeed_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/kendryte_sdk/src/sipeed_spi.c b/components/kendryte_sdk/src/sipeed_spi.c index 079bba4dd..4ce56e5f2 100644 --- a/components/kendryte_sdk/src/sipeed_spi.c +++ b/components/kendryte_sdk/src/sipeed_spi.c @@ -209,10 +209,10 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select rx_len -= fifo_len; } - } + } + printf("First: %d\n",spi_handle->rxflr); while ((spi_handle->sr & 0x05) != 0x04) ; - printf("First: %d\n",spi_handle->rxflr); while (rx_len) { printf("All: %d\n",rx_len); From 3f9714d8b7b33091e1432654fd0f99206bf1c84d Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 17:02:42 +0800 Subject: [PATCH 37/64] Update sipeed_spi.c --- components/kendryte_sdk/src/sipeed_spi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/kendryte_sdk/src/sipeed_spi.c b/components/kendryte_sdk/src/sipeed_spi.c index 4ce56e5f2..cf305b6ec 100644 --- a/components/kendryte_sdk/src/sipeed_spi.c +++ b/components/kendryte_sdk/src/sipeed_spi.c @@ -210,14 +210,14 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select } } - printf("First: %d\n",spi_handle->rxflr); while ((spi_handle->sr & 0x05) != 0x04) ; while (rx_len) { - printf("All: %d\n",rx_len); - fifo_len = spi_handle->rxflr; - printf("sub: %d\n",fifo_len); + + #fifo_len = spi_handle->rxflr; + fifo_len = rx_len; + fifo_len = fifo_len < rx_len ? fifo_len : rx_len; switch(frame_width) { From 6d2b204324acfb9e6f110b63772a3fe7dd7b72d9 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Fri, 20 Aug 2021 17:06:21 +0800 Subject: [PATCH 38/64] Update sipeed_spi.c --- components/kendryte_sdk/src/sipeed_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/kendryte_sdk/src/sipeed_spi.c b/components/kendryte_sdk/src/sipeed_spi.c index cf305b6ec..b729cfa03 100644 --- a/components/kendryte_sdk/src/sipeed_spi.c +++ b/components/kendryte_sdk/src/sipeed_spi.c @@ -215,7 +215,7 @@ void sipeed_spi_transfer_data_standard(spi_device_num_t spi_num, spi_chip_select while (rx_len) { - #fifo_len = spi_handle->rxflr; + //fifo_len = spi_handle->rxflr; fifo_len = rx_len; fifo_len = fifo_len < rx_len ? fifo_len : rx_len; From 85cc7b8a82c36fd312394835f532906ecaaf27ee Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Sat, 21 Aug 2021 00:27:33 +0800 Subject: [PATCH 39/64] Update project.py --- tools/cmake/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cmake/project.py b/tools/cmake/project.py index fa9b313f7..562c6a785 100644 --- a/tools/cmake/project.py +++ b/tools/cmake/project.py @@ -49,7 +49,7 @@ project_parser.add_argument('--config_file', help='config file path, e.g. config_with_ide_support.mk', metavar='PATH', - default="{}/config_with_ide_support.mk".format(project_path)) + default="{}/config_defaults_kmodel_v4_support".format(project_path)) project_parser.add_argument('--verbose', help='for build command, execute `make VERBOSE=1` to compile', action="store_true", From 14fd53ed6125b4731d0fdee06700b434c1b4caff Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Sat, 21 Aug 2021 00:34:09 +0800 Subject: [PATCH 40/64] Update project.py --- tools/cmake/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cmake/project.py b/tools/cmake/project.py index 562c6a785..5ccde5ea6 100644 --- a/tools/cmake/project.py +++ b/tools/cmake/project.py @@ -49,7 +49,7 @@ project_parser.add_argument('--config_file', help='config file path, e.g. config_with_ide_support.mk', metavar='PATH', - default="{}/config_defaults_kmodel_v4_support".format(project_path)) + default="{}/config_defaults_kmodel_v4_support.mk".format(project_path)) project_parser.add_argument('--verbose', help='for build command, execute `make VERBOSE=1` to compile', action="store_true", From dd7e169e264ee87f95c133f595708b5415fbed64 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Sat, 21 Aug 2021 00:47:32 +0800 Subject: [PATCH 41/64] Update config_defaults_kmodel_v4_support.mk --- .../config_defaults_kmodel_v4_support.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk index c7a5e520b..35278120a 100644 --- a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk +++ b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk @@ -69,21 +69,21 @@ CONFIG_MAIXPY_GC_HEAP_SIZE=0x80000 # # Modules configurations # -# CONFIG_MAIXPY_IDE_SUPPORT is not set +CONFIG_MAIXPY_IDE_SUPPORT=y # CONFIG_MAIXPY_THREAD_ENABLE is not set # CONFIG_MAIXPY_NES_ENABLE is not set # CONFIG_MAIXPY_VIDEO_ENABLE is not set # CONFIG_MAIXPY_TOUCH_SCREEN_ENABLE is not set -CONFIG_MAIXPY_OMV_MINIMUM=n +CONFIG_MAIXPY_OMV_MINIMUM=y # CONFIG_MAIXPY_OMV_CONV_YUV_FAST is not set -CONFIG_MAIXPY_OMV_DOUBLE_BUFF=n +CONFIG_MAIXPY_OMV_DOUBLE_BUFF=y # CONFIG_MAIXPY_MIC_ARRAY_ENABLE is not set # CONFIG_MAIXPY_LVGL_ENABLE is not set # CONFIG_MAIXPY_LODEPNG_ENABLE is not set # CONFIG_MAIXPY_WS2812_ENABLE is not set # CONFIG_MAIXPY_HTPA_ENABLE is not set # CONFIG_MICROPYTHON_ULAB_ENALBE is not set -CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=n +CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y # CONFIG_MAIXPY_SPEECH_RECOGNIZER_ENABLE is not set # CONFIG_MICROPY_SSL_ENABLE is not set # end of Modules configurations From 6617fb90d44850c0ae7695d85b837e471664c292 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Sat, 21 Aug 2021 01:46:31 +0800 Subject: [PATCH 42/64] Update config_defaults_kmodel_v4_support.mk --- .../maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk index 35278120a..2d69085ff 100644 --- a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk +++ b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk @@ -93,7 +93,7 @@ CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y # # CONFIG_MAIXPY_BUILTIN_PY_PYE is not set CONFIG_MAIXPY_BUILTIN_PY_BOARD=n -CONFIG_MAIXPY_BUILTIN_PY_FPIOA_MANAGER=n +CONFIG_MAIXPY_BUILTIN_PY_FPIOA_MANAGER= # end of Builtin py modules configurations # From b8b08cf1dd3886ff899afad7384f67cdac50c336 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Sat, 21 Aug 2021 01:47:12 +0800 Subject: [PATCH 43/64] Update config_defaults_kmodel_v4_support.mk --- .../maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk index 2d69085ff..bd7e9acce 100644 --- a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk +++ b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk @@ -93,7 +93,7 @@ CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y # # CONFIG_MAIXPY_BUILTIN_PY_PYE is not set CONFIG_MAIXPY_BUILTIN_PY_BOARD=n -CONFIG_MAIXPY_BUILTIN_PY_FPIOA_MANAGER= +CONFIG_MAIXPY_BUILTIN_PY_FPIOA_MANAGER=y # end of Builtin py modules configurations # From 1e6abdef1c6bea95a9c30a49c2f9fe0095d5a2d1 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Sun, 22 Aug 2021 02:09:09 +0800 Subject: [PATCH 44/64] Update config_defaults_kmodel_v4_support.mk --- .../maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk index bd7e9acce..1e098acd2 100644 --- a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk +++ b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk @@ -92,7 +92,7 @@ CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y # Builtin py modules configurations # # CONFIG_MAIXPY_BUILTIN_PY_PYE is not set -CONFIG_MAIXPY_BUILTIN_PY_BOARD=n +CONFIG_MAIXPY_BUILTIN_PY_BOARD= CONFIG_MAIXPY_BUILTIN_PY_FPIOA_MANAGER=y # end of Builtin py modules configurations From ba7ada0a4c84bca180396686e3b07394c46ad06b Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Sun, 22 Aug 2021 02:15:39 +0800 Subject: [PATCH 45/64] Update config_defaults_kmodel_v4_support.mk --- .../maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk index 1e098acd2..bae984096 100644 --- a/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk +++ b/projects/maixpy_k210_minimum/config_defaults_kmodel_v4_support.mk @@ -92,7 +92,7 @@ CONFIG_MICROPYTHON_KMODEL_V4_SUPPORT=y # Builtin py modules configurations # # CONFIG_MAIXPY_BUILTIN_PY_PYE is not set -CONFIG_MAIXPY_BUILTIN_PY_BOARD= +CONFIG_MAIXPY_BUILTIN_PY_BOARD=y CONFIG_MAIXPY_BUILTIN_PY_FPIOA_MANAGER=y # end of Builtin py modules configurations From 0bac2ced75d8888f392611809499c6542ea12981 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Tue, 7 Sep 2021 17:56:15 +0800 Subject: [PATCH 46/64] Update imlib.c --- components/micropython/port/src/omv/img/imlib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/components/micropython/port/src/omv/img/imlib.c b/components/micropython/port/src/omv/img/imlib.c index bef32530e..0a0c1284f 100644 --- a/components/micropython/port/src/omv/img/imlib.c +++ b/components/micropython/port/src/omv/img/imlib.c @@ -685,6 +685,7 @@ void imlib_save_image(image_t *img, const char *path, rectangle_t *roi, int qual switch (imblib_parse_extension(img, path)) { //TODO: case FORMAT_BMP: + printf("OK!\n"); bmp_write_subimg(img, path, roi); break; // case FORMAT_PNM: From 82c93409eb323fa88cd4bac7fe25ca71ce47d37e Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Tue, 7 Sep 2021 18:03:46 +0800 Subject: [PATCH 47/64] Update imlib.c --- components/micropython/port/src/omv/img/imlib.c | 1 - 1 file changed, 1 deletion(-) diff --git a/components/micropython/port/src/omv/img/imlib.c b/components/micropython/port/src/omv/img/imlib.c index 0a0c1284f..bef32530e 100644 --- a/components/micropython/port/src/omv/img/imlib.c +++ b/components/micropython/port/src/omv/img/imlib.c @@ -685,7 +685,6 @@ void imlib_save_image(image_t *img, const char *path, rectangle_t *roi, int qual switch (imblib_parse_extension(img, path)) { //TODO: case FORMAT_BMP: - printf("OK!\n"); bmp_write_subimg(img, path, roi); break; // case FORMAT_PNM: From 41018dbf306dfad3574c33dc419b1805453137ca Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Tue, 7 Sep 2021 18:04:37 +0800 Subject: [PATCH 48/64] Update bmp.c --- components/micropython/port/src/omv/img/bmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/micropython/port/src/omv/img/bmp.c b/components/micropython/port/src/omv/img/bmp.c index 141d7f7a1..1f6f3fb6c 100644 --- a/components/micropython/port/src/omv/img/bmp.c +++ b/components/micropython/port/src/omv/img/bmp.c @@ -229,7 +229,7 @@ void bmp_write_subimg(image_t *img, const char *path, rectangle_t *r) mp_obj_t file = vfs_internal_open(path, "wb", &err); if(file == MP_OBJ_NULL || err != 0) mp_raise_OSError(err); - + printf("OK!\n"); if (IM_IS_GS(img)) { const int row_bytes = (((rect.w * 8) + 31) / 32) * 4; const int data_size = (row_bytes * rect.h); From c851ae43e67266b21a8dca04dbe9d19ea7615148 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Tue, 7 Sep 2021 18:11:02 +0800 Subject: [PATCH 49/64] Update bmp.c --- components/micropython/port/src/omv/img/bmp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/components/micropython/port/src/omv/img/bmp.c b/components/micropython/port/src/omv/img/bmp.c index 1f6f3fb6c..eb726ab5c 100644 --- a/components/micropython/port/src/omv/img/bmp.c +++ b/components/micropython/port/src/omv/img/bmp.c @@ -7,6 +7,7 @@ * */ #include +#include #include #include #include "vfs_wrapper.h" From 9489619b1618e329f1f98b819b7f7e635d600b27 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Tue, 7 Sep 2021 18:17:42 +0800 Subject: [PATCH 50/64] Update bmp.c --- components/micropython/port/src/omv/img/bmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/micropython/port/src/omv/img/bmp.c b/components/micropython/port/src/omv/img/bmp.c index eb726ab5c..36c1fcc4b 100644 --- a/components/micropython/port/src/omv/img/bmp.c +++ b/components/micropython/port/src/omv/img/bmp.c @@ -230,7 +230,6 @@ void bmp_write_subimg(image_t *img, const char *path, rectangle_t *r) mp_obj_t file = vfs_internal_open(path, "wb", &err); if(file == MP_OBJ_NULL || err != 0) mp_raise_OSError(err); - printf("OK!\n"); if (IM_IS_GS(img)) { const int row_bytes = (((rect.w * 8) + 31) / 32) * 4; const int data_size = (row_bytes * rect.h); @@ -306,5 +305,6 @@ void bmp_write_subimg(image_t *img, const char *path, rectangle_t *r) } } } + printf("OK!\n"); vfs_internal_close(file, &err); } From f4ddaf8e247f57c91b6dd1e2c8092bafced74dcc Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Tue, 7 Sep 2021 18:40:44 +0800 Subject: [PATCH 51/64] Update bmp.c --- components/micropython/port/src/omv/img/bmp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/micropython/port/src/omv/img/bmp.c b/components/micropython/port/src/omv/img/bmp.c index 36c1fcc4b..0ae6c360b 100644 --- a/components/micropython/port/src/omv/img/bmp.c +++ b/components/micropython/port/src/omv/img/bmp.c @@ -231,6 +231,7 @@ void bmp_write_subimg(image_t *img, const char *path, rectangle_t *r) if(file == MP_OBJ_NULL || err != 0) mp_raise_OSError(err); if (IM_IS_GS(img)) { + printf("OK1!\n"); const int row_bytes = (((rect.w * 8) + 31) / 32) * 4; const int data_size = (row_bytes * rect.h); const int waste = (row_bytes / sizeof(uint8_t)) - rect.w; @@ -270,6 +271,7 @@ void bmp_write_subimg(image_t *img, const char *path, rectangle_t *r) } } } else { + printf("OK1!\n"); const int row_bytes = (((rect.w * 16) + 31) / 32) * 4; const int data_size = (row_bytes * rect.h); const int waste = (row_bytes / sizeof(uint16_t)) - rect.w; @@ -305,6 +307,5 @@ void bmp_write_subimg(image_t *img, const char *path, rectangle_t *r) } } } - printf("OK!\n"); vfs_internal_close(file, &err); } From e3cd886c98519e36b603a50fcb4265d56d5220c7 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Tue, 7 Sep 2021 18:49:50 +0800 Subject: [PATCH 52/64] Update bmp.c --- components/micropython/port/src/omv/img/bmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/micropython/port/src/omv/img/bmp.c b/components/micropython/port/src/omv/img/bmp.c index 0ae6c360b..90df498f3 100644 --- a/components/micropython/port/src/omv/img/bmp.c +++ b/components/micropython/port/src/omv/img/bmp.c @@ -231,7 +231,6 @@ void bmp_write_subimg(image_t *img, const char *path, rectangle_t *r) if(file == MP_OBJ_NULL || err != 0) mp_raise_OSError(err); if (IM_IS_GS(img)) { - printf("OK1!\n"); const int row_bytes = (((rect.w * 8) + 31) / 32) * 4; const int data_size = (row_bytes * rect.h); const int waste = (row_bytes / sizeof(uint8_t)) - rect.w; @@ -255,6 +254,7 @@ void bmp_write_subimg(image_t *img, const char *path, rectangle_t *r) write_long_raise(file, 0); write_long_raise(file, 0); // Color Table (1024 bytes) + printf("OK1!\n"); for (int i = 0; i < 256; i++) { write_long_raise(file, ((i) << 16) | ((i) << 8) | i); } From 95bb2642f9e112b0dc2427cc360a771e53e94a53 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Tue, 7 Sep 2021 18:59:21 +0800 Subject: [PATCH 53/64] Update bmp.c --- components/micropython/port/src/omv/img/bmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/micropython/port/src/omv/img/bmp.c b/components/micropython/port/src/omv/img/bmp.c index 90df498f3..90411daee 100644 --- a/components/micropython/port/src/omv/img/bmp.c +++ b/components/micropython/port/src/omv/img/bmp.c @@ -254,10 +254,10 @@ void bmp_write_subimg(image_t *img, const char *path, rectangle_t *r) write_long_raise(file, 0); write_long_raise(file, 0); // Color Table (1024 bytes) - printf("OK1!\n"); for (int i = 0; i < 256; i++) { write_long_raise(file, ((i) << 16) | ((i) << 8) | i); } + printf("OK1!\n"); if ((rect.x == 0) && (rect.w == img->w) && (img->w == row_bytes)) { write_data_raise(file, // Super Fast - Zoom, Zoom! img->pixels + (rect.y * img->w), @@ -271,7 +271,7 @@ void bmp_write_subimg(image_t *img, const char *path, rectangle_t *r) } } } else { - printf("OK1!\n"); + printf("OK2!\n"); const int row_bytes = (((rect.w * 16) + 31) / 32) * 4; const int data_size = (row_bytes * rect.h); const int waste = (row_bytes / sizeof(uint16_t)) - rect.w; From 8d10493ba7b7a89a7b3fa35f6daeb83eb32c68e4 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Wed, 22 Dec 2021 22:47:16 +0800 Subject: [PATCH 54/64] Update draw.c --- components/micropython/port/src/omv/img/draw.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/micropython/port/src/omv/img/draw.c b/components/micropython/port/src/omv/img/draw.c index a0257bdfb..0ac5cafec 100644 --- a/components/micropython/port/src/omv/img/draw.c +++ b/components/micropython/port/src/omv/img/draw.c @@ -36,14 +36,17 @@ void imlib_set_pixel(image_t *img, int x, int y, int p) switch(img->bpp) { case IMAGE_BPP_BINARY: { IMAGE_PUT_BINARY_PIXEL(img, x, y, p); + print(0) break; } case IMAGE_BPP_GRAYSCALE: { IMAGE_PUT_GRAYSCALE_PIXEL(img, x, y, p); + print(1) break; } case IMAGE_BPP_RGB565: { IMAGE_PUT_RGB565_PIXEL(img, x, y, p); + print(2) break; } default: { From 8b2d462998fce95bcd8b474a6d5abd7896761752 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Wed, 22 Dec 2021 22:52:39 +0800 Subject: [PATCH 55/64] Update draw.c --- components/micropython/port/src/omv/img/draw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/micropython/port/src/omv/img/draw.c b/components/micropython/port/src/omv/img/draw.c index 0ac5cafec..c7b980e3d 100644 --- a/components/micropython/port/src/omv/img/draw.c +++ b/components/micropython/port/src/omv/img/draw.c @@ -36,17 +36,17 @@ void imlib_set_pixel(image_t *img, int x, int y, int p) switch(img->bpp) { case IMAGE_BPP_BINARY: { IMAGE_PUT_BINARY_PIXEL(img, x, y, p); - print(0) + printf("0"); break; } case IMAGE_BPP_GRAYSCALE: { IMAGE_PUT_GRAYSCALE_PIXEL(img, x, y, p); - print(1) + printf("1"); break; } case IMAGE_BPP_RGB565: { IMAGE_PUT_RGB565_PIXEL(img, x, y, p); - print(2) + printf("2"); break; } default: { From 44d46206e36c0f0fb9ebaaea2eb28ad0edc0449b Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Wed, 22 Dec 2021 23:00:55 +0800 Subject: [PATCH 56/64] Update draw.c --- components/micropython/port/src/omv/img/draw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/micropython/port/src/omv/img/draw.c b/components/micropython/port/src/omv/img/draw.c index c7b980e3d..768b7f6ec 100644 --- a/components/micropython/port/src/omv/img/draw.c +++ b/components/micropython/port/src/omv/img/draw.c @@ -2,7 +2,7 @@ * Copyright (c) 2013-2018 Ibrahim Abdelkader & Kwabena W. Agyeman * This work is licensed under the MIT license, see the file LICENSE for details. */ - +#include #include "font.h" #include "imlib.h" From ba4f611a10f86f4eccfe468cc36d2b50e97d6d7e Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Thu, 23 Dec 2021 02:04:26 +0800 Subject: [PATCH 57/64] Update draw.c --- components/micropython/port/src/omv/img/draw.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/components/micropython/port/src/omv/img/draw.c b/components/micropython/port/src/omv/img/draw.c index 768b7f6ec..6cd1ac743 100644 --- a/components/micropython/port/src/omv/img/draw.c +++ b/components/micropython/port/src/omv/img/draw.c @@ -32,21 +32,22 @@ int imlib_get_pixel(image_t *img, int x, int y) // Set pixel (handles boundary check and image type check). void imlib_set_pixel(image_t *img, int x, int y, int p) { + break; if ((0 <= x) && (x < img->w) && (0 <= y) && (y < img->h)) { switch(img->bpp) { case IMAGE_BPP_BINARY: { IMAGE_PUT_BINARY_PIXEL(img, x, y, p); - printf("0"); + //printf("0"); break; } case IMAGE_BPP_GRAYSCALE: { IMAGE_PUT_GRAYSCALE_PIXEL(img, x, y, p); - printf("1"); + //printf("1"); break; } case IMAGE_BPP_RGB565: { IMAGE_PUT_RGB565_PIXEL(img, x, y, p); - printf("2"); + //printf("2"); break; } default: { From 224b5ba50083477d5daa994a9b64f2465137ffc4 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Thu, 23 Dec 2021 02:09:47 +0800 Subject: [PATCH 58/64] Update draw.c --- components/micropython/port/src/omv/img/draw.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/components/micropython/port/src/omv/img/draw.c b/components/micropython/port/src/omv/img/draw.c index 6cd1ac743..c9bd21d7b 100644 --- a/components/micropython/port/src/omv/img/draw.c +++ b/components/micropython/port/src/omv/img/draw.c @@ -31,9 +31,8 @@ int imlib_get_pixel(image_t *img, int x, int y) // Set pixel (handles boundary check and image type check). void imlib_set_pixel(image_t *img, int x, int y, int p) -{ - break; - if ((0 <= x) && (x < img->w) && (0 <= y) && (y < img->h)) { +{ + /*if ((0 <= x) && (x < img->w) && (0 <= y) && (y < img->h)) { switch(img->bpp) { case IMAGE_BPP_BINARY: { IMAGE_PUT_BINARY_PIXEL(img, x, y, p); @@ -54,7 +53,7 @@ void imlib_set_pixel(image_t *img, int x, int y, int p) break; } } - } + }*/ } // https://stackoverflow.com/questions/1201200/fast-algorithm-for-drawing-filled-circles From d01e4b69eb471a719d275125f6e3e99971adcb7a Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Thu, 23 Dec 2021 02:16:38 +0800 Subject: [PATCH 59/64] Update draw.c --- components/micropython/port/src/omv/img/draw.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/components/micropython/port/src/omv/img/draw.c b/components/micropython/port/src/omv/img/draw.c index c9bd21d7b..7f8c08e6b 100644 --- a/components/micropython/port/src/omv/img/draw.c +++ b/components/micropython/port/src/omv/img/draw.c @@ -32,28 +32,25 @@ int imlib_get_pixel(image_t *img, int x, int y) // Set pixel (handles boundary check and image type check). void imlib_set_pixel(image_t *img, int x, int y, int p) { - /*if ((0 <= x) && (x < img->w) && (0 <= y) && (y < img->h)) { + if ((0 <= x) && (x < img->w) && (0 <= y) && (y < img->h)) { switch(img->bpp) { case IMAGE_BPP_BINARY: { IMAGE_PUT_BINARY_PIXEL(img, x, y, p); - //printf("0"); break; } case IMAGE_BPP_GRAYSCALE: { IMAGE_PUT_GRAYSCALE_PIXEL(img, x, y, p); - //printf("1"); break; } case IMAGE_BPP_RGB565: { IMAGE_PUT_RGB565_PIXEL(img, x, y, p); - //printf("2"); break; } default: { break; } } - }*/ + } } // https://stackoverflow.com/questions/1201200/fast-algorithm-for-drawing-filled-circles From 8e8c00192ea12584c7ca494b4e84a862bbc45650 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Thu, 23 Dec 2021 02:34:00 +0800 Subject: [PATCH 60/64] Update py_image.c --- components/micropython/port/src/omv/py/py_image.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/micropython/port/src/omv/py/py_image.c b/components/micropython/port/src/omv/py/py_image.c index cef879c75..1861d694e 100644 --- a/components/micropython/port/src/omv/py/py_image.c +++ b/components/micropython/port/src/omv/py/py_image.c @@ -652,18 +652,22 @@ STATIC mp_obj_t py_image_set_pixel(size_t n_args, const mp_obj_t *args, mp_map_t switch (arg_img->bpp) { case IMAGE_BPP_BINARY: { IMAGE_PUT_BINARY_PIXEL(arg_img, arg_x, arg_y, arg_c); + printf("0"); return args[0]; } case IMAGE_BPP_GRAYSCALE: { IMAGE_PUT_GRAYSCALE_PIXEL(arg_img, arg_x, arg_y, arg_c); + printf("1"); return args[0]; } case IMAGE_BPP_RGB565: { IMAGE_PUT_RGB565_PIXEL(arg_img, arg_x, arg_y, arg_c); + printf("2"); return args[0]; } case IMAGE_BPP_BAYER: { IMAGE_PUT_GRAYSCALE_PIXEL(arg_img, arg_x, arg_y, arg_c); // Correct! + printf("3"); return args[0]; } default: return args[0]; From 44b76433c46e09b76eb533f9f86ea21a935903d1 Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Thu, 23 Dec 2021 02:35:38 +0800 Subject: [PATCH 61/64] Update py_image.c --- components/micropython/port/src/omv/py/py_image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/micropython/port/src/omv/py/py_image.c b/components/micropython/port/src/omv/py/py_image.c index 1861d694e..bfc49bd62 100644 --- a/components/micropython/port/src/omv/py/py_image.c +++ b/components/micropython/port/src/omv/py/py_image.c @@ -652,7 +652,7 @@ STATIC mp_obj_t py_image_set_pixel(size_t n_args, const mp_obj_t *args, mp_map_t switch (arg_img->bpp) { case IMAGE_BPP_BINARY: { IMAGE_PUT_BINARY_PIXEL(arg_img, arg_x, arg_y, arg_c); - printf("0"); + mp_printf(print, "0"); return args[0]; } case IMAGE_BPP_GRAYSCALE: { From f57b332c9fac92b16250c898453132cac037454c Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Thu, 23 Dec 2021 02:38:19 +0800 Subject: [PATCH 62/64] Update py_image.c --- components/micropython/port/src/omv/py/py_image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/micropython/port/src/omv/py/py_image.c b/components/micropython/port/src/omv/py/py_image.c index bfc49bd62..1861d694e 100644 --- a/components/micropython/port/src/omv/py/py_image.c +++ b/components/micropython/port/src/omv/py/py_image.c @@ -652,7 +652,7 @@ STATIC mp_obj_t py_image_set_pixel(size_t n_args, const mp_obj_t *args, mp_map_t switch (arg_img->bpp) { case IMAGE_BPP_BINARY: { IMAGE_PUT_BINARY_PIXEL(arg_img, arg_x, arg_y, arg_c); - mp_printf(print, "0"); + printf("0"); return args[0]; } case IMAGE_BPP_GRAYSCALE: { From 3c7e27569e9b0adc944565dec7f2b0d7b48a70db Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Thu, 23 Dec 2021 02:50:48 +0800 Subject: [PATCH 63/64] Update py_image.c --- components/micropython/port/src/omv/py/py_image.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/micropython/port/src/omv/py/py_image.c b/components/micropython/port/src/omv/py/py_image.c index 1861d694e..f76a2b15b 100644 --- a/components/micropython/port/src/omv/py/py_image.c +++ b/components/micropython/port/src/omv/py/py_image.c @@ -652,22 +652,22 @@ STATIC mp_obj_t py_image_set_pixel(size_t n_args, const mp_obj_t *args, mp_map_t switch (arg_img->bpp) { case IMAGE_BPP_BINARY: { IMAGE_PUT_BINARY_PIXEL(arg_img, arg_x, arg_y, arg_c); - printf("0"); + //printf("0"); return args[0]; } case IMAGE_BPP_GRAYSCALE: { IMAGE_PUT_GRAYSCALE_PIXEL(arg_img, arg_x, arg_y, arg_c); - printf("1"); + //printf("1"); return args[0]; } case IMAGE_BPP_RGB565: { IMAGE_PUT_RGB565_PIXEL(arg_img, arg_x, arg_y, arg_c); - printf("2"); + //printf("2"); return args[0]; } case IMAGE_BPP_BAYER: { IMAGE_PUT_GRAYSCALE_PIXEL(arg_img, arg_x, arg_y, arg_c); // Correct! - printf("3"); + //printf("3"); return args[0]; } default: return args[0]; From 783874ce7c31f2b6777c817b57382c6d2bda23ac Mon Sep 17 00:00:00 2001 From: alan840706 <58114247+alan840706@users.noreply.github.com> Date: Thu, 25 Aug 2022 17:37:21 +0800 Subject: [PATCH 64/64] Create a --- components/micropython/a | 1 + 1 file changed, 1 insertion(+) create mode 100644 components/micropython/a diff --git a/components/micropython/a b/components/micropython/a new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/components/micropython/a @@ -0,0 +1 @@ +