diff --git a/README.MD b/README.MD index daeab4d185fbf9f64d9eb76f5bddc08edf77cabf..cb55683c1c0bfe0690fbbd978470b1da6bb40d5f 100644 --- a/README.MD +++ b/README.MD @@ -84,3 +84,9 @@ $(NAME)_COMPONENTS := third_party/LinkSDK \ >1. 通过应用配置脚本指定的全局宏定义,在每一次变更宏定义时,会自动删除编译目录,以期全部重新编译所有代码,从而让变更后的全局宏定义能够起作用,否则,由于源文件没变化过,引用该宏定义的源码将不会被编译,导致宏定义无效。 >2. 通过`.mk`文件定义的宏,在宏定义有变动后,一定要先执行`clean`命令,原因同上。 >3. ``和``两个参数顺序可互换。 + +@param bytes 传入字节 +@param len 传入字节长度 +增加了modzlib.function(bytes,len) +因为本菜鸡不会整合进uzlib模块中,所以新建了个modzlib模块 +希望官方大大早日整合进官方固件中 \ No newline at end of file diff --git a/alib/libz.a b/alib/libz.a new file mode 100644 index 0000000000000000000000000000000000000000..cd6845113c1a6ed98d8d50fb1b07050259a0ca74 Binary files /dev/null and b/alib/libz.a differ diff --git a/config/autoconf.h b/config/autoconf.h index 5bbb362d06a97013fa73ab32b6d002b3bb5af37c..9b1660f00fc2380bec9cad7258aa921146f0e81e 100644 --- a/config/autoconf.h +++ b/config/autoconf.h @@ -4,3 +4,22 @@ * Helios SDK Configuration * */ +#define CONFIG_LVGL_CONT 1 +#define CONFIG_SPI_SDCARD 1 +#define CONFIG_LVGL_SLIDER 1 +#define CONFIG_VIOCE_CALL 1 +#define CONFIG_QRCODE 1 +#define CONFIG_LVGL_LABEL 1 +#define CONFIG_LVGL 1 +#define CONFIG_CAMERA_DECODE 1 +#define CONFIG_LVGL_ARC 1 +#define CONFIG_CAMERA 1 +#define CONFIG_LVGL_IMG 1 +#define CONFIG_MBEDTLS 1 +#define CONFIG_LVGL_SW 1 +#define CONFIG_TTS 1 +#define CONFIG_JPEG 1 +#define CONFIG_QUECTHING 1 +#define CONFIG_LVGL_ROLLER 1 +#define CONFIG_CAMERA_SAVEPHOTOS 1 +#define CONFIG_LVGL_BTN 1 diff --git a/config/config.in b/config/config.in index 04564fa08885c0b1dd0fec5dd191d0a4f4129386..2618b38dcec6e82914e189a9f6a5e60eaa24ce8c 100644 --- a/config/config.in +++ b/config/config.in @@ -5,7 +5,8 @@ menu "System Configuration" source "../system/config.in" endmenu -menu "BC25PA" +menu "EC600NCN_LC" source "../services/microPython/config/config.in" +source "../components/poc/poc_option.in" endmenu diff --git a/config/config.mk b/config/config.mk index 866bdf766683000f6589b37a02ffd9758970f202..9c52a677b00150afd194f5f6e6f7d235f16f4039 100644 --- a/config/config.mk +++ b/config/config.mk @@ -6,18 +6,59 @@ # # System Configuration # -# CONFIG_MBEDTLS is not set +CONFIG_MBEDTLS=y # -# BC25PA +# EC600NCN_LC # -# CONFIG_LVGL is not set -# CONFIG_QRCODE is not set -# CONFIG_POC is not set -# CONFIG_CAMERA is not set -# CONFIG_QUECTHING is not set +CONFIG_LVGL=y + +# +# lvgl option +# +CONFIG_LVGL_CONT=y +CONFIG_LVGL_BTN=y +# CONFIG_LVGL_IMGBTN is not set +CONFIG_LVGL_LABEL=y +CONFIG_LVGL_IMG=y +# CONFIG_LVGL_LINE is not set +# CONFIG_LVGL_PAGE is not set +# CONFIG_LVGL_LIST is not set +# CONFIG_LVGL_CHART is not set +# CONFIG_LVGL_TABLE is not set +# CONFIG_LVGL_CB is not set +# CONFIG_LVGL_CPICKER is not set +# CONFIG_LVGL_BAR is not set +CONFIG_LVGL_SLIDER=y +# CONFIG_LVGL_LED is not set +# CONFIG_LVGL_BTNM is not set +# CONFIG_LVGL_KB is not set +# CONFIG_LVGL_DDLIST is not set +CONFIG_LVGL_ROLLER=y +# CONFIG_LVGL_TA is not set +# CONFIG_LVGL_CANVAS is not set +# CONFIG_LVGL_WIN is not set +# CONFIG_LVGL_TABVIEW is not set +# CONFIG_LVGL_TILEVIEW is not set +# CONFIG_LVGL_MBOX is not set +# CONFIG_LVGL_LMETER is not set +# CONFIG_LVGL_GAUGE is not set +CONFIG_LVGL_SW=y +CONFIG_LVGL_ARC=y +# CONFIG_LVGL_PRELOAD is not set +# CONFIG_LVGL_CALENDAR is not set +# CONFIG_LVGL_SPINBOX is not set +# CONFIG_LVGL_FONT_CHINESE_11 is not set +CONFIG_QRCODE=y +CONFIG_CAMERA=y +CONFIG_CAMERA_DECODE=y +CONFIG_CAMERA_SAVEPHOTOS=y +CONFIG_QUECTHING=y # CONFIG_SPINAND is not set # CONFIG_RTMP is not set -# CONFIG_JPEG is not set -# CONFIG_SPI_SDCARD is not set +CONFIG_JPEG=y +CONFIG_SPI_SDCARD=y # CONFIG_BT is not set +CONFIG_VIOCE_CALL=y +CONFIG_TTS=y +# CONFIG_POC is not set diff --git a/config/include/config/camera.h b/config/include/config/camera.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/camera/decode.h b/config/include/config/camera/decode.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/camera/savephotos.h b/config/include/config/camera/savephotos.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/jpeg.h b/config/include/config/jpeg.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/lvgl.h b/config/include/config/lvgl.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/lvgl/arc.h b/config/include/config/lvgl/arc.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/lvgl/btn.h b/config/include/config/lvgl/btn.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/lvgl/cont.h b/config/include/config/lvgl/cont.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/lvgl/img.h b/config/include/config/lvgl/img.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/lvgl/label.h b/config/include/config/lvgl/label.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/lvgl/roller.h b/config/include/config/lvgl/roller.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/lvgl/slider.h b/config/include/config/lvgl/slider.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/lvgl/sw.h b/config/include/config/lvgl/sw.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/mbedtls.h b/config/include/config/mbedtls.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/qrcode.h b/config/include/config/qrcode.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/quecthing.h b/config/include/config/quecthing.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/spi/sdcard.h b/config/include/config/spi/sdcard.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/tts.h b/config/include/config/tts.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/include/config/vioce/call.h b/config/include/config/vioce/call.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/sample/sample.c b/sample/sample.c deleted file mode 100644 index 89c1ff96e77d7a9263eee72e89d8808a8ab2d216..0000000000000000000000000000000000000000 --- a/sample/sample.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) Quectel Wireless Solution, Co., Ltd.All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "helios.h" -#include "helios_debug.h" -#include "helios_os.h" - -#define app_debug(fmt, ...) custom_log(APP, fmt, ##__VA_ARGS__) - -static void AppSample(void *argv) -{ - UNUSED(argv); - - while (1) - { - app_debug("app sample running ...\r\n"); - Helios_sleep(1); - } -} - -application_init(AppSample, "AppSample", 2, 0); diff --git a/sample/sample.mk b/sample/sample.mk deleted file mode 100644 index 57c679e1ed1240b9b35800df8741481c62d157ce..0000000000000000000000000000000000000000 --- a/sample/sample.mk +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) Quectel Wireless Solution, Co., Ltd.All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -NAME := SAMPLE - -$(NAME)_SRCS := sample.c - -$(NAME)_INCS := . - -$(NAME)_COMPONENTS := diff --git a/sample/user_cfg.mk b/sample/user_cfg.mk deleted file mode 100644 index 11055b97a531a521edd5199e0fd531fcd6b8c98f..0000000000000000000000000000000000000000 --- a/sample/user_cfg.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) Quectel Wireless Solution, Co., Ltd.All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. \ No newline at end of file diff --git a/system/platform/ASR/boards/EC600NCN_LC/EC600NCN_LC.mk b/system/platform/ASR/boards/EC600NCN_LC/EC600NCN_LC.mk index ddcbc8bbc70e9cf92736ee350469ac7351f14b05..38e297cc0ade8df4bf01200b3a599d8261339ee1 100644 --- a/system/platform/ASR/boards/EC600NCN_LC/EC600NCN_LC.mk +++ b/system/platform/ASR/boards/EC600NCN_LC/EC600NCN_LC.mk @@ -18,6 +18,8 @@ NAME := EC600NCN_LC GLOBAL_INCS = include $(NAME)_ARCHIVES = \ + libraries/libz.a \ libraries/libHeliosAPI.a \ - libraries/ql_common_api.a + libraries/ql_common_api.a + diff --git a/system/platform/ASR/boards/EC600NCN_LC/libraries/libz.a b/system/platform/ASR/boards/EC600NCN_LC/libraries/libz.a new file mode 100644 index 0000000000000000000000000000000000000000..cd6845113c1a6ed98d8d50fb1b07050259a0ca74 Binary files /dev/null and b/system/platform/ASR/boards/EC600NCN_LC/libraries/libz.a differ