Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update from JenkinsRsWlan5:master_sync_20250117 #76

Merged
merged 1 commit into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/create_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
- name: Set branch as environment variable
run: |
echo "CURRENT_DATE=$(date '+%Y-%m-%d')" >> $GITHUB_ENV
echo "CURRENT_BRANCH=gloriachen09:${GITHUB_REF##*/}" >> $GITHUB_ENV
echo "PULL_REQUEST_FROM_BRANCH=gloriachen09:${GITHUB_REF##*/}" >> $GITHUB_ENV
echo "CURRENT_BRANCH=${{ github.actor }}:${GITHUB_REF##*/}" >> $GITHUB_ENV
echo "PULL_REQUEST_FROM_BRANCH=${{ github.actor }}:${GITHUB_REF##*/}" >> $GITHUB_ENV

- name: Get current commit message
run: |
Expand Down
Empty file.
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified amebadplus_gcc_project/project_km0/asdk/lib/soc/lib_pmc.a
Binary file not shown.
Empty file.
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified amebadplus_gcc_project/project_km4/asdk/lib/soc/lib_pmc.a
Binary file not shown.
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified amebalite_gcc_project/project_km4/asdk/lib/application/lib_wps.a
Binary file not shown.
Binary file modified amebalite_gcc_project/project_km4/asdk/lib/soc/lib_pmc.a
Binary file not shown.
4 changes: 2 additions & 2 deletions amebalite_gcc_project/project_kr4/inc/build_info.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define UTS_VERSION "2025-01-17 10:12:30"
#define RTL_FW_COMPILE_TIME "2025-01-17 10:12:30"
#define UTS_VERSION "2025-01-17 17:46:55"
#define RTL_FW_COMPILE_TIME "2025-01-17 17:46:55"
#define RTL_FW_COMPILE_DATE "2025-01-17"
#define RTL_FW_COMPILE_BY "auto_jenkins_wlan5"
#define RTL_FW_COMPILE_HOST "wlan5-203"
Expand Down
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified amebalite_gcc_project/project_kr4/vsdk/lib/application/lib_wps.a
Binary file not shown.
Binary file modified amebalite_gcc_project/project_kr4/vsdk/lib/soc/lib_pmc.a
Binary file not shown.
376,122 changes: 188,111 additions & 188,011 deletions amebasmart_gcc_project/project_ap/asdk/image/target_img2_otrcore.asm

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified amebasmart_gcc_project/project_ap/asdk/lib/application/lib_wps.a
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified amebasmart_gcc_project/project_ap/asdk/lib/soc/lib_pmc.a
Binary file not shown.
4 changes: 2 additions & 2 deletions amebasmart_gcc_project/project_ap/inc/build_info.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define UTS_VERSION "2025-01-17 10:13:35"
#define RTL_FW_COMPILE_TIME "2025-01-17 10:13:35"
#define UTS_VERSION "2025-01-17 17:47:25"
#define RTL_FW_COMPILE_TIME "2025-01-17 17:47:25"
#define RTL_FW_COMPILE_DATE "2025-01-17"
#define RTL_FW_COMPILE_BY "auto_jenkins_wlan5"
#define RTL_FW_COMPILE_HOST "wlan5-203"
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified amebasmart_gcc_project/project_hp/asdk/lib/application/lib_wps.a
Binary file not shown.
Binary file modified amebasmart_gcc_project/project_hp/asdk/lib/soc/lib_pmc.a
Binary file not shown.
4 changes: 2 additions & 2 deletions amebasmart_gcc_project/project_hp/inc/build_info.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define UTS_VERSION "2025-01-17 10:13:37"
#define RTL_FW_COMPILE_TIME "2025-01-17 10:13:37"
#define UTS_VERSION "2025-01-17 17:47:27"
#define RTL_FW_COMPILE_TIME "2025-01-17 17:47:27"
#define RTL_FW_COMPILE_DATE "2025-01-17"
#define RTL_FW_COMPILE_BY "auto_jenkins_wlan5"
#define RTL_FW_COMPILE_HOST "wlan5-203"
Expand Down
Empty file.
Binary file not shown.
Binary file modified amebasmart_gcc_project/project_lp/asdk/lib/soc/lib_pmc.a
Binary file not shown.
4 changes: 2 additions & 2 deletions amebasmart_gcc_project/project_lp/inc/build_info.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define UTS_VERSION "2025-01-17 10:13:48"
#define RTL_FW_COMPILE_TIME "2025-01-17 10:13:48"
#define UTS_VERSION "2025-01-17 17:47:38"
#define RTL_FW_COMPILE_TIME "2025-01-17 17:47:38"
#define RTL_FW_COMPILE_DATE "2025-01-17"
#define RTL_FW_COMPILE_BY "auto_jenkins_wlan5"
#define RTL_FW_COMPILE_HOST "wlan5-203"
Expand Down
33 changes: 20 additions & 13 deletions component/at_cmd/atcmd_wifi.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,19 @@ static void print_scan_result(struct rtw_scan_result *record)
at_printf(""MAC_FMT",", MAC_ARG(record->BSSID.octet));
at_printf("%s,\r\n", record->SSID.val);
#else
at_printf(""MAC_FMT",", MAC_ARG(record->BSSID.octet));
at_printf(" %d\t ", record->signal_strength);
at_printf(" %d\t ", record->channel);
at_printf("%s\t\t ", (record->security == RTW_SECURITY_OPEN) ? "Open " :

at_printf(""MAC_FMT", ", MAC_ARG(record->BSSID.octet));
at_printf("%d, ", record->signal_strength);
at_printf("%d, ", record->channel);
at_printf("%s, ", (record->wireless_mode == WLAN_MD_11B) ? "B" :
(record->wireless_mode == WLAN_MD_11BG) ? "G" :
(record->wireless_mode == WLAN_MD_11G) ? "G" :
(record->wireless_mode == WLAN_MD_11A) ? "A" :
(record->wireless_mode == WLAN_MD_11N) ? "N" :
(record->wireless_mode == WLAN_MD_11AC) ? "AC" :
(record->wireless_mode == WLAN_MD_11AX) ? "AX" :
"Unknown");
at_printf("\"%s\", ", (record->security == RTW_SECURITY_OPEN) ? "Open" :
(record->security == RTW_SECURITY_WEP_PSK) ? "WEP" :
(record->security == RTW_SECURITY_WPA_TKIP_PSK) ? "WPA TKIP" :
(record->security == RTW_SECURITY_WPA_AES_PSK) ? "WPA AES" :
Expand Down Expand Up @@ -192,9 +201,9 @@ static void print_scan_result(struct rtw_scan_result *record)
#ifdef CONFIG_OWE_SUPPORT
(record->security == RTW_SECURITY_WPA3_OWE) ? "WPA3-OWE" :
#endif
"Unknown ");
"Unknown");

at_printf(" %s ", record->SSID.val);
at_printf("\"%s\" ", record->SSID.val);
if (record->bss_type == RTW_BSS_TYPE_WTN_HELPER) {
at_printf(" Helper\t ");
}
Expand Down Expand Up @@ -227,9 +236,9 @@ void at_wlconn(void *arg)
unsigned int mac[ETH_ALEN];
char *argv[MAX_ARGC] = {0};
char empty_bssid[6] = {0};
unsigned long tick1 = rtos_time_get_current_system_time_ms();
unsigned long tick2;

#ifdef CONFIG_LWIP_LAYER
unsigned long tick1 = rtos_time_get_current_system_time_ms();
unsigned long tick3;
#endif

Expand Down Expand Up @@ -336,14 +345,11 @@ void at_wlconn(void *arg)
goto end;
}

tick2 = rtos_time_get_current_system_time_ms();
RTK_LOGI(NOTAG, "[+WLCONN] Connected after %d ms.\r\n", (unsigned int)(tick2 - tick1));

#ifdef CONFIG_LWIP_LAYER
/* Start DHCPClient */
LwIP_DHCP(0, DHCP_START);
tick3 = rtos_time_get_current_system_time_ms();
RTK_LOGI(NOTAG, "[+WLCONN] Got IP after %d ms.\r\n", (unsigned int)(tick3 - tick1));
RTK_LOGI(NOTAG, "\r\n[+WLCONN] Got IP after %d ms.\r\n", (unsigned int)(tick3 - tick1));
#endif

end:
Expand Down Expand Up @@ -570,7 +576,7 @@ void at_wlscan(void *arg)
#if (defined(WIFI_LOGO_CERTIFICATION_CONFIG) && WIFI_LOGO_CERTIFICATION_CONFIG)
at_printf("[%d],", (i + 1));
#else
at_printf("%d\t ", (i + 1));
at_printf("%2d, ", (i + 1));
#endif
scanned_AP_info = (struct rtw_scan_result *)(scan_buf + i * sizeof(struct rtw_scan_result));
scanned_AP_info->SSID.val[scanned_AP_info->SSID.len] = 0; /* Ensure the SSID is null terminated */
Expand All @@ -582,6 +588,7 @@ void at_wlscan(void *arg)
}

end:
RTK_LOGI(NOTAG, "\r\n[+WLSCAN] scan_ap_num: %d\r\n", scanned_AP_num);
rtos_mem_free((void *)channel_list);
if (error_no == 0) {
at_printf(ATCMD_OK_END_STR);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ameba_internal_library(example_mbed_gdma_singleblock)

target_sources(
${CURRENT_LIB_NAME} PRIVATE
example_mbed_gdma_singleblock.c
app_example.c
)
Original file line number Diff line number Diff line change
@@ -1,50 +1,46 @@
# Example Description

This example describes how to use GDMA's single-block transfer mode with Mbed API.

This example does not support the loguart command response.

# HW Configuration

None.

# SW configuration

1. Copy main.c to project\realtek_amebaxxx_va0_example\src\src_xxx, and replace old main.c.

2. For GCC environmnet, type command "make menuconfig" and Enable MBED_API.

3. Save and exit, then make all to compiling image and download new image.

# Expect result

GDMA will display "DMA Copy Memory Compare OK!! " in serial port tool. Otherwise, output info is "DMA Copy Memory Compare Err, xxx-th value1 value2".

# Note

1. If the output character sequence of the serial port tool is disordered, please configure `Boot_Agg_En = TRUE` in component/soc/xx/usrcfg/ameba_bootcfg.c according to the chip ID.
- AmebaSmart, amebasmart/usrcfg/ameba_bootcfg.c
- AmebaLite, amebalite/usrcfg/ameba_bootcfg.c
- AmebaDplus, amebadplus/usrcfg/ameba_bootcfg.c
2. AmebaSmart only supports Mbed API on ap and hp cores.

3. AmebaDplus only support Mbed API on KM4.

4. If AmebaLite outputs `IO Driver Parameters error! file_name:BOOT_ChipInfo_PSRAMType`, which means that the board is not configured with PSRAM. There are two solutions:
- Modify the menuconfig:
- enter `make menuconfig` under the **auto_build** folder
- set the `CONFIG LINK option` to `CodeInXip_DataHeapInSram[No_Psram]`
- save and exit
- Users need to select the correct **.rdev** file when downloading image.
- Change the development board, and select 8726E.

5. If the output information contains " irq[xx] priority 10 shall <= 7" , it means that the GDMA interrupt priority setting is abnormal and should be set below 7 in function dma_memcpy_init under component/mbed/targets/hal/rtl87xx/.
- AmebaSmart, rtl8730e/dma_api.c.
- AmebaLite, rtl8720e/dma_api.c.
- AmebaDplus, rtl8721f/dma_api.c.

# Supported IC

- AmebaLite
- AmebaSmart
# Example Description

This example describes how to use GDMA's single-block transfer mode with Mbed API.

This example does not support the loguart command response.

# HW Configuration

None.

# SW configuration

Run cmd: `./build.py -a mbed_gdma_singleblock`in directory {sdk_path}/amebaXXX_gcc_project.

# Expect result

GDMA will display "DMA Copy Memory Compare OK!! " in serial port tool. Otherwise, output info is "DMA Copy Memory Compare Err, xxx-th value1 value2".

# Note

1. If the output character sequence of the serial port tool is disordered, please configure `Boot_Agg_En = TRUE` in component/soc/xx/usrcfg/ameba_bootcfg.c according to the chip ID.
- AmebaSmart, amebasmart/usrcfg/ameba_bootcfg.c
- AmebaLite, amebalite/usrcfg/ameba_bootcfg.c
- AmebaDplus, amebadplus/usrcfg/ameba_bootcfg.c
2. AmebaSmart only supports Mbed API on ap and hp cores.

3. AmebaDplus only support Mbed API on KM4.

4. If AmebaLite outputs `IO Driver Parameters error! file_name:BOOT_ChipInfo_PSRAMType`, which means that the board is not configured with PSRAM. There are two solutions:
- Modify the menuconfig:
- enter `make menuconfig` under the **auto_build** folder
- set the `CONFIG LINK option` to `CodeInXip_DataHeapInSram[No_Psram]`
- save and exit
- Users need to select the correct **.rdev** file when downloading image.
- Change the development board, and select 8726E.

5. If the output information contains " irq[xx] priority 10 shall <= 7" , it means that the GDMA interrupt priority setting is abnormal and should be set below 7 in function dma_memcpy_init under component/mbed/targets/hal/rtl87xx/.
- AmebaSmart, rtl8730e/dma_api.c.
- AmebaLite, rtl8720e/dma_api.c.
- AmebaDplus, rtl8721f/dma_api.c.

# Supported IC

- AmebaLite
- AmebaSmart
- AmebaDplus
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/*
* Copyright (c) 2025 Realtek Semiconductor Corp.
*
* SPDX-License-Identifier: Apache-2.0
*/

#include "example_gdma_ext.h"

void app_example(void)
{
example_mbed_gdma_singleblock();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* Copyright (c) 2025 Realtek Semiconductor Corp.
*
* SPDX-License-Identifier: Apache-2.0
*/

#ifndef _GDMA_EXT_H_
#define _GDMA_EXT_H_

int example_mbed_gdma_singleblock(void);
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void dma_singleblock_transfer_task(void)

}

int main(void)
int example_mbed_gdma_singleblock(void)
{
if (rtos_task_create(NULL, "GDMA SINGLE BLOCK TRANSFER DEMO", (rtos_task_t)dma_singleblock_transfer_task, NULL, 3072, (1)) != SUCCESS) {
printf("Cannot create dma_singleblock_task demo task\n\r");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ameba_internal_library(example_raw_spi_dma_multi_block_rx_slave)

target_sources(
${CURRENT_LIB_NAME} PRIVATE
example_raw_ppe_3_layer_alpha_blend.c
app_example.c
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

extern int example_raw_ppe_3_layer_alpha_blend(void);

void app_example(void)
{
example_raw_ppe_3_layer_alpha_blend();
}
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,17 @@ static u32 PPE_Handler(void *Data)

status = PPE_GetAllIntStatus();
if (status & PPE_FR_OVER_INT) {
printf("Frame over interrupt occurs\n");
RTK_LOGS(NOTAG, RTK_LOG_INFO, "Frame over interrupt occurs\n");
PPE_ClearINTPendingBit(PPE_FR_OVER_INT);
DCache_Invalidate((u32) PIC_OUTPUT_LAYER, sizeof(PIC_OUTPUT_LAYER));
for (int i = 0; i < MEM_SIZE; i++) {
if (PIC_OUTPUT_LAYER[i] != PIC_OUTPUT_LAYER_SW[i]) {
printf("[error] has occured! %x, %x\r\n", PIC_OUTPUT_LAYER[i], PIC_OUTPUT_LAYER_SW[i]);
RTK_LOGS(NOTAG, RTK_LOG_ERROR, "[error] has occured! %x, %x\r\n", PIC_OUTPUT_LAYER[i], PIC_OUTPUT_LAYER_SW[i]);
}
}
printf("3 layer alpha blending over\n");
RTK_LOGS(NOTAG, RTK_LOG_INFO, "3 layer alpha blending over\n");
} else {
printf("wrong interrupt status: %x\n", status);
RTK_LOGS(NOTAG, RTK_LOG_ERROR, "wrong interrupt status: %x\n", status);
}

return 0;
Expand Down Expand Up @@ -208,10 +208,10 @@ static void ppe_3_layer_alpha_blend(void *para)
DCache_Invalidate((u32)PIC_OUTPUT_LAYER, sizeof(PIC_OUTPUT_LAYER));
for (int i = 0; i < MEM_SIZE; i++) {
if (PIC_OUTPUT_LAYER[i] != PIC_OUTPUT_LAYER_SW[i]) {
printf("[error] has occured! %x, %x\r\n", PIC_OUTPUT_LAYER[i], PIC_OUTPUT_LAYER_SW[i]);
RTK_LOGS(NOTAG, RTK_LOG_ERROR, "[error] has occured! %x, %x\r\n", PIC_OUTPUT_LAYER[i], PIC_OUTPUT_LAYER_SW[i]);
}
}
printf("3 layer blending over\n");
RTK_LOGS(NOTAG, RTK_LOG_INFO, "3 layer blending over\n");
break;
}
}
Expand All @@ -220,12 +220,12 @@ static void ppe_3_layer_alpha_blend(void *para)
while (1);
}

int main(void)
int example_raw_ppe_3_layer_alpha_blend(void)
{
if (rtos_task_create(NULL, "ppe_3_layer_alpha_blend", (rtos_task_t)ppe_3_layer_alpha_blend, NULL, (2048), (1)) != SUCCESS) {
printf("Cannot create ppe_3_layer_alpha_blend demo task\n\r");
RTK_LOGS(NOTAG, RTK_LOG_ERROR, "Cannot create ppe_3_layer_alpha_blend demo task\n\r");
}

rtos_sched_start();
return 0;
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ameba_internal_library(example_raw_spi_dma_multi_block_rx_slave)

target_sources(
${CURRENT_LIB_NAME} PRIVATE
example_raw_ppe_as_dma.c
app_example.c
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

extern int example_raw_ppe_as_dma(void);

void app_example(void)
{
example_raw_ppe_as_dma();
}
Loading
Loading