This commit is contained in:
NonPIayerCharacter
2025-08-28 15:55:31 +03:00
parent e0876478d0
commit dff89205ca
23 changed files with 1647 additions and 120 deletions
+3 -1
View File
@@ -4,4 +4,6 @@
project/obj/
fpv_app_umac*
cdkws.mk
project.map
project.map
*.o
*.d
+3
View File
@@ -0,0 +1,3 @@
*.bin
*.hex
*.elf
+2 -2
View File
@@ -27,8 +27,8 @@ fi
cp parameter.bincfg parameter.cfg
BinScript.exe BinScript.BinScript
makecode.exe
./BinScript.exe BinScript.BinScript
./makecode.exe
#crc.exe crc.ini
#BinScript.exe BinScript_Bin2Hex.BinScript
+1501
View File
File diff suppressed because one or more lines are too long
+55 -55
View File
@@ -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
extern void recv_record_Server(int port);
recv_record_Server(43210);
#endif
//#if SDH_EN && FS_EN && OPENDML_EN
// extern void recv_record_Server(int port);
// recv_record_Server(43210);
//
//#endif
#ifdef CONFIG_UMAC4
@@ -1071,27 +1071,27 @@ void hardware_init(uint8 vcam)
#if LCD_EN
#if LVGL_STREAM_ENABLE == 1
uint16_t w,h;
uint16_t screen_w,screen_h;
uint8_t rotate,video_rotate;
extern stream *lvgl_R_osd_stream(const char *name);
extern stream *osd_show_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_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));
#else
uint16_t w,h;
uint8_t rotate;
void lcd_module_run(uint16_t *w,uint16_t *h,uint8_t *rotate);
lcd_module_run(&w,&h,&rotate);
#endif
#endif
//#if LCD_EN
//
//
// #if LVGL_STREAM_ENABLE == 1
// uint16_t w,h;
// uint16_t screen_w,screen_h;
// uint8_t rotate,video_rotate;
// extern stream *lvgl_R_osd_stream(const char *name);
// extern stream *osd_show_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_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));
//
// #else
// uint16_t w,h;
// uint8_t rotate;
// void lcd_module_run(uint16_t *w,uint16_t *h,uint8_t *rotate);
// lcd_module_run(&w,&h,&rotate);
// #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_DETECT_EN && !USB_HOST_EN)
extern void hg_usb_connect_detect_init(void);
hg_usb_connect_detect_init();
#else
#if USB_HOST_EN
extern rt_err_t hg_usbh_register(rt_uint32_t devid);
hg_usbh_register(HG_USB_HOST_CONTROLLER_DEVID);
#else
extern void hg_usbd_class_driver_register();
extern int hg_usbd_register(rt_uint32_t devid);
hg_usbd_class_driver_register();
hg_usbd_register(HG_USB_DEV_CONTROLLER_DEVID);
#endif
#endif
//#if (USB_EN && RTT_USB_EN)
// #if (USB_DETECT_EN && !USB_HOST_EN)
// extern void hg_usb_connect_detect_init(void);
// hg_usb_connect_detect_init();
// #else
// #if USB_HOST_EN
// extern rt_err_t hg_usbh_register(rt_uint32_t devid);
// hg_usbh_register(HG_USB_HOST_CONTROLLER_DEVID);
// #else
// extern void hg_usbd_class_driver_register();
// extern int hg_usbd_register(rt_uint32_t devid);
// hg_usbd_class_driver_register();
// hg_usbd_register(HG_USB_DEV_CONTROLLER_DEVID);
// #endif
// #endif
//
//
//#endif
//
//#if (USB_EN && !RTT_USB_EN)
// void hg_usb_test(void);
// hg_usb_test();
//#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);
lvgl_init(w,h,rotate);
#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()) {
+1 -1
View File
@@ -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/
+1 -1
View File
@@ -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
+18 -1
View File
@@ -293,5 +293,22 @@ 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)
memset = 0X00000584;
memcpy = 0X00000624;
memcmp = 0X000006A4;
strcasecmp = 0X0000232C;
strncasecmp = 0X00002370;
ll_qspi_xip_erase = 0X0000680C;
ll_qspi_xip_read = 0X00006854;
ll_qspi_xip_write = 0X00006898;
ll_qspi_xip_opt_enter = 0X00006728;
ll_qspi_xip_opt_exit = 0X0000679C;
ll_qspi_enter_xip_mode = 0X00006180;
ll_qspi_exit_xip_mode = 0X00006204;
ll_qspi_stig = 0X000060D8;
ll_ospi_psram_mrr = 0X00003798;
ll_ospi_psram_mrw = 0X0000380C;
ll_ospi_stig = 0X00003680;
qspi_flash_erase_handle = 0x00002d5c;
ll_qspi_cmd_busy_wait = 0x00006120;
+1 -1
View File
@@ -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"
+5 -5
View File
@@ -1,8 +1,8 @@
#include "lwip\sockets.h"
#include "lwip\netif.h"
#include "lwip\dns.h"
#include "lwip\api.h"
#include "lwip\tcp.h"
#include "lwip/sockets.h"
#include "lwip/netif.h"
#include "lwip/dns.h"
#include "lwip/api.h"
#include "lwip/tcp.h"
#include "rtsp_common.h"
#include "osal/string.h"
+5 -5
View File
@@ -18,12 +18,12 @@
#include <stdio.h>
#include "lwip\sockets.h"
#include "lwip\netif.h"
#include "lwip\dns.h"
#include "lwip/sockets.h"
#include "lwip/netif.h"
#include "lwip/dns.h"
#include "lwip\api.h"
#include "lwip\tcp.h"
#include "lwip/api.h"
#include "lwip/tcp.h"
#include <event.h>
#include <log.h>
+5 -5
View File
@@ -18,12 +18,12 @@
#include <stdio.h>
#include "lwip\sockets.h"
#include "lwip\netif.h"
#include "lwip\dns.h"
#include "lwip/sockets.h"
#include "lwip/netif.h"
#include "lwip/dns.h"
#include "lwip\api.h"
#include "lwip\tcp.h"
#include "lwip/api.h"
#include "lwip/tcp.h"
#include <event.h>
#include <log.h>
+6 -6
View File
@@ -16,12 +16,12 @@
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <stdio.h>
#include "lwip\sockets.h"
#include "lwip\netif.h"
#include "lwip\dns.h"
//#include "lwip\fcntl.h"
#include "lwip\api.h"
#include "lwip\tcp.h"
#include "lwip/sockets.h"
#include "lwip/netif.h"
#include "lwip/dns.h"
//#include "lwip/fcntl.h"
#include "lwip/api.h"
#include "lwip/tcp.h"
#include <event.h>
#include <log.h>
+5 -5
View File
@@ -19,13 +19,13 @@
#include <stdio.h>
#include "lwip\sockets.h"
#include "lwip\netif.h"
#include "lwip\dns.h"
#include "lwip/sockets.h"
#include "lwip/netif.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>
+5 -5
View File
@@ -1,9 +1,9 @@
#include <stdio.h>
#include "lwip\sockets.h"
#include "lwip\netif.h"
#include "lwip\dns.h"
#include "lwip\api.h"
#include "lwip\tcp.h"
#include "lwip/sockets.h"
#include "lwip/netif.h"
#include "lwip/dns.h"
#include "lwip/api.h"
#include "lwip/tcp.h"
#include "log.h"
#include "sys_config.h"
#include "osal/string.h"
+5 -5
View File
@@ -19,12 +19,12 @@
#include <stdio.h>
//#include "sys_config.h"
#include "lwip\sockets.h"
#include "lwip\netif.h"
#include "lwip\dns.h"
#include "lwip\api.h"
#include "lwip/sockets.h"
#include "lwip/netif.h"
#include "lwip/dns.h"
#include "lwip/api.h"
#include "lwip\tcp.h"
#include "lwip/tcp.h"
#include <event.h>
#include <log.h>
+5 -5
View File
@@ -17,13 +17,13 @@
*/
#include <stdio.h>
#include "lwip\sockets.h"
#include "lwip\netif.h"
#include "lwip\dns.h"
#include "lwip/sockets.h"
#include "lwip/netif.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>
+5 -5
View File
@@ -18,11 +18,11 @@
#include <stdio.h>
#include "lwip\sockets.h"
#include "lwip\netif.h"
#include "lwip\dns.h"
//#include "lwip\fcntl.h"
#include "lwip\api.h"
#include "lwip/sockets.h"
#include "lwip/netif.h"
#include "lwip/dns.h"
//#include "lwip/fcntl.h"
#include "lwip/api.h"
#include "typesdef.h"
//#include <linux/linux_mutex.h>
+5 -5
View File
@@ -1,8 +1,8 @@
#include "lwip\sockets.h"
#include "lwip\netif.h"
#include "lwip\dns.h"
#include "lwip\api.h"
#include "lwip\tcp.h"
#include "lwip/sockets.h"
#include "lwip/netif.h"
#include "lwip/dns.h"
#include "lwip/api.h"
#include "lwip/tcp.h"
#include "rtsp_common.h"
#include "osal/string.h"
+6 -6
View File
@@ -1,11 +1,11 @@
#include <stdio.h>
#include "tx_platform.h"
#include "lwip\sockets.h"
#include "lwip\netif.h"
#include "lwip\dns.h"
//#include "lwip\fcntl.h"
#include "lwip\api.h"
#include "lwip\tcp.h"
#include "lwip/sockets.h"
#include "lwip/netif.h"
#include "lwip/dns.h"
//#include "lwip/fcntl.h"
#include "lwip/api.h"
#include "lwip/tcp.h"
#include <event.h>
#include <log.h>
+4 -1
View File
@@ -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 MEMCPY memcpy
#define os_memcpy(d, s, n) MEMCPY((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
+1
View File
@@ -0,0 +1 @@
gcc