test

.gitignore

@@ -1,19 +1,9 @@
-CMakeLists.txt.user
+.cache/
-CMakeCache.txt
+.cdk/
-CMakeFiles
+*.cdkws
-CMakeScripts
+project/obj/
-Testing
+fpv_app_umac*
-Makefile
+cdkws.mk
-cmake_install.cmake
+project.map
-install_manifest.txt
+*.o
-compile_commands.json
+*.d
-CTestTestfile.cmake
-_deps
-CMakeUserPresets.json
-
-# CLion
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#cmake-build-*

README.md

@@ -2,7 +2,7 @@
 
 Taixin TXW81x IPC/DV
 
-https://www.elektroda.com/rtvforum/topic4033757.html
+https://www.elektroda.com/rtvforum/topic4033757.html<br>
-https://www.elektroda.com/rtvforum/topic4129331.html
+https://www.elektroda.com/rtvforum/topic4129331.html<br>
-https://www.elektroda.com/rtvforum/topic4123724.html
+https://www.elektroda.com/rtvforum/topic4123724.html<br>
-https://www.elektroda.com/rtvforum/topic4120455.html
+https://www.elektroda.com/rtvforum/topic4120455.html<br>

project/.gitignore

@@ -0,0 +1,4 @@
+*.bin
+*.hex
+*.elf
+*.bin.xz

project/BuildBIN.sh

@@ -27,8 +27,8 @@ fi
 
 cp parameter.bincfg parameter.cfg
 
-BinScript.exe BinScript.BinScript
+./BinScript.exe BinScript.BinScript
-makecode.exe
+./makecode.exe
 
 #crc.exe crc.ini
 #BinScript.exe BinScript_Bin2Hex.BinScript

project/main.c

@@ -55,7 +55,7 @@
 #include "audio_app/audio_dac.h"
 #include "stream_frame.h"
 #include "test_demo/test_demo.h"
-#include "atcmd.c"
+//#include "atcmd.c"
 #include "keyWork.h"
 #include "flashdisk/flashdisk.h"
 #include "osal_file.h"
@@ -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();
@@ -944,11 +944,11 @@ __init static void app_network_init()
 #endif
 
 
-#if SDH_EN && FS_EN   && OPENDML_EN
+//#if SDH_EN && FS_EN   && OPENDML_EN
-    extern void recv_record_Server(int port);
+//    extern void recv_record_Server(int port);
-    recv_record_Server(43210);
+//    recv_record_Server(43210);
-
+//
-#endif
+//#endif
 
 
 #ifdef CONFIG_UMAC4
@@ -1071,27 +1071,27 @@ void hardware_init(uint8 vcam)
 
 
 
-#if LCD_EN
+//#if LCD_EN
-
+//
-
+//
-    #if LVGL_STREAM_ENABLE == 1
+//    #if LVGL_STREAM_ENABLE == 1
-	uint16_t w,h;
+//	uint16_t w,h;
-    uint16_t screen_w,screen_h;
+//    uint16_t screen_w,screen_h;
-    uint8_t rotate,video_rotate;
+//    uint8_t rotate,video_rotate;
-    extern stream *lvgl_R_osd_stream(const char *name);
+//    extern stream *lvgl_R_osd_stream(const char *name);
-    extern stream *osd_show_stream(const char *name);
+//    extern stream *osd_show_stream(const char *name);
-    extern stream *yuv_recv_stream(const char *name);
+//    extern stream *yuv_recv_stream(const char *name);
-    lcd_hardware_init(&w,&h,&rotate,&screen_w,&screen_h,&video_rotate);
+//    lcd_hardware_init(&w,&h,&rotate,&screen_w,&screen_h,&video_rotate);
-    lcd_arg_setting(w,h,rotate,screen_w,screen_h,video_rotate);
+//    lcd_arg_setting(w,h,rotate,screen_w,screen_h,video_rotate);
-    lcd_driver_init((void*)lvgl_R_osd_stream(R_OSD_ENCODE),(void*)osd_show_stream(R_OSD_SHOW),(void*)yuv_recv_stream(R_VIDEO_P1),(void*)yuv_stream(R_VIDEO_P0));
+//    lcd_driver_init((void*)lvgl_R_osd_stream(R_OSD_ENCODE),(void*)osd_show_stream(R_OSD_SHOW),(void*)yuv_recv_stream(R_VIDEO_P1),(void*)yuv_stream(R_VIDEO_P0));
-
+//
-    #else
+//    #else
-		uint16_t w,h;
+//		uint16_t w,h;
-		uint8_t rotate;
+//		uint8_t rotate;
-	    void lcd_module_run(uint16_t *w,uint16_t *h,uint8_t *rotate);	
+//	    void lcd_module_run(uint16_t *w,uint16_t *h,uint8_t *rotate);	
-        lcd_module_run(&w,&h,&rotate);
+//        lcd_module_run(&w,&h,&rotate);
-    #endif
+//    #endif
-#endif
+//#endif
 
 #if DVP_EN
     bool csi_open();
@@ -1121,34 +1121,34 @@ void hardware_init(uint8 vcam)
 #endif
     
 
-#if (USB_EN && RTT_USB_EN)
+//#if (USB_EN && RTT_USB_EN)
-	#if (USB_DETECT_EN && !USB_HOST_EN)
+//	#if (USB_DETECT_EN && !USB_HOST_EN)
-        extern void hg_usb_connect_detect_init(void);
+//        extern void hg_usb_connect_detect_init(void);
-		hg_usb_connect_detect_init();
+//		hg_usb_connect_detect_init();
-	#else
+//	#else
-		#if USB_HOST_EN
+//		#if USB_HOST_EN
-            extern rt_err_t hg_usbh_register(rt_uint32_t devid);
+//            extern rt_err_t hg_usbh_register(rt_uint32_t devid);
-			hg_usbh_register(HG_USB_HOST_CONTROLLER_DEVID);
+//			hg_usbh_register(HG_USB_HOST_CONTROLLER_DEVID);
-		#else 
+//		#else 
-            extern void hg_usbd_class_driver_register();
+//            extern void hg_usbd_class_driver_register();
-            extern int hg_usbd_register(rt_uint32_t devid);
+//            extern int hg_usbd_register(rt_uint32_t devid);
-			hg_usbd_class_driver_register();
+//			hg_usbd_class_driver_register();
-			hg_usbd_register(HG_USB_DEV_CONTROLLER_DEVID);
+//			hg_usbd_register(HG_USB_DEV_CONTROLLER_DEVID);
-		#endif
+//		#endif
-	#endif
+//	#endif
+//
+//
+//#endif
+//
+//#if (USB_EN && !RTT_USB_EN)
+//    void hg_usb_test(void);
+//    hg_usb_test();
+//#endif
 
-
+//#if LCD_EN
-#endif
+//	void lvgl_init(uint16_t w,uint16_t h,uint8_t rotate);
-
+//	lvgl_init(w,h,rotate);
-#if (USB_EN && !RTT_USB_EN)
+//#endif
-    void hg_usb_test(void);
-    hg_usb_test();
-#endif
-
-#if LCD_EN
-	void lvgl_init(uint16_t w,uint16_t h,uint8_t rotate);
-	lvgl_init(w,h,rotate);
-#endif
 
 
 
@@ -1273,7 +1273,7 @@ int main(void)
     sys_event_take(SYS_EVENT(SYS_EVENT_NETWORK, 0), sysevt_network_event, 0);
     sys_event_take(SYS_EVENT(SYS_EVENT_LTE, 0), sysevt_lte_event, 0);
     sys_event_take(SYS_EVENT(SYS_EVENT_BLE, 0), sysevt_ble_event, 0);
-    sys_atcmd_init();
+    //sys_atcmd_init();
     sys_wifi_init();
     // enter wifi test mode
     if(system_is_wifi_test_mode()) {
@@ -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_server(20202);
-	speedTest_tcp_rx_server(20203);
+	//speedTest_tcp_rx_server(20203);
-	Udp_rx_server(20204,1000);
+	//Udp_rx_server(20204,1000);
-	Udp_to_ip("192.168.1.100",20202,0);
+	//Udp_to_ip("192.168.1.100",20202,0);
     return 0;
 }
 #endif

project/makecode_post.bat

@@ -1,15 +1,3 @@
-cd /d %~dp0
-
-set dirname=%1
-set dirname=%dirname:~0,-4%
-
-if not exist bakup md bakup
-if not exist bakup\%dirname% md bakup\%dirname%
-
-copy .\Obj\*.elf bakup\%dirname%\
-copy .\Lst\*.map bakup\%dirname%\
-copy makedis.bat bakup\%dirname%\
-
 del /q/f loader.bin	
 del /q/f code512.bin
 del /q/f param.bin

project/prebuild.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 rm -f Obj/common_common.o
-psramCFG/lua.exe psramCFG/gen_psram_cfg.lua psramCFG/
+./psramCFG/lua.exe psramCFG/gen_psram_cfg.lua psramCFG/

project/precompile.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 [ ! -f precompile.exe ] && cp -v ../../../../tools/precompile/Debug/precompile.exe precompile.exe
 mkdir -p tmp
-precompile.exe ${ProjectPath} $1
+./precompile.exe ${ProjectPath} $1
 exit 0

project/project_config.h

@@ -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 PSRAM_HEAP
-#define CUSTOM_PSRAM_SIZE               (2000*1024)
+//#define CUSTOM_PSRAM_SIZE               (2000*1024)
-#define CUSTOM_SIZE                     (50*1024) 
+#define CUSTOM_SIZE                     (60*1024) 
 #define DEFAULT_SYS_CLK   				(240*1000000) 
 
 
@@ -794,13 +794,13 @@
 
 
 /**************************************按键配置******************************************************** */
-#define KEY_MODULE_EN					1
+#define KEY_MODULE_EN					0
 /*************************************************************************************************** */
 
 
 /**********************************sd卡配置*********************************************************** */
-#define SDH_EN                          1
+#define SDH_EN                          0
-#define FS_EN                           1
+#define FS_EN                           0
 /*************************************************************************************************** */
 
 /***************************视频相关宏要打开********************************************************** */
@@ -813,7 +813,7 @@
 
 /**********************************************音频相关********************************************* */
 #define AUDIO_EN                        1
-#define AUDIO_DAC_EN                    1
+#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 GW_IP_DEFAULT                   0x0104A8C0  //192.168.4.1
-#define DHCP_START_IP_DEFAULT           0x6401A8C0  //192.168.1.100
+#define DHCP_START_IP_DEFAULT           0x6404A8C0  //192.168.4.100
-#define DHCP_END_IP_DEFAULT             0xFE01A8C0  //192.168.1.254
+#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_TX PC_7
-#define PIN_UART0_RX PA_13
+#define PIN_UART0_RX PC_6
 
 //AT命令使用哪个串口
 #define ATCMD_UARTDEV       HG_UART0_DEVID
@@ -956,15 +956,35 @@
 //如果sdk没有对应型号,需要自己去添加
 #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 LCD_EN			 				0
-#define LVGL_STREAM_ENABLE              1
+#define LVGL_STREAM_ENABLE              0
-#define LCD_ST7789V_MCU565_EN           1
+#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_BUF_LEN        1308                //8192//1308//2880//4096+24   // 1*1024// 1*1024//       JPG buf长度+reserver长度          1308
-#define JPG0_NODE           80                  //20//18//30*2
+#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_EN                        0
-#define AUDIO_DAC_EN                    1
+#define AUDIO_DAC_EN                    0
-#define RTP_SOUND                       (1&&AUDIO_EN)
+#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/real_code.BinScript

@@ -0,0 +1,9 @@
+memset(ibuf, ff);
+read(bin, APP.bin);
+def(LEN, v_lx);
+remap(c00, 0, LEN);
+write(bin, realcode.bin);
+
+
+
+

project/utilities/gcc_csky.ld

@@ -22,8 +22,8 @@
  ******************************************************************************/
 MEMORY
 {
-		SRAM0   : ORIGIN = 0x20041000 , LENGTH = 0x2c00   /*SRAM0 16 - 4KB - 1k*/
+/*		SRAM0   : ORIGIN = 0x20041000 , LENGTH = 0x2c00 */  /*SRAM0 16 - 4KB - 1k*/
-    SRAM   : ORIGIN = 0x20000004 , LENGTH = 0x3fffc    /* on-chip SRAM 288KB */
+    SRAM   : ORIGIN = 0x20000004 , LENGTH = 0x431fc    /* on-chip SRAM 288KB */
    /* SRAM   : ORIGIN = 0x38000000 , LENGTH = 0x400000 */
     FLASH  : ORIGIN = 0x18000000 , LENGTH = 0x200000 
     PSRAM  : ORIGIN = 0x38000000 , LENGTH = 0x400000 
@@ -31,10 +31,10 @@ MEMORY
 
 __heap_size = 0x11000;
 
-PROVIDE (__ram_end  = 0x20040000);
+PROVIDE (__ram_end  = 0x20043200);
-PROVIDE (__heap_end = 0x20040000);
+PROVIDE (__heap_end = 0x20043200);
-PROVIDE (__sleep_data_start = 0x20040004);
+PROVIDE (__sleep_data_start = 0x20043200);
-PROVIDE (__sleep_data_stop  = 0x20040a00);
+PROVIDE (__sleep_data_stop  = 0x20043bfc);
 PROVIDE (__psram_heap_end = 0x38400000);
 
 REGION_ALIAS("REGION_TEXT",    FLASH);
@@ -47,7 +47,7 @@ REGION_ALIAS("REGION_NOLOAD_PSRAM",    PSRAM);
 REGION_ALIAS("REGION_DATA2",    SRAM);
 REGION_ALIAS("REGION_OTA_VMA",    SRAM);
 REGION_ALIAS("REGION_TEXT2",    SRAM);
-REGION_ALIAS("REGION_DSLEEP",    SRAM0);
+REGION_ALIAS("REGION_DSLEEP",    SRAM);
 
 ENTRY(Reset_Handler)
 SECTIONS
@@ -293,5 +293,4 @@ SECTIONS
 /* ASSERT(DEFINED(ROM_FUNC_ENABLE), "please disable ROM Functions in ld file") */
 /* ASSERT(ADDR(.text) < 0x20000068, "ROM Functions data area conflict!!!")*/
 
- INPUT(romcode.ld) 
+INPUT(utilities/romcode.ld)
-

sdk/app/prc_stream/prc_stream.c

@@ -85,7 +85,7 @@ void prc_finish(void *d)
 {
 	struct prc_pixel *pixel_prc = (struct prc_pixel*)d;
 	pixel_prc->hardward_ready = 1;
-	_os_printf("$");
+	//_os_printf("$");
 }
 
 

sdk/app/spook/event.h

@@ -16,7 +16,7 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "lwip\sockets.h"
+#include "lwip/sockets.h"
 #include "list.h"
 #include "lib/net/eloop/eloop.h"
 

sdk/app/spook/frame.c

@@ -263,7 +263,7 @@ void spook_send_thread_stream(struct rtsp_priv *r)
 			audio_f = 	GET_FRAME(audio_s);
 			if(audio_f)
 			{
-				_os_printf("A");
+				//_os_printf("A");
 				audio = audio_ex->jf;//ex->slave_cur->f;
 				audio->get_f = audio_f;
 				audio->length = GET_DATA_LEN(audio_f);
@@ -299,7 +299,7 @@ void spook_send_thread_stream(struct rtsp_priv *r)
 
 				if((os_jiffies() - time_for_count) > 1000){
 						time_for_count = os_jiffies();
-						_os_printf("cnt_num:%d\r\n",cnt_num);
+						//_os_printf("cnt_num:%d\r\n",cnt_num);
 						cnt_num = 0;
 				}
 				jpeg->length = GET_DATA_LEN(get_f);;
@@ -314,7 +314,7 @@ void spook_send_thread_stream(struct rtsp_priv *r)
 				* callback: get_back_frame( struct frame *f, void *d )
 				* d: (jpeg_encoder *)en
 				*/
-				_os_printf("#");
+				//_os_printf("#");
 				//_os_printf("ex:%X\tf:%X\n",ex,ex->f);
 				ex->f( jpeg, ex->d );
 		}
@@ -325,7 +325,7 @@ void spook_send_thread_stream(struct rtsp_priv *r)
 			count_times++;
 			if(count_times>25)
 			{
-				_os_printf("time:%lld\n",csi_kernel_get_ticks()-time);
+				//_os_printf("time:%lld\n",csi_kernel_get_ticks()-time);
 				count_times = 0;
 				time = csi_kernel_get_ticks();
 			}

sdk/app/spook/live.c

@@ -1,8 +1,8 @@
-#include "lwip\sockets.h"
+#include "lwip/sockets.h"
-#include "lwip\netif.h"
+#include "lwip/netif.h"
-#include "lwip\dns.h"
+#include "lwip/dns.h"
-#include "lwip\api.h"
+#include "lwip/api.h"
-#include "lwip\tcp.h"
+#include "lwip/tcp.h"
 
 #include "rtsp_common.h"
 #include "osal/string.h"

sdk/app/spook/rtp-audio.c

@@ -18,12 +18,12 @@
 
 
 #include <stdio.h>
-#include "lwip\sockets.h"
+#include "lwip/sockets.h"
-#include "lwip\netif.h"
+#include "lwip/netif.h"
-#include "lwip\dns.h"
+#include "lwip/dns.h"
 
-#include "lwip\api.h"
+#include "lwip/api.h"
-#include "lwip\tcp.h"
+#include "lwip/tcp.h"
 
 #include <event.h>
 #include <log.h>

sdk/app/spook/rtp-jpeg.c

@@ -18,12 +18,12 @@
 
 
 #include <stdio.h>
-#include "lwip\sockets.h"
+#include "lwip/sockets.h"
-#include "lwip\netif.h"
+#include "lwip/netif.h"
-#include "lwip\dns.h"
+#include "lwip/dns.h"
 
-#include "lwip\api.h"
+#include "lwip/api.h"
-#include "lwip\tcp.h"
+#include "lwip/tcp.h"
 
 #include <event.h>
 #include <log.h>
@@ -857,7 +857,7 @@ int fd_send_data(int fd,unsigned char *sendbuf,int sendLen,int times)
 	}
 	if(size<0)
 	{
-		_os_printf("%s err size:%d\n",__FUNCTION__,size);
+		//_os_printf("%s err size:%d\n",__FUNCTION__,size);
 		return -1;
 
 	}

sdk/app/spook/rtp.c

@@ -16,12 +16,12 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #include <stdio.h>
-#include "lwip\sockets.h"
+#include "lwip/sockets.h"
-#include "lwip\netif.h"
+#include "lwip/netif.h"
-#include "lwip\dns.h"
+#include "lwip/dns.h"
-//#include "lwip\fcntl.h"
+//#include "lwip/fcntl.h"
-#include "lwip\api.h"
+#include "lwip/api.h"
-#include "lwip\tcp.h"
+#include "lwip/tcp.h"
 
 #include <event.h>
 #include <log.h>

sdk/app/spook/rtsp.c

@@ -19,13 +19,13 @@
 
 #include <stdio.h>
 
-#include "lwip\sockets.h"
+#include "lwip/sockets.h"
-#include "lwip\netif.h"
+#include "lwip/netif.h"
-#include "lwip\dns.h"
+#include "lwip/dns.h"
 
-#include "lwip\api.h"
+#include "lwip/api.h"
 
-#include "lwip\tcp.h"
+#include "lwip/tcp.h"
 
 #include <event.h>
 #include <log.h>

sdk/app/spook/rtsp_common.c

@@ -1,9 +1,9 @@
 #include <stdio.h>
-#include "lwip\sockets.h"
+#include "lwip/sockets.h"
-#include "lwip\netif.h"
+#include "lwip/netif.h"
-#include "lwip\dns.h"
+#include "lwip/dns.h"
-#include "lwip\api.h"
+#include "lwip/api.h"
-#include "lwip\tcp.h"
+#include "lwip/tcp.h"
 #include "log.h"
 #include "sys_config.h"
 #include "osal/string.h"

sdk/app/spook/session.c

@@ -19,12 +19,12 @@
 
 #include <stdio.h>
 //#include "sys_config.h"
-#include "lwip\sockets.h"
+#include "lwip/sockets.h"
-#include "lwip\netif.h"
+#include "lwip/netif.h"
-#include "lwip\dns.h"
+#include "lwip/dns.h"
-#include "lwip\api.h"
+#include "lwip/api.h"
 
-#include "lwip\tcp.h"
+#include "lwip/tcp.h"
 
 #include <event.h>
 #include <log.h>

sdk/app/spook/spook.c

@@ -17,13 +17,13 @@
  */
 
 #include <stdio.h>
-#include "lwip\sockets.h"
+#include "lwip/sockets.h"
-#include "lwip\netif.h"
+#include "lwip/netif.h"
-#include "lwip\dns.h"
+#include "lwip/dns.h"
 
-#include "lwip\api.h"
+#include "lwip/api.h"
 
-#include "lwip\tcp.h"
+#include "lwip/tcp.h"
 
 #include <event.h>
 #include <log.h>

sdk/app/spook/spook_config.h

@@ -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_LIVE_AUDIO_TRACK	  "audio"
-#define RTSP_WEBFILE_AUDIO_TRACK  "audio_file"
+//#define RTSP_WEBFILE_AUDIO_TRACK  "audio_file"
 
 
 

sdk/app/spook/tcp.c

@@ -18,11 +18,11 @@
 
 #include <stdio.h>
 
-#include "lwip\sockets.h"
+#include "lwip/sockets.h"
-#include "lwip\netif.h"
+#include "lwip/netif.h"
-#include "lwip\dns.h"
+#include "lwip/dns.h"
-//#include "lwip\fcntl.h"
+//#include "lwip/fcntl.h"
-#include "lwip\api.h"
+#include "lwip/api.h"
 
 #include "typesdef.h"
 //#include <linux/linux_mutex.h>
@@ -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/app/spook/webfile.c

@@ -1,8 +1,8 @@
-#include "lwip\sockets.h"
+#include "lwip/sockets.h"
-#include "lwip\netif.h"
+#include "lwip/netif.h"
-#include "lwip\dns.h"
+#include "lwip/dns.h"
-#include "lwip\api.h"
+#include "lwip/api.h"
-#include "lwip\tcp.h"
+#include "lwip/tcp.h"
 
 #include "rtsp_common.h"
 #include "osal/string.h"

sdk/app/ui/player2_ui.c

@@ -522,7 +522,7 @@ static int opcode_func(stream *s,void *priv,int opcode)
             if(data->data)
             {
                 //因为是转发,所以这里移除的话是交给原来的方法移除
-                _os_printf("$");
+                //_os_printf("$");
                 free_data(data->data);
                 data->data = NULL;
             }

sdk/app/ui/player_ui.c

@@ -499,7 +499,7 @@ static int opcode_func(stream *s,void *priv,int opcode)
             if(data->data)
             {
                 //因为是转发,所以这里移除的话是交给原来的方法移除
-                _os_printf("$");
+                //_os_printf("$");
                 free_data(data->data);
                 data->data = NULL;
             }

sdk/app/update/ota.c

@@ -1,11 +1,11 @@
 #include <stdio.h>
 #include "tx_platform.h"
-#include "lwip\sockets.h"
+#include "lwip/sockets.h"
-#include "lwip\netif.h"
+#include "lwip/netif.h"
-#include "lwip\dns.h"
+#include "lwip/dns.h"
-//#include "lwip\fcntl.h"
+//#include "lwip/fcntl.h"
-#include "lwip\api.h"
+#include "lwip/api.h"
-#include "lwip\tcp.h"
+#include "lwip/tcp.h"
 
 #include <event.h>
 #include <log.h>

sdk/app/video_app/new_video_app.c

@@ -655,7 +655,7 @@ static void jpeg_in_sram(struct os_work *work,struct list_head  *get_f)
 			j->malloc_mem = dest_list;
 			del_jpeg_frame(get_f);
 			//统一发送数据,这个时候,其他流才有可能获取到数据
-            _os_printf("$");
+            //_os_printf("$");
 			send_data_to_stream(data_s);
 		}
 	}

sdk/app/video_app/video_app.c

@@ -675,7 +675,7 @@ void jpeg_in_sram(struct list_head  *get_f)
 			j->malloc_mem = dest_list;
 			del_jpeg_frame(get_f);
 			//统一发送数据,这个时候,其他流才有可能获取到数据
-            _os_printf("$");
+            //_os_printf("$");
 			send_data_to_stream(data_s);
 		}
 	}

sdk/include/lib/net/lwip/lwipopts.h

@@ -160,20 +160,20 @@ 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     6
 #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            20
 #endif
 // One udp_pcb is needed for each UDPSocket.
 // Each requires 84 bytes of RAM (total rounded to multiple of 512).
@@ -184,7 +184,7 @@ extern void hw_memcpy(void *dest, const void *src, unsigned int size);
 // 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            20
 #endif
 
 /**

sdk/include/osal/csky/string.h

@@ -89,7 +89,10 @@ extern "C" {
 #define os_strcpy(d,s)     strcpy((char *)(d), (const char *)(s))
 #define os_strncpy(d,s,n)  strncpy((char *)(d), (const char *)(s), n)
 #define os_memset(s,c,n)   memset((void *)(s), c, n)
-#define os_memcpy(d,s,n)   memcpy((void *)(d), (const void *)(s), n)
+//#define os_memcpy(d,s,n)   memcpy((void *)(d), (const void *)(s), n)
+#define MEMCPYS memcpy
+#define os_memcpy(d, s, n) MEMCPYS((d), (s), (n))
+//#define os_memcpy memcpy
 #define os_memmove(d,s,n)  memmove((void *)(d), (const void *)(s), n)
 #define os_sprintf(s, ...) sprintf((char *)(s), __VA_ARGS__)
 #define os_vsnprintf       vsnprintf

sdk/lib/common/dsleepdata.c

@@ -23,7 +23,7 @@ __init void sys_sleepdata_init(void)
     struct system_sleepdata *sdata = (struct system_sleepdata *)start;
     flags = disable_irq();
     if (sdata->magic1 != 0x1A2B3C4D || sdata->magic2 != 0xD4C3B2A1) {
-        dump_hex("sleepdata_init: ", ((uint8 *)&__sleep_data_stop) + 4 , 4, 1);
+        //dump_hex("sleepdata_init: ", ((uint8 *)&__sleep_data_stop) + 4 , 4, 1);
         os_memset(sdata, 0, sizeof(struct system_sleepdata));
         sdata->magic1 = 0x1A2B3C4D;
         sdata->magic2 = 0xD4C3B2A1;

sdk/lib/net/lwip/src/api/sockets.c

@@ -588,6 +588,25 @@ free_socket_free_elements(int is_tcp, struct netconn *conn, union lwip_sock_last
   }
 }
 
+int LWIP_GetMaxSockets()
+{
+    return NUM_SOCKETS;
+}
+
+int LWIP_GetActiveSockets()
+{
+    int i;
+    int r = 0;
+    for(i = 0; i < NUM_SOCKETS; ++i)
+    {
+        if(sockets[i].conn)
+        {
+            r++;
+        }
+    }
+    return r;
+}
+
 /** Free a socket. The socket's netconn must have been
  * delete before!
  *

sdk/lib/net/lwip/src/core/tcp.c

@@ -1889,8 +1889,6 @@ tcp_alloc(u8_t prio)
       /* adjust err stats: memp_malloc failed above */
       MEMP_STATS_DEC(err, MEMP_TCP_PCB);
     }
-  }else{
-      printf("NO FREE TCP_PCB! total:%d\r\n", MEMP_NUM_TCP_PCB);
   }
 
   if (pcb != NULL) {

sdk/lib/video/dvp/cmos_sensor/csi_v2.c

@@ -1,7 +1,7 @@
 #include "sys_config.h"
 #include "typesdef.h"
 #include "lib/video/dvp/cmos_sensor/csi.h"
-#include "lib/video/dvp/cmos_sensor/csi_V2.h"
+#include "lib/video/dvp/cmos_sensor/csi_v2.h"
 #include "devid.h"
 #include "hal/gpio.h"
 #include "osal/irq.h"
@@ -1118,7 +1118,7 @@ void vpp_hsie_isr(uint32 irq,uint32 image_h,uint32  param){
 
 void vpp_vsie_isr(uint32 irq,uint32 dev,uint32 param){	
 	vs_isr++;
-	set_time_watermark(2022,9,1,20,1,(os_jiffies()/1000)%60);
+	//set_time_watermark(2022,9,1,20,1,(os_jiffies()/1000)%60);
 }
 
 void vpp_data_done(uint32 irq,uint32 dev,uint32 param){
@@ -1817,11 +1817,11 @@ bool csi_yuv_mode(){
 	
 	vpp_set_water0_color(vpp_test,0xff,0x80,0x80);
 	vpp_set_water0_bitmap(vpp_test,(uint32)ele_lib);
-	vpp_set_water0_locate(vpp_test,50,36);
+	vpp_set_water0_locate(vpp_test,0,0);
 	vpp_set_water0_contrast(vpp_test,0);
 	vpp_set_watermark0_charsize_and_num(vpp_test,12,32,19);
 	vpp_set_watermark0_mode(vpp_test,1);
-	set_time_watermark(2222,22,22,22,22,22);
+	set_time_watermark(0000,00,00,00,00,00);
 	vpp_set_water0_rc(vpp_test,0);
 
 
@@ -1861,8 +1861,8 @@ bool csi_yuv_mode(){
 #endif
 	vpp_set_mode(vpp_test,IMAGE_FORMAT);
 
-	vpp_set_watermark0_enable(vpp_test,1);
+	vpp_set_watermark0_enable(vpp_test,0);
-	vpp_set_watermark1_enable(vpp_test,1);
+	vpp_set_watermark1_enable(vpp_test,0);
 	
 #if IPF_EN
 //	vpp_set_ifp_en(vpp_test,1);

tools/.gitignore

@@ -0,0 +1 @@
+gcc