diff --git a/CORE/startup_stm32f40_41xxx.s b/CORE/startup_stm32f40_41xxx.s index f2a0ead..c40af7b 100644 --- a/CORE/startup_stm32f40_41xxx.s +++ b/CORE/startup_stm32f40_41xxx.s @@ -38,7 +38,7 @@ ; Stack Size (in Bytes) <0x0-0xFFFFFFFF:8> ; -Stack_Size EQU 0x00000800 +Stack_Size EQU 0x00002000 AREA STACK, NOINIT, READWRITE, ALIGN=3 Stack_Mem SPACE Stack_Size diff --git a/HARDWARE/QUEUE/queue.h b/HARDWARE/QUEUE/queue.h index 2d7b67d..ad498f9 100644 --- a/HARDWARE/QUEUE/queue.h +++ b/HARDWARE/QUEUE/queue.h @@ -31,7 +31,7 @@ * @{ */ #define ADC_SEND_SIZE (8*40 + PACKAGE_HEAD_FRAME_LENGTH) /*!< ADC数据包最大大小 540 = 8 * 60 + PACKAGE_HEAD_FRAME_LENGTH>*/ -#define CAN_SEND_SIZE (25 * 8 + PACKAGE_HEAD_FRAME_LENGTH) /*!< CAN数据包最大大小 540 = 8 * 60 + PACKAGE_HEAD_FRAME_LENGTH>*/ +#define CAN_SEND_SIZE (25 * 10 + PACKAGE_HEAD_FRAME_LENGTH) /*!< CAN数据包最大大小 540 = 8 * 60 + PACKAGE_HEAD_FRAME_LENGTH>*/ #define QUEUE_SIZE 700 /*!< 队列正常容量,必须比ADC_SEND_SIZE大一些,不然会在被后面的信息覆盖>*/ #define ARR_SIZE (QUEUE_SIZE + ADC_SEND_SIZE+52) /*!< 队列最大容量>*/ /** diff --git a/HARDWARE/WIFI/userwifi.c b/HARDWARE/WIFI/userwifi.c index 53c2199..962c0c8 100644 --- a/HARDWARE/WIFI/userwifi.c +++ b/HARDWARE/WIFI/userwifi.c @@ -25,7 +25,7 @@ u8 Time_Sync_Flag = 0; //最近时钟是否同步 volatile u8 Wifi_Send_EN = 1; //数据采集和发送使能,是CAN和ADC采集的总开关 u8 CAN_Get_EN = CAN1_ENABLE_BIT_SLC|CAN2_ENABLE_BIT_SLC; //CAN数据发送使能(第0位使能can1,第1位使能can2),默认开启(必须满足Wifi_Send_EN=1,才能采集) -u8 ADC_Get_EN = 0; //ADC数据采集使能,默认开启(必须满足Wifi_Send_EN=1,才能采集) +u8 ADC_Get_EN = 1; //ADC数据采集使能,默认开启(必须满足Wifi_Send_EN=1,才能采集) Queue adc_queue; //ADC数据存储 Queue can_queue; //can数据存储 u8 localDestIp_txrx[4] = {255,255,255,255}; diff --git a/HARDWARE/WIFI/userwifi.h b/HARDWARE/WIFI/userwifi.h index d4e34c3..a4ab659 100644 --- a/HARDWARE/WIFI/userwifi.h +++ b/HARDWARE/WIFI/userwifi.h @@ -57,7 +57,7 @@ typedef enum{ /** @defgroup 是否打印 * @{ */ -#define CHECK_CAN_STATUS_PRINTF 1 /*!< 校验CAN数据>*/ +#define CHECK_CAN_STATUS_PRINTF 0 /*!< 校验CAN数据>*/ #define PRINTF_WIFI_SEND2MODULE_TIME 0 /*!< 打印udp发送时间间隔>*/ /** * @} @@ -74,7 +74,7 @@ typedef enum{ /** @defgroup WIFI模组等待的时间 * @{ */ -#define WIFI_MODUEL_WAIT_MSTIME 5 /*!< 用于防止缓存区被重写>*/ +#define WIFI_MODUEL_WAIT_MSTIME 2 /*!< 用于防止缓存区被重写>*/ /** * @} */