define all sensors

.gitignore

@@ -4,6 +4,4 @@
 project/obj/
 fpv_app_umac*
 cdkws.mk
-project.map
+project.map
-*.o
-*.d

project/.gitignore

@@ -1,4 +0,0 @@
-*.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"
@@ -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
+
-//	void lvgl_init(uint16_t w,uint16_t h,uint8_t rotate);
+#endif
-//	lvgl_init(w,h,rotate);
+
-//#endif
+#if (USB_EN && !RTT_USB_EN)
+    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()) {

project/makecode_post.bat

@@ -1,3 +1,15 @@
+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

@@ -794,7 +794,7 @@
 
 
 /**************************************按键配置******************************************************** */
-#define KEY_MODULE_EN					0
+#define KEY_MODULE_EN					1
 /*************************************************************************************************** */
 
 
@@ -812,7 +812,7 @@
 /*************************************************************************************************** */
 
 /**********************************************音频相关********************************************* */
-#define AUDIO_EN                        1
+#define AUDIO_EN                        0
 #define AUDIO_DAC_EN                    0
 /************************************************************************************************** */
 

project/real_code.BinScript

@@ -1,9 +0,0 @@
-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 = 0x431fc    /* on-chip SRAM 288KB */
+    SRAM   : ORIGIN = 0x20000004 , LENGTH = 0x3fffc    /* 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  = 0x20043200);
+PROVIDE (__ram_end  = 0x20040000);
-PROVIDE (__heap_end = 0x20043200);
+PROVIDE (__heap_end = 0x20040000);
-PROVIDE (__sleep_data_start = 0x20043200);
+PROVIDE (__sleep_data_start = 0x20040004);
-PROVIDE (__sleep_data_stop  = 0x20043bfc);
+PROVIDE (__sleep_data_stop  = 0x20040a00);
 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",    SRAM);
+REGION_ALIAS("REGION_DSLEEP",    SRAM0);
 
 ENTRY(Reset_Handler)
 SECTIONS
@@ -293,4 +293,5 @@ SECTIONS
 /* ASSERT(DEFINED(ROM_FUNC_ENABLE), "please disable ROM Functions in ld file") */
 /* ASSERT(ADDR(.text) < 0x20000068, "ROM Functions data area conflict!!!")*/
 
-INPUT(utilities/romcode.ld)
+ INPUT(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/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>

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

@@ -167,18 +167,18 @@ extern void hw_memcpy(void *dest, const void *src, unsigned int 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     6
+#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            20
+#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.
@@ -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            20
+#define MEMP_NUM_NETCONN            12
 #endif
 
 /**

sdk/include/osal/csky/string.h

@@ -89,10 +89,7 @@ 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/crypto/mbedtls/library/Makefile

@@ -0,0 +1,361 @@
+
+# Also see "include/mbedtls/mbedtls_config.h"
+
+CFLAGS	?= -O2
+WARNING_CFLAGS ?=  -Wall -Wextra -Wformat=2 -Wno-format-nonliteral
+LDFLAGS ?=
+
+# Include ../include for public headers and . for private headers.
+# Note that . needs to be included explicitly for the sake of library
+# files that are not in the /library directory (which currently means
+# under /3rdparty).
+LOCAL_CFLAGS = $(WARNING_CFLAGS) -I. -I../include -D_FILE_OFFSET_BITS=64
+LOCAL_LDFLAGS =
+
+ifdef DEBUG
+LOCAL_CFLAGS += -g3
+endif
+
+# MicroBlaze specific options:
+# CFLAGS += -mno-xl-soft-mul -mxl-barrel-shift
+
+# To compile on Plan9:
+# CFLAGS += -D_BSD_EXTENSION
+
+PERL ?= perl
+
+ifdef WINDOWS
+PYTHON ?= python
+else
+PYTHON ?= $(shell if type python3 >/dev/null 2>/dev/null; then echo python3; else echo python; fi)
+endif
+
+# if were running on Windows build for Windows
+ifdef WINDOWS
+WINDOWS_BUILD=1
+else ifeq ($(shell uname -s),Darwin)
+ifeq ($(AR),ar)
+APPLE_BUILD ?= 1
+endif
+endif
+
+# To compile as a shared library:
+ifdef SHARED
+# all code is position-indep with mingw, avoid warning about useless flag
+ifndef WINDOWS_BUILD
+LOCAL_CFLAGS += -fPIC -fpic
+endif
+endif
+
+SOEXT_TLS?=so.19
+SOEXT_X509?=so.5
+SOEXT_CRYPTO?=so.14
+
+# Set AR_DASH= (empty string) to use an ar implementation that does not accept
+# the - prefix for command line options (e.g. llvm-ar)
+AR_DASH ?= -
+
+ARFLAGS = $(AR_DASH)src
+ifdef APPLE_BUILD
+ifneq ($(APPLE_BUILD),0)
+ARFLAGS = $(AR_DASH)Src
+RLFLAGS = -no_warning_for_no_symbols -c
+RL ?= ranlib
+endif
+endif
+
+DLEXT ?= so
+ifdef WINDOWS_BUILD
+# Windows shared library extension:
+DLEXT = dll
+else ifdef APPLE_BUILD
+ifneq ($(APPLE_BUILD),0)
+# Mac OS X shared library extension:
+DLEXT = dylib
+endif
+endif
+
+OBJS_CRYPTO= \
+	     aes.o \
+	     aesni.o \
+	     aesce.o \
+	     aria.o \
+	     asn1parse.o \
+	     asn1write.o \
+	     base64.o \
+	     bignum.o \
+	     bignum_core.o \
+	     bignum_mod.o \
+	     bignum_mod_raw.o \
+	     camellia.o \
+	     ccm.o \
+	     chacha20.o \
+	     chachapoly.o \
+	     cipher.o \
+	     cipher_wrap.o \
+	     cmac.o \
+	     constant_time.o \
+	     ctr_drbg.o \
+	     des.o \
+	     dhm.o \
+	     ecdh.o \
+	     ecdsa.o \
+	     ecjpake.o \
+	     ecp.o \
+	     ecp_curves.o \
+	     entropy.o \
+	     entropy_poll.o \
+	     error.o \
+	     gcm.o \
+	     hash_info.o \
+	     hkdf.o \
+	     hmac_drbg.o \
+	     lmots.o \
+	     lms.o \
+	     md.o \
+	     md5.o \
+	     memory_buffer_alloc.o \
+	     nist_kw.o \
+	     oid.o \
+	     padlock.o \
+	     pem.o \
+	     pk.o \
+	     pk_wrap.o \
+	     pkcs12.o \
+	     pkcs5.o \
+	     pkparse.o \
+	     pkwrite.o \
+	     platform.o \
+	     platform_util.o \
+	     poly1305.o \
+	     psa_crypto.o \
+	     psa_crypto_aead.o \
+	     psa_crypto_cipher.o \
+	     psa_crypto_client.o \
+	     psa_crypto_driver_wrappers.o \
+	     psa_crypto_ecp.o \
+	     psa_crypto_hash.o \
+	     psa_crypto_mac.o \
+	     psa_crypto_pake.o \
+	     psa_crypto_rsa.o \
+	     psa_crypto_se.o \
+	     psa_crypto_slot_management.o \
+	     psa_crypto_storage.o \
+	     psa_its_file.o \
+	     psa_util.o \
+	     ripemd160.o \
+	     rsa.o \
+	     rsa_alt_helpers.o \
+	     sha1.o \
+	     sha256.o \
+	     sha512.o \
+	     threading.o \
+	     timing.o \
+	     version.o \
+	     version_features.o \
+	     # This line is intentionally left blank
+
+include ../3rdparty/Makefile.inc
+LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES)
+OBJS_CRYPTO+=$(THIRDPARTY_CRYPTO_OBJECTS)
+
+OBJS_X509= \
+	   x509.o \
+	   x509_create.o \
+	   x509_crl.o \
+	   x509_crt.o \
+	   x509_csr.o \
+	   x509write_crt.o \
+	   x509write_csr.o \
+	   pkcs7.o \
+	   # This line is intentionally left blank
+
+OBJS_TLS= \
+	  debug.o \
+	  mps_reader.o \
+	  mps_trace.o \
+	  net_sockets.o \
+	  ssl_cache.o \
+	  ssl_ciphersuites.o \
+	  ssl_client.o \
+	  ssl_cookie.o \
+	  ssl_debug_helpers_generated.o \
+	  ssl_msg.o \
+	  ssl_ticket.o \
+	  ssl_tls.o \
+	  ssl_tls12_client.o \
+	  ssl_tls12_server.o \
+	  ssl_tls13_keys.o \
+	  ssl_tls13_client.o \
+	  ssl_tls13_server.o \
+	  ssl_tls13_generic.o \
+	  # This line is intentionally left blank
+
+.SILENT:
+
+.PHONY: all static shared clean
+
+ifndef SHARED
+all: static
+else
+all: shared static
+endif
+
+static: libmbedcrypto.a libmbedx509.a libmbedtls.a
+	cd ../tests && echo "This is a seedfile that contains 64 bytes (65 on Windows)......" > seedfile
+
+shared: libmbedcrypto.$(DLEXT) libmbedx509.$(DLEXT) libmbedtls.$(DLEXT)
+
+# Windows builds under Mingw can fail if make tries to create archives in the same
+# directory at the same time - see https://bugs.launchpad.net/gcc-arm-embedded/+bug/1848002.
+# This forces builds of the .a files to be serialised.
+ifdef WINDOWS
+libmbedtls.a: | libmbedx509.a
+libmbedx509.a: | libmbedcrypto.a
+endif
+
+# tls
+libmbedtls.a: $(OBJS_TLS)
+	echo "  AR    $@"
+	$(AR) $(ARFLAGS) $@ $(OBJS_TLS)
+ifdef APPLE_BUILD
+ifneq ($(APPLE_BUILD),0)
+	echo "  RL    $@"
+	$(RL) $(RLFLAGS) $@
+endif
+endif
+
+libmbedtls.$(SOEXT_TLS): $(OBJS_TLS) libmbedx509.so
+	echo "  LD    $@"
+	$(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS_TLS) -L. -lmbedx509 -lmbedcrypto $(LOCAL_LDFLAGS) $(LDFLAGS)
+
+ifneq ($(SOEXT_TLS),so)
+libmbedtls.so: libmbedtls.$(SOEXT_TLS)
+	echo "  LN    $@ -> $<"
+	ln -sf $< $@
+endif
+
+libmbedtls.dylib: $(OBJS_TLS) libmbedx509.dylib
+	echo "  LD    $@"
+	$(CC) -dynamiclib -o $@ $(OBJS_TLS) -L. -lmbedx509 -lmbedcrypto $(LOCAL_LDFLAGS) $(LDFLAGS)
+
+libmbedtls.dll: $(OBJS_TLS) libmbedx509.dll
+	echo "  LD    $@"
+	$(CC) -shared -Wl,-soname,$@ -Wl,--out-implib,$@.a -o $@ $(OBJS_TLS) -lws2_32 -lwinmm -lgdi32 -L. -lmbedx509 -lmbedcrypto -static-libgcc $(LOCAL_LDFLAGS) $(LDFLAGS)
+
+# x509
+libmbedx509.a: $(OBJS_X509)
+	echo "  AR    $@"
+	$(AR) $(ARFLAGS) $@ $(OBJS_X509)
+ifdef APPLE_BUILD
+ifneq ($(APPLE_BUILD),0)
+	echo "  RL    $@"
+	$(RL) $(RLFLAGS) $@
+endif
+endif
+
+libmbedx509.$(SOEXT_X509): $(OBJS_X509) libmbedcrypto.so
+	echo "  LD    $@"
+	$(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS_X509) -L. -lmbedcrypto $(LOCAL_LDFLAGS) $(LDFLAGS)
+
+ifneq ($(SOEXT_X509),so)
+libmbedx509.so: libmbedx509.$(SOEXT_X509)
+	echo "  LN    $@ -> $<"
+	ln -sf $< $@
+endif
+
+libmbedx509.dylib: $(OBJS_X509) libmbedcrypto.dylib
+	echo "  LD    $@"
+	$(CC) -dynamiclib -o $@ $(OBJS_X509) -L. -lmbedcrypto  $(LOCAL_LDFLAGS) $(LDFLAGS)
+
+libmbedx509.dll: $(OBJS_X509) libmbedcrypto.dll
+	echo "  LD    $@"
+	$(CC) -shared -Wl,-soname,$@ -Wl,--out-implib,$@.a -o $@ $(OBJS_X509) -lws2_32 -lwinmm -lgdi32 -L. -lmbedcrypto -static-libgcc $(LOCAL_LDFLAGS) $(LDFLAGS)
+
+# crypto
+libmbedcrypto.a: $(OBJS_CRYPTO)
+	echo "  AR    $@"
+	$(AR) $(ARFLAGS) $@ $(OBJS_CRYPTO)
+ifdef APPLE_BUILD
+ifneq ($(APPLE_BUILD),0)
+	echo "  RL    $@"
+	$(RL) $(RLFLAGS) $@
+endif
+endif
+
+libmbedcrypto.$(SOEXT_CRYPTO): $(OBJS_CRYPTO)
+	echo "  LD    $@"
+	$(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS_CRYPTO) $(LOCAL_LDFLAGS) $(LDFLAGS)
+
+ifneq ($(SOEXT_CRYPTO),so)
+libmbedcrypto.so: libmbedcrypto.$(SOEXT_CRYPTO)
+	echo "  LN    $@ -> $<"
+	ln -sf $< $@
+endif
+
+libmbedcrypto.dylib: $(OBJS_CRYPTO)
+	echo "  LD    $@"
+	$(CC) -dynamiclib -o $@ $(OBJS_CRYPTO) $(LOCAL_LDFLAGS) $(LDFLAGS)
+
+libmbedcrypto.dll: $(OBJS_CRYPTO)
+	echo "  LD    $@"
+	$(CC) -shared -Wl,-soname,$@ -Wl,--out-implib,$@.a -o $@ $(OBJS_CRYPTO) -lws2_32 -lwinmm -lgdi32 -static-libgcc $(LOCAL_LDFLAGS) $(LDFLAGS)
+
+.c.o:
+	echo "  CC    $<"
+	$(CC) $(LOCAL_CFLAGS) $(CFLAGS) -o $@ -c $<
+
+.PHONY: generated_files
+GENERATED_FILES = \
+	error.c version_features.c \
+	ssl_debug_helpers_generated.c \
+        psa_crypto_driver_wrappers.c
+generated_files: $(GENERATED_FILES)
+
+error.c: ../scripts/generate_errors.pl
+error.c: ../scripts/data_files/error.fmt
+error.c: $(filter-out %config%,$(wildcard ../include/mbedtls/*.h))
+error.c:
+	echo "  Gen   $@"
+	$(PERL) ../scripts/generate_errors.pl
+
+ssl_debug_helpers_generated.c: ../scripts/generate_ssl_debug_helpers.py
+ssl_debug_helpers_generated.c: $(filter-out %config%,$(wildcard ../include/mbedtls/*.h))
+ssl_debug_helpers_generated.c:
+	echo "  Gen   $@"
+	$(PYTHON) ../scripts/generate_ssl_debug_helpers.py --mbedtls-root .. .
+
+version_features.c: ../scripts/generate_features.pl
+version_features.c: ../scripts/data_files/version_features.fmt
+## The generated file only depends on the options that are present in mbedtls_config.h,
+## not on which options are set. To avoid regenerating this file all the time
+## when switching between configurations, don't declare mbedtls_config.h as a
+## dependency. Remove this file from your working tree if you've just added or
+## removed an option in mbedtls_config.h.
+#version_features.c: ../include/mbedtls/mbedtls_config.h
+version_features.c:
+	echo "  Gen   $@"
+	$(PERL) ../scripts/generate_features.pl
+
+psa_crypto_driver_wrappers.c: ../scripts/generate_driver_wrappers.py
+psa_crypto_driver_wrappers.c: ../scripts/data_files/driver_templates/psa_crypto_driver_wrappers.c.jinja
+psa_crypto_driver_wrappers.c:
+	echo "  Gen   $@"
+	$(PYTHON) ../scripts/generate_driver_wrappers.py
+
+clean:
+ifndef WINDOWS
+	rm -f *.o libmbed*
+	rm -f $(THIRDPARTY_CRYPTO_OBJECTS)
+else
+	if exist *.o del /Q /F *.o
+	if exist libmbed* del /Q /F libmbed*
+	del /Q /F del_errors_out_if_the_file_list_is_empty_but_not_if_a_file_does_not_exist $(subst /,\,$(THIRDPARTY_CRYPTO_OBJECTS))
+endif
+
+neat: clean
+ifndef WINDOWS
+	rm -f $(GENERATED_FILES)
+else
+	for %f in ($(subst /,\,$(GENERATED_FILES))) if exist %f del /Q /F %f
+endif

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

@@ -588,25 +588,6 @@ 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,6 +1889,8 @@ 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,0,0);
+	vpp_set_water0_locate(vpp_test,50,36);
 	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(0000,00,00,00,00,00);
+	set_time_watermark(2222,22,22,22,22,22);
 	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,0);
+	vpp_set_watermark0_enable(vpp_test,1);
-	vpp_set_watermark1_enable(vpp_test,0);
+	vpp_set_watermark1_enable(vpp_test,1);
 	
 #if IPF_EN
 //	vpp_set_ifp_en(vpp_test,1);

tools/.gitignore

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