modbus 完整测试成功,访问 python 仿真服务程序正常,433传数据出去也正常
This commit is contained in:
@ -107,7 +107,7 @@ extern "C" {
|
|||||||
- 1: 测试环境 (A701室/本地测试),使用 192.168.6.x 网段
|
- 1: 测试环境 (A701室/本地测试),使用 192.168.6.x 网段
|
||||||
- 0: 生产环境 (实船/现场部署),使用 192.168.0.x 网段
|
- 0: 生产环境 (实船/现场部署),使用 192.168.0.x 网段
|
||||||
========================================================= */
|
========================================================= */
|
||||||
#define TEST_A701 1
|
#define TEST_A701 0
|
||||||
|
|
||||||
/* USER CODE END EM */
|
/* USER CODE END EM */
|
||||||
|
|
||||||
|
|||||||
@ -328,8 +328,8 @@ int main(void)
|
|||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
/* === 1. 核心通信驱动引擎 (最高优先级) === */
|
/* === 1. 核心通信驱动引擎 (最高优先级) === */
|
||||||
UART2_Print_Task();
|
UART2_Print_Task();
|
||||||
MultiUART_Task();
|
MultiUART_Task();
|
||||||
|
|
||||||
/* === 2. 无线接收透传 (433 -> 485/Debug) === */
|
/* === 2. 无线接收透传 (433 -> 485/Debug) === */
|
||||||
#if (RF433_MODE == RF433_MODE_RX) || (RF433_MODE == RF433_MODE_BOTH)
|
#if (RF433_MODE == RF433_MODE_RX) || (RF433_MODE == RF433_MODE_BOTH)
|
||||||
@ -340,7 +340,7 @@ int main(void)
|
|||||||
uint16_t len = u1_rx_len;
|
uint16_t len = u1_rx_len;
|
||||||
u1_rx_len = 0;
|
u1_rx_len = 0;
|
||||||
__enable_irq();
|
__enable_irq();
|
||||||
|
|
||||||
MultiUART_Send(PORT_RS485, (uint8_t*)u1_rx_buffer, len);
|
MultiUART_Send(PORT_RS485, (uint8_t*)u1_rx_buffer, len);
|
||||||
MultiUART_Send(PORT_DEBUG, (uint8_t*)u1_rx_buffer, len);
|
MultiUART_Send(PORT_DEBUG, (uint8_t*)u1_rx_buffer, len);
|
||||||
}
|
}
|
||||||
@ -354,7 +354,7 @@ int main(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* === 4. 实时数据采集与上报 (仅在非发射状态运行) === */
|
/* === 4. 实时数据采集与上报 (仅在非发射状态运行) === */
|
||||||
|
|
||||||
// (A) 485 来源数据处理 (Type 0x48)
|
// (A) 485 来源数据处理 (Type 0x48)
|
||||||
#if USE_RS485
|
#if USE_RS485
|
||||||
if (u3_rx_len > 0 && (HAL_GetTick() - u3_last_rx_time > 20))
|
if (u3_rx_len > 0 && (HAL_GetTick() - u3_last_rx_time > 20))
|
||||||
|
|||||||
8606
MDK-ARM/JLinkLog.txt
8606
MDK-ARM/JLinkLog.txt
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user