p_lusterinc_xsync
/
xsync_stm32
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

v5
zhaohe 2 years ago
parent
77d072427d
commit
29ee77b433
9 changed files with 28 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .settings/language.settings.xml
  2. 2
      Core/Inc/FreeRTOSConfig.h
  3. 4
      LWIP/Target/lwipopts.h
  4. 2
      iflytop_xsync
  5. 2
      iflytop_xsync_protocol
  6. 3
      usrc/main.cpp
  7. 9
      usrc/service/extern_if_service.c
  8. 8
      usrc/service/report_generator_service.c
  9. 7
      xsync_stm32.ioc

4
.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1135599026803643439" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-561685569534312857" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1020961494554070048" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-676323101783886248" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

2
Core/Inc/FreeRTOSConfig.h
View File

@ -64,7 +64,7 @@
#define configTICK_RATE_HZ ((TickType_t)1000) #define configTICK_RATE_HZ ((TickType_t)1000)
#define configMAX_PRIORITIES ( 7 ) #define configMAX_PRIORITIES ( 7 )
#define configMINIMAL_STACK_SIZE ((uint16_t)128) #define configMINIMAL_STACK_SIZE ((uint16_t)128)
#define configTOTAL_HEAP_SIZE ((size_t)15360)
#define configTOTAL_HEAP_SIZE ((size_t)30000)
#define configMAX_TASK_NAME_LEN ( 16 ) #define configMAX_TASK_NAME_LEN ( 16 )
#define configUSE_16_BIT_TICKS 0 #define configUSE_16_BIT_TICKS 0
#define configUSE_MUTEXES 1 #define configUSE_MUTEXES 1

4
LWIP/Target/lwipopts.h
View File

@ -89,6 +89,10 @@
#define DEFAULT_TCP_RECVMBOX_SIZE 6 #define DEFAULT_TCP_RECVMBOX_SIZE 6
/*----- Value in opt.h for DEFAULT_ACCEPTMBOX_SIZE: 0 -----*/ /*----- Value in opt.h for DEFAULT_ACCEPTMBOX_SIZE: 0 -----*/
#define DEFAULT_ACCEPTMBOX_SIZE 6 #define DEFAULT_ACCEPTMBOX_SIZE 6
/*----- Default Value for LWIP_SO_SNDTIMEO: 0 ---*/
#define LWIP_SO_SNDTIMEO 1
/*----- Default Value for LWIP_SO_RCVTIMEO: 0 ---*/
#define LWIP_SO_RCVTIMEO 1
/*----- Value in opt.h for RECV_BUFSIZE_DEFAULT: INT_MAX -----*/ /*----- Value in opt.h for RECV_BUFSIZE_DEFAULT: INT_MAX -----*/
#define RECV_BUFSIZE_DEFAULT 2000000000 #define RECV_BUFSIZE_DEFAULT 2000000000
/*----- Value in opt.h for LWIP_STATS: 1 -----*/ /*----- Value in opt.h for LWIP_STATS: 1 -----*/

2
iflytop_xsync

@ -1 +1 @@
Subproject commit 0bae19852f16f3039a7863c76ad0854bd81da56a
Subproject commit 562d66799c183ce0ad6f9f242b700c13b6de1b5f

2
iflytop_xsync_protocol

@ -1 +1 @@
Subproject commit dd0c38c767378dbe9010cd7e94bf1bf7cf0e40d5
Subproject commit cb1114b21bf415053cdaeb7ed2940406e48d378b

3
usrc/main.cpp
View File

@ -131,6 +131,7 @@ void umain() {
* *
* 解析并处理外部指令 * 解析并处理外部指令
*/ */
osDelay(1000);
extern_if_service_init(); extern_if_service_init();
ZLOGI(TAG, "system init done"); ZLOGI(TAG, "system init done");
@ -138,6 +139,6 @@ void umain() {
while (true) { while (true) {
osDelay(10); osDelay(10);
debug_light_ctrl(); debug_light_ctrl();
factory_reset_key_detect();
// factory_reset_key_detect();
} }
} }

9
usrc/service/extern_if_service.c
View File

@ -4,6 +4,7 @@
// //
#include "iflytop_xsync\xs_udp.h" #include "iflytop_xsync\xs_udp.h"
#include "reg_manager.h" #include "reg_manager.h"
#define TAG "extern_if_service"
static udp_t m_udp_cmd_server; // static udp_t m_udp_cmd_server; //
// static udp_broadcast_handler_t m_udp_camera_sync_sender; // // static udp_broadcast_handler_t m_udp_camera_sync_sender; //
@ -68,6 +69,12 @@ static void create_and_send_timecode(struct sockaddr_in client, uint32_t timecod
* @param len * @param len
*/ */
static void udp_on_packet(udp_t *server, struct sockaddr_in *client, uint8_t *data, uint16_t len) { static void udp_on_packet(udp_t *server, struct sockaddr_in *client, uint8_t *data, uint16_t len) {
ZLOGI(TAG, "udp_on_packet %d:", len);
for (int i = 0; i < len; i++) {
printf("%02x ", data[i]);
}
printf("\n");
/** /**
* @brief * @brief
*/ */
@ -110,7 +117,7 @@ static void udp_on_packet(udp_t *server, struct sockaddr_in *client, uint8_t *da
} }
} }
void extern_if_service_init() { ZASSERT(xs_udp_init(&m_udp_cmd_server, "extern_if_udp", IFLYTOP_XSYNC_SERVICE_PORT, udp_on_packet, 1024, NULL)); }
void extern_if_service_init() { ZASSERT(xs_udp_init(&m_udp_cmd_server, "extern_if_udp", IFLYTOP_XSYNC_SERVICE_XSYNC_PORT, udp_on_packet, 1024, NULL)); }
#if 0 #if 0
void extern_if_service_send_timecode(struct sockaddr_in client, uint32_t timecode0, uint32_t timecode1) { create_and_send_timecode(client, timecode0, timecode1); } void extern_if_service_send_timecode(struct sockaddr_in client, uint32_t timecode0, uint32_t timecode1) { create_and_send_timecode(client, timecode0, timecode1); }
#endif #endif

8
usrc/service/report_generator_service.c
View File

@ -29,7 +29,7 @@ static void create_and_send_timecode(uint32_t timecode0, uint32_t timecode1) {
iflytop_timecode_report_packet_t *txpacket = (iflytop_timecode_report_packet_t *)txbuf; iflytop_timecode_report_packet_t *txpacket = (iflytop_timecode_report_packet_t *)txbuf;
txpacket->timecode0 = timecode0; txpacket->timecode0 = timecode0;
txpacket->timecode1 = timecode1; txpacket->timecode1 = timecode1;
xs_udp_broadcast(&m_udp_camera_timecode_sender, IFLYTOP_XSYNC_TIMECODE_REPORT_TO_PORT, txbuf, sizeof(iflytop_timecode_report_packet_t));
xs_udp_broadcast(&m_udp_camera_timecode_sender, IFLYTOP_XSYNC_TIMECODE_REPORT_PC_PORT, txbuf, sizeof(iflytop_timecode_report_packet_t));
} }
/** /**
* @brief 构建并发送相机同步数据包 * @brief 构建并发送相机同步数据包
@ -47,7 +47,7 @@ static void create_and_send_camera_sync_msg(uint32_t count) {
txbuf[5] = (count >> 16) & 0xFF; txbuf[5] = (count >> 16) & 0xFF;
txbuf[4] = (count >> 24) & 0xFF; txbuf[4] = (count >> 24) & 0xFF;
xs_udp_broadcast(&m_udp_camera_sync_sender, IFLYTOP_XSYNC_CAMERA_SYNC_PACKET_TO_PORT, txbuf, sizeof(txbuf));
xs_udp_broadcast(&m_udp_camera_sync_sender, IFLYTOP_XSYNC_CAMERA_SYNC_PACKET_PC_PORT, txbuf, sizeof(txbuf));
} }
static void timecode_report_thread(void const *argument) { static void timecode_report_thread(void const *argument) {
@ -79,8 +79,8 @@ void report_generator_service_irq_trigger(uint16_t gpiopin) {
} }
void report_generator_service_init() { void report_generator_service_init() {
ZASSERT(xs_udp_broadcast_init(&m_udp_camera_sync_sender, IFLYTOP_XSYNC_CAMERA_SYNC_PACKET_FROM_PORT));
ZASSERT(xs_udp_broadcast_init(&m_udp_camera_timecode_sender, IFLYTOP_XSYNC_TIMECODE_REPORT_FROM_PORT));
ZASSERT(xs_udp_broadcast_init(&m_udp_camera_sync_sender, IFLYTOP_XSYNC_CAMERA_SYNC_PACKET_XSYNC_PORT));
ZASSERT(xs_udp_broadcast_init(&m_udp_camera_timecode_sender, IFLYTOP_XSYNC_TIMECODE_REPORT_XSYNC_PORT));
osThreadDef(timecode_report_thread, timecode_report_thread, osPriorityNormal, 0, 512); osThreadDef(timecode_report_thread, timecode_report_thread, osPriorityNormal, 0, 512);
timecode_report_thread_id = osThreadCreate(osThread(timecode_report_thread), NULL); timecode_report_thread_id = osThreadCreate(osThread(timecode_report_thread), NULL);

7
xsync_stm32.ioc
View File

@ -25,10 +25,11 @@ ETH.PHY_User_Name=LAN8720A
ETH.RxBuffLen=1536 ETH.RxBuffLen=1536
ETH.RxMode=ETH_RXINTERRUPT_MODE ETH.RxMode=ETH_RXINTERRUPT_MODE
FREERTOS.FootprintOK=true FREERTOS.FootprintOK=true
FREERTOS.IPParameters=Tasks01,FootprintOK,configUSE_NEWLIB_REENTRANT,configUSE_RECURSIVE_MUTEXES,configUSE_COUNTING_SEMAPHORES,configRECORD_STACK_HIGH_ADDRESS,configENABLE_FPU
FREERTOS.IPParameters=Tasks01,FootprintOK,configUSE_NEWLIB_REENTRANT,configUSE_RECURSIVE_MUTEXES,configUSE_COUNTING_SEMAPHORES,configRECORD_STACK_HIGH_ADDRESS,configENABLE_FPU,configTOTAL_HEAP_SIZE
FREERTOS.Tasks01=defaultTask,-3,1024,StartDefaultTask,As weak,NULL,Dynamic,NULL,NULL FREERTOS.Tasks01=defaultTask,-3,1024,StartDefaultTask,As weak,NULL,Dynamic,NULL,NULL
FREERTOS.configENABLE_FPU=1 FREERTOS.configENABLE_FPU=1
FREERTOS.configRECORD_STACK_HIGH_ADDRESS=1 FREERTOS.configRECORD_STACK_HIGH_ADDRESS=1
FREERTOS.configTOTAL_HEAP_SIZE=30000
FREERTOS.configUSE_COUNTING_SEMAPHORES=1 FREERTOS.configUSE_COUNTING_SEMAPHORES=1
FREERTOS.configUSE_NEWLIB_REENTRANT=1 FREERTOS.configUSE_NEWLIB_REENTRANT=1
FREERTOS.configUSE_RECURSIVE_MUTEXES=1 FREERTOS.configUSE_RECURSIVE_MUTEXES=1
@ -37,11 +38,13 @@ GPIO.groupedBy=Group By Peripherals
KeepUserPlacement=false KeepUserPlacement=false
LWIP.BSP.number=1 LWIP.BSP.number=1
LWIP.GATEWAY_ADDRESS=192.168.008.001 LWIP.GATEWAY_ADDRESS=192.168.008.001
LWIP.IPParameters=LWIP_DHCP,IP_ADDRESS,NETMASK_ADDRESS,GATEWAY_ADDRESS,LWIP_DNS,LWIP_NETIF_HOSTNAME
LWIP.IPParameters=LWIP_DHCP,IP_ADDRESS,NETMASK_ADDRESS,GATEWAY_ADDRESS,LWIP_DNS,LWIP_NETIF_HOSTNAME,LWIP_SO_RCVTIMEO,LWIP_SO_SNDTIMEO
LWIP.IP_ADDRESS=192.168.008.010 LWIP.IP_ADDRESS=192.168.008.010
LWIP.LWIP_DHCP=0 LWIP.LWIP_DHCP=0
LWIP.LWIP_DNS=1 LWIP.LWIP_DNS=1
LWIP.LWIP_NETIF_HOSTNAME=1 LWIP.LWIP_NETIF_HOSTNAME=1
LWIP.LWIP_SO_RCVTIMEO=1
LWIP.LWIP_SO_SNDTIMEO=1
LWIP.NETMASK_ADDRESS=255.255.255.255 LWIP.NETMASK_ADDRESS=255.255.255.255
LWIP.Version=v2.1.2_Cube LWIP.Version=v2.1.2_Cube
LWIP0.BSP.STBoard=false LWIP0.BSP.STBoard=false

Write Preview
Loading…
Cancel
Save