From e9c8a378afa285ebfc2fa6f669cf28ef61c96f49 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 6 Jan 2024 11:34:05 +0800 Subject: [PATCH] update --- Core/Inc/FreeRTOSConfig.h | 2 +- usrc/project_configs.h | 4 ++-- usrc/service/extern_if_service.c | 11 ++++++----- usrc/service/reg_manager.c | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Core/Inc/FreeRTOSConfig.h b/Core/Inc/FreeRTOSConfig.h index 05cc8ff..c0ebbc9 100644 --- a/Core/Inc/FreeRTOSConfig.h +++ b/Core/Inc/FreeRTOSConfig.h @@ -61,7 +61,7 @@ #define configUSE_IDLE_HOOK 0 #define configUSE_TICK_HOOK 0 #define configCPU_CLOCK_HZ ( SystemCoreClock ) -#define configTICK_RATE_HZ ((TickType_t)1000) +#define configTICK_RATE_HZ ((TickType_t)10000) #define configMAX_PRIORITIES ( 7 ) #define configMINIMAL_STACK_SIZE ((uint16_t)128) #define configTOTAL_HEAP_SIZE ((size_t)30000) diff --git a/usrc/project_configs.h b/usrc/project_configs.h index 1e3cce8..3521942 100644 --- a/usrc/project_configs.h +++ b/usrc/project_configs.h @@ -1,8 +1,8 @@ #pragma once #define PC_VERSION 1 -#define PC_MANUFACTURER0 ('i' << 24 | 'f' << 16 | 'l' << 8 | 'y') -#define PC_MANUFACTURER1 ('t' << 24 | 'o' << 16 | 'p' << 8 | '\0') +#define PC_MANUFACTURER0 ('i' | 'f' << 8 | 'l' << 16 | 'y' << 24) +#define PC_MANUFACTURER1 ('t' | 'o' << 8 | 'p' << 16 | '\0' << 24) #define PC_PROJECT_NAME "xsync" #define PC_IFLYTOP_ENABLE_OS 1 diff --git a/usrc/service/extern_if_service.c b/usrc/service/extern_if_service.c index 6cc9e76..765a795 100644 --- a/usrc/service/extern_if_service.c +++ b/usrc/service/extern_if_service.c @@ -69,11 +69,11 @@ static void create_and_send_timecode(struct sockaddr_in client, uint32_t timecod * @param 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"); + // ZLOGI(TAG, "udp_on_packet %d:", len); + // for (int i = 0; i < len; i++) { + // printf("%02x ", data[i]); + // } + // printf("\n"); /** * @brief @@ -95,6 +95,7 @@ static void udp_on_packet(udp_t *server, struct sockaddr_in *client, uint8_t *da receipt[0] = 0; // receipt receipt[1] = reg_manager_read_reg(regadd); // regdata + ZLOGI(TAG, "regadd: %d, regdata: 0x%08x", regadd, receipt[1]); create_and_send_receipt(&cx, receipt, 2); } else if (rxpacket->cmd == kxsync_packet_type_reg_write) { uint32_t regadd = rxpacket->data[0]; diff --git a/usrc/service/reg_manager.c b/usrc/service/reg_manager.c index e53b317..51b9d12 100644 --- a/usrc/service/reg_manager.c +++ b/usrc/service/reg_manager.c @@ -16,13 +16,13 @@ void reg_manager_init() {} *******************************************************************************/ static uint32_t doaction(uint32_t action, uint32_t val) { if (action == xsync_stm32_action_generator_new_mac) { - config_get()->config0 = val; + config_generate_random_mac(); return 0; } else if (action == xsync_stm32_action_factory_reset) { config_factory_reset(); return 0; } else if (action == xsync_stm32_action_reboot) { - config_generate_random_mac(); + NVIC_SystemReset(); return 0; } else if (action == xsync_stm32_action_storage_cfg) { config_flush();