From b39a4cc44cf044ab6c46d49d765ab4b71b269e42 Mon Sep 17 00:00:00 2001 From: doudou <1491766334@qq.com> Date: Mon, 23 Sep 2024 17:38:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update:=E7=89=88=E6=9C=AC=E5=8F=B7=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E5=88=B0V2001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- csdk.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csdk.lua b/csdk.lua index dbc44a7a..ae99e4e5 100644 --- a/csdk.lua +++ b/csdk.lua @@ -1,5 +1,5 @@ luatos_root = os.scriptdir().."/../LuatOS" -LUAT_BSP_VERSION = "V1004" +LUAT_BSP_VERSION = "2001" package("gnu_rm") set_kind("toolchain") From 69eef1e16ecd2d3c21819fa4b23ae94c909f62c8 Mon Sep 17 00:00:00 2001 From: Wendal Chen Date: Mon, 23 Sep 2024 18:00:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20Air780EQ=E5=9C=A8LuatOS=E4=B8=8B?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E4=BD=BF=E7=94=A8AONGPIO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interface/src/luat_gpio_ec7xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/luat_gpio_ec7xx.c b/interface/src/luat_gpio_ec7xx.c index 7a8499d1..3d885b29 100644 --- a/interface/src/luat_gpio_ec7xx.c +++ b/interface/src/luat_gpio_ec7xx.c @@ -127,7 +127,7 @@ int luat_gpio_open(luat_gpio_cfg_t* gpio) } #if defined(__LUATOS__) && defined(TYPE_EC716E) - else if (gpio->pin < 10) { + else if (gpio->pin < 10 || gpio->pin > 16) { // Air780EQ不支持普通GPIO，所以屏蔽 extern int soc_get_model_name(char *model, uint8_t is_full); char model[16] = {0}; From 3f3ab76af5c8c4ed6c0d66f5d93561de4cc687d0 Mon Sep 17 00:00:00 2001 From: doudou <1491766334@qq.com> Date: Mon, 23 Sep 2024 18:18:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update:=20=E5=90=84=E4=B8=AA=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/luatos/inc/luat_conf_bsp_air700exq.h | 3 ++- project/luatos/inc/luat_conf_bsp_air780eps.h | 8 ++------ project/luatos/inc/luat_conf_bsp_air780eq.h | 16 +--------------- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/project/luatos/inc/luat_conf_bsp_air700exq.h b/project/luatos/inc/luat_conf_bsp_air700exq.h index e5a5e019..dd54df9e 100644 --- a/project/luatos/inc/luat_conf_bsp_air700exq.h +++ b/project/luatos/inc/luat_conf_bsp_air700exq.h @@ -13,6 +13,7 @@ #define LUAT_USE_ZBUFF 1 #define LUAT_USE_PACK 1 #define LUAT_USE_MINIZ 1 +#define LUAT_USE_HMETA 1 #define LUAT_USE_MQTT 1 #define LUAT_USE_FTP 1 @@ -21,7 +22,7 @@ #define LUAT_USE_BIT64 1 #define LUAT_USE_ICONV 1 -#define LUAT_HEAP_SIZE_200K +#define LUAT_HEAP_SIZE (200*1024) #define LUAT_SCRIPT_SIZE 256 #define LUAT_SCRIPT_OTA_SIZE 192 \ No newline at end of file diff --git a/project/luatos/inc/luat_conf_bsp_air780eps.h b/project/luatos/inc/luat_conf_bsp_air780eps.h index 89a64bda..428e7083 100644 --- a/project/luatos/inc/luat_conf_bsp_air780eps.h +++ b/project/luatos/inc/luat_conf_bsp_air780eps.h @@ -37,13 +37,9 @@ #define LUAT_USE_MINIZ 1 #define LUAT_USE_FTP 1 #define LUAT_USE_BIT64 1 - #define LUAT_USE_ICONV 1 -// #define LUAT_USE_MEDIA 1 -// #define LUAT_USE_RECORD 1 -// #define LUAT_USE_TTS 1 -// #define LUAT_USE_TTS_ONCHIP 1 - #define LUAT_SCRIPT_SIZE 512 #define LUAT_SCRIPT_OTA_SIZE 360 + +#define LUAT_HEAP_SIZE (300*1024) diff --git a/project/luatos/inc/luat_conf_bsp_air780eq.h b/project/luatos/inc/luat_conf_bsp_air780eq.h index ca9f4bc1..4dfe068d 100644 --- a/project/luatos/inc/luat_conf_bsp_air780eq.h +++ b/project/luatos/inc/luat_conf_bsp_air780eq.h @@ -5,15 +5,10 @@ #define LUAT_USE_UART 1 #define LUAT_USE_GPIO 1 -// #define LUAT_USE_I2C 1 -// #define LUAT_USE_SPI 1 -// #define LUAT_USE_ADC 1 -// #define LUAT_USE_PWM 1 #define LUAT_USE_WDT 1 #define LUAT_USE_PM 1 #define LUAT_USE_MCU 1 #define LUAT_USE_RTC 1 -// #define LUAT_USE_OTP 1 #define LUAT_USE_WLAN 1 #define LUAT_USE_SMS 1 #define LUAT_USE_HMETA 1 @@ -27,24 +22,15 @@ #define LUAT_USE_CJSON 1 #define LUAT_USE_ZBUFF 1 #define LUAT_USE_PACK 1 -// #define LUAT_USE_LIBGNSS 1 #define LUAT_USE_FS 1 -// #define LUAT_USE_SENSOR 1 #define LUAT_USE_FSKV 1 -// #define LUAT_USE_I2CTOOLS 1 #define LUAT_USE_MINIZ 1 #define LUAT_USE_FTP 1 #define LUAT_USE_BIT64 1 - #define LUAT_USE_ICONV 1 -// #define LUAT_USE_MEDIA 1 -// #define LUAT_USE_RECORD 1 -// #define LUAT_USE_TTS 1 -// #define LUAT_USE_TTS_ONCHIP 1 - #define LUAT_SCRIPT_SIZE 256 #define LUAT_SCRIPT_OTA_SIZE 192 -#define LUAT_HEAP_SIZE 200 +#define LUAT_HEAP_SIZE (200*1024)