easylinux/OpenTXW81X
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
NonPIayerCharacter
2025-08-28 15:56:14 +03:00
parent dff89205ca
commit e024c63f62
8 changed files with 65 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -1
View File
@@ -6,4 +6,4 @@ fpv_app_umac*
cdkws.mk
project.map
*.o
*.d
*.d
project/main.c
+5 -5
View File
@@ -932,7 +932,7 @@ __init static void app_network_init()
if (sys_cfgs.wifi_mode == WIFI_MODE_AP) { //AP
sys_dhcpd_start();
}
ota_Tcp_Server();
//ota_Tcp_Server();
#if NET_TO_QC == 1
if (sys_cfgs.wifi_mode == WIFI_MODE_STA){
sta_send_udp_msg_init();
@@ -1377,10 +1377,10 @@ int main()
mcu_watchdog_timeout(5);
OS_WORK_INIT(&main_wk, main_loop2, 0);
os_run_work_delay(&main_wk, 1000);
speedTest_tcp_server(20202);
speedTest_tcp_rx_server(20203);
Udp_rx_server(20204,1000);
Udp_to_ip("192.168.1.100",20202,0);
//speedTest_tcp_server(20202);
//speedTest_tcp_rx_server(20203);
//Udp_rx_server(20204,1000);
//Udp_to_ip("192.168.1.100",20202,0);
return 0;
}
#endif
project/project_config.h
+45 -25
View File
@@ -3,7 +3,7 @@
#define CUSTOMER_ID 1
#define CUSTOMER_ID 5
/**
* CUSTOMER_ID :
* 1 TXW818_WAV_EVB
@@ -781,9 +781,9 @@
#elif (CUSTOMER_ID == 5)
//是否使能需要psram的空间
#define PSRAM_HEAP
#define CUSTOM_PSRAM_SIZE (2000*1024)
#define CUSTOM_SIZE (50*1024)
//#define PSRAM_HEAP
//#define CUSTOM_PSRAM_SIZE (2000*1024)
#define CUSTOM_SIZE (60*1024)
#define DEFAULT_SYS_CLK (240*1000000)
@@ -799,8 +799,8 @@
/**********************************sd卡配置*********************************************************** */
#define SDH_EN 1
#define FS_EN 1
#define SDH_EN 0
#define FS_EN 0
/*************************************************************************************************** */
/***************************视频相关宏要打开********************************************************** */
@@ -812,8 +812,8 @@
/*************************************************************************************************** */
/**********************************************音频相关********************************************* */
#define AUDIO_EN 1
#define AUDIO_DAC_EN 1
#define AUDIO_EN 0
#define AUDIO_DAC_EN 0
/************************************************************************************************** */
@@ -869,11 +869,11 @@
#define WIFI_PREVENT_PS_MODE_EN 1 //是否尽可能的阻止sta进入休眠
//设置AP的ip地址以及ip池
#define IP_ADDR_DEFAULT 0x0101A8C0 //192.168.1.1
#define IP_ADDR_DEFAULT 0x0104A8C0 //192.168.4.1
#define NET_MASK_DEFAULT 0x00FFFFFF //255.255.255.0
#define GW_IP_DEFAULT 0x0101A8C0 //192.168.1.1
#define DHCP_START_IP_DEFAULT 0x6401A8C0 //192.168.1.100
#define DHCP_END_IP_DEFAULT 0xFE01A8C0 //192.168.1.254
#define GW_IP_DEFAULT 0x0104A8C0 //192.168.4.1
#define DHCP_START_IP_DEFAULT 0x6404A8C0 //192.168.4.100
#define DHCP_END_IP_DEFAULT 0xFE04A8C0 //192.168.4.254
/************************************************************************************************************************************ */
@@ -883,8 +883,8 @@
/***********************************************IO配置,需要用到的IO配置需要在这里配置 **************************************/
//串口配置
#define PIN_UART0_TX PA_12
#define PIN_UART0_RX PA_13
#define PIN_UART0_TX PC_7
#define PIN_UART0_RX PC_6
//AT命令使用哪个串口
#define ATCMD_UARTDEV HG_UART0_DEVID
@@ -954,17 +954,37 @@
/**************************************DVP摄像头型号配置***************************************************************** */
//如果sdk没有对应型号,需要自己去添加
#define CMOS_AUTO_LOAD 1
#define DEV_SENSOR_GC0308 1
#define DEV_SENSOR_OV2640 1
#define CMOS_AUTO_LOAD 1
#define DEV_SENSOR_GC0308 1
#define DEV_SENSOR_GC0309 1
#define DEV_SENSOR_GC0311 1
#define DEV_SENSOR_OV2640 1
#define DEV_SENSOR_GC0328 1
#define DEV_SENSOR_GC0329 1
#define DEV_SENSOR_SP0A19 1
#define DEV_SENSOR_SP0718 1
#define DEV_SENSOR_BF3A03 1
#define DEV_SENSOR_BF30A2 1
#define DEV_SENSOR_BF2013 1
#define DEV_SENSOR_BF3703 1
#define DEV_SENSOR_BF3720 1
#define DEV_SENSOR_GC0312 1
#define DEV_SENSOR_OV7660 1
#define DEV_SENSOR_OV7670 1
#define DEV_SENSOR_OV7725 1
#define DEV_SENSOR_XC7011_GC1054 1
#define DEV_SENSOR_XC7011_H63 1
#define DEV_SENSOR_XC7016_H63 1
#define DEV_SENSOR_XCG532 1
/*********************************************************************************************************************** */
/**********************************************MCU屏驱动配置************************************************************* */
#define LCD_EN 1
#define LVGL_STREAM_ENABLE 1
#define LCD_ST7789V_MCU565_EN 1
#define LCD_EN 0
#define LVGL_STREAM_ENABLE 0
#define LCD_ST7789V_MCU565_EN 0
/************************************************************************************************************************* */
@@ -977,8 +997,8 @@
//jpg0
#define JPG0_HEAD_RESERVER 0 //每段JPEG BUF前面预留用于填充其他数据的数据量，无需预留填0
#define JPG0_BUF_LEN 4096 //8192//1308//2880//4096+24 // 1*1024// 1*1024// JPG buf长度+reserver长度 1308
#define JPG0_NODE 80 //20//18//30*2
#define JPG0_BUF_LEN 1308 //8192//1308//2880//4096+24 // 1*1024// 1*1024// JPG buf长度+reserver长度 1308
#define JPG0_NODE 40 //20//18//30*2
#define JPG0_TAIL_RESERVER 0
@@ -1030,9 +1050,9 @@
#define NET_PAIR 1
#define PRINTER_EN 0
#define AUDIO_EN 1
#define AUDIO_DAC_EN 1
#define RTP_SOUND (1&&AUDIO_EN)
#define AUDIO_EN 0
#define AUDIO_DAC_EN 0
#define RTP_SOUND (0&&AUDIO_EN)
#define MJPEG_VIDEO (1 &&OPENDML_EN&&FS_EN&&SDH_EN&&JPG_EN) //基于框架的mjpeg录像
#define UVC_VIDEO (1 &&OPENDML_EN&&FS_EN&&SDH_EN&&USB_EN) //基于框架的uvc录像
project/txw81x_fpv_v2.5.3.7-36533_2025.8.27_MINI_DV.bin
BIN
View File
Binary file not shown.
project/txw81x_fpv_v2.5.3.7-36533_2025.8.27_MINI_DV_allcams.bin
BIN
View File
Binary file not shown.
sdk/app/spook/spook_config.h
+7 -7
View File
@@ -7,7 +7,7 @@
#define SPOOK_MAX_FRAME_SIZE 0/*352*288*3*/
#define SPOOK_PORT 7070
//#define JPEG_ENCODER_NAME "jpeg_dvp"
#define JPEG_ENCODER_NAME "jpeg_dvp"
//#define JPEG_ENCODER2_NAME "jpeg_usb"
#define FILE_JPEG_ENCODER_NAME "jpeg_file"
@@ -20,18 +20,18 @@
#define EXCHANGER_SLOT_SIZE 16
//#define RTSP_LIVE_PATH "/webcam" /* /webcam */
#define RTSP_LIVE_PATH "/webcam" /* /webcam */
//#define RTSP_LIVE_USB_PATH "/webcam2" /* /webcam */
#define RTSP_WEB_PATH "/file" /* /webcam */
//#define RTSP_WEB_PATH "/file" /* /webcam */
//#define RTSP_LIVE_TRACK "jpeg_dvp"
#define RTSP_LIVE_TRACK "jpeg_dvp"
//#define RTSP_LIVE2_TRACK "jpeg_usb"
#define RTSP_WEBFILE_TRACK "jpeg_file"
//#define RTSP_WEBFILE_TRACK "jpeg_file"
#define RTSP_LIVE_AUDIO_TRACK "audio"
#define RTSP_WEBFILE_AUDIO_TRACK "audio_file"
//#define RTSP_LIVE_AUDIO_TRACK "audio"
//#define RTSP_WEBFILE_AUDIO_TRACK "audio_file"
sdk/app/spook/tcp.c
+1 -1
View File
@@ -361,7 +361,7 @@ static int unbase64( unsigned char *d, int len, int *remain )
}
#if 0
static unsigned char s_ptemp[300] = {"TEARDOWN rtsp://192.168.1.1:7070/webcam/ RTSP/1.0\r\nCSeq: 6\r\nUser-Agent: Lavf56.40.101\r\nSession: 9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9\r\n\r\n4A5A6A7A8A9\r\n\r\n"};
static unsigned char s_ptemp[300] = {"TEARDOWN rtsp://192.168.4.1:7070/webcam/ RTSP/1.0\r\nCSeq: 6\r\nUser-Agent: Lavf56.40.101\r\nSession: 9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9\r\n\r\n4A5A6A7A8A9\r\n\r\n"};
#endif
sdk/include/lib/net/lwip/lwipopts.h
+6 -6
View File
@@ -160,31 +160,31 @@ extern void hw_memcpy(void *dest, const void *src, unsigned int size);
#if IP_NAT
#define PBUF_POOL_SIZE 32//pbuf pool size,PBUF_POOL
#else
#define PBUF_POOL_SIZE 6//pbuf pool size,PBUF_POOL
#define PBUF_POOL_SIZE 16//pbuf pool size,PBUF_POOL
#endif
#endif//PBUF_POOL_SIZE
// One tcp_pcb_listen is needed for each TCPServer.
// Each requires 72 bytes of RAM.
#ifndef MEMP_NUM_TCP_PCB_LISTEN
#define MEMP_NUM_TCP_PCB_LISTEN 2
#define MEMP_NUM_TCP_PCB_LISTEN 4
#endif
// One is tcp_pcb needed for each TCPSocket.
// Each requires 196 bytes of RAM.
#ifndef MEMP_NUM_TCP_PCB
#define MEMP_NUM_TCP_PCB 4
#define MEMP_NUM_TCP_PCB 12
#endif
// One udp_pcb is needed for each UDPSocket.
// Each requires 84 bytes of RAM (total rounded to multiple of 512).
#ifndef MEMP_NUM_UDP_PCB
#define MEMP_NUM_UDP_PCB 4
#define MEMP_NUM_UDP_PCB 8
#endif
// Number of non-pool pbufs.
// Each requires 92 bytes of RAM.
#ifndef MEMP_NUM_PBUF
#define MEMP_NUM_PBUF 10 //PBUF_REF/ROM
#define MEMP_NUM_PBUF 32 //PBUF_REF/ROM
#endif
// Each netbuf requires 64 bytes of RAM.
@@ -296,7 +296,7 @@ extern void hw_memcpy(void *dest, const void *src, unsigned int size);
// One netconn is needed for each UDPSocket, TCPSocket or TCPServer.
// Each requires 236 bytes of RAM (total rounded to multiple of 512).
#ifndef MEMP_NUM_NETCONN
#define MEMP_NUM_NETCONN 6
#define MEMP_NUM_NETCONN 12
#endif
/**