diff --git a/CablePositioning_APP_V1.0/Core/Src/cli.c b/CablePositioning_APP_V1.0/Core/Src/cli.c index 218a57c..f46abd1 100644 --- a/CablePositioning_APP_V1.0/Core/Src/cli.c +++ b/CablePositioning_APP_V1.0/Core/Src/cli.c @@ -132,7 +132,7 @@ static const char *debug_str[DBG_M_COUNT] = "sen", "dbg", "dau", - "dau_txrx" + "dau_txrx", "gps" }; static const CLI_Command_Definition_t cmd_debug = {"debug", _cli_debug, 2}; @@ -894,7 +894,7 @@ void cli_start(void const * argument) dbg_cmd_hander(DBG_CMD_ON, DBG_M_DAU); //dbg_cmd_hander(DBG_CMD_ON, DBG_M_DAU_TXRX); //dbg_cmd_hander(DBG_CMD_ON, DBG_M_GPS); - dbg_cmd_hander(DBG_CMD_ON, DBG_M_4G); + //dbg_cmd_hander(DBG_CMD_ON, DBG_M_4G); //dbg_cmd_hander(DBG_CMD_ON, DBG_M_RS485_SEN); //dbg_cmd_hander(DBG_CMD_ON, DBG_M_RS485_DEBUG); } diff --git a/CablePositioning_APP_V1.0/Core/Src/dau.c b/CablePositioning_APP_V1.0/Core/Src/dau.c index af688e5..d19d0a5 100644 --- a/CablePositioning_APP_V1.0/Core/Src/dau.c +++ b/CablePositioning_APP_V1.0/Core/Src/dau.c @@ -1035,9 +1035,9 @@ int32_t _dau_wave_col_trigger_by_reg(void) #endif E_RETURN(_dau_wave_col_start()); - //E_RETURN(_dau_wave_col_defect()); - E_RETURN(_dau_wave_col_power(DAU_SOURCE_REG)); - _dau_power_calculate(DAU_SOURCE_REG); + E_RETURN(_dau_wave_col_defect()); + //E_RETURN(_dau_wave_col_power(DAU_SOURCE_REG)); + //_dau_power_calculate(DAU_SOURCE_REG); /* 置标志位, 保存数据 */ _dau_data_save(); @@ -1088,7 +1088,10 @@ static void _dau_init(void) HAL_GPIO_WritePin(DAU_RST_GPIO_Port, DAU_RST_Pin, GPIO_PIN_SET); HAL_GPIO_WritePin(POWER_DAU_GPIO_Port, POWER_DAU_Pin, GPIO_PIN_SET); - osDelay(2000); + common_watchdog_set(COM_WDG_DAU); + osDelay(10000); + common_watchdog_set(COM_WDG_DAU); + osDelay(10000); /* 读取 FPGA 版本信息 */ if (HAL_OK == _dau_reg_read_global_state()) @@ -1106,7 +1109,7 @@ static void _dau_init(void) { addr = (i + 1) * DAU_REG_ADDR_PORT_BASE + DAU_REG_ADDR_PORT_DEFECT_BASE; //*temp = dev_config.defect_base[i]; - *temp = 0x0000; + *temp = 34249; _dau_reg_write(addr, sizeof(uint16_t)); addr = (i + 1) * DAU_REG_ADDR_PORT_BASE + DAU_REG_ADDR_PORT_DEFECT_ADJ; @@ -1142,8 +1145,9 @@ static void _dau_start(void *argument) for (;;) { - osDelay(5000); common_watchdog_set(COM_WDG_DAU); + dbg_cmd_hander(DBG_CMD_OFF, DBG_M_DAU_TXRX); + osDelay(1250); /* 读取全局状态寄存器 */ rv = _dau_reg_read_global_state(); @@ -1179,8 +1183,8 @@ static void _dau_start(void *argument) /* 循环工频缺陷电流采集 */ _dau_wave_col_trigger_by_reg(); -if (0){ -#if 0 +if (1){ +#if 1 addr = dau_ctrl.addr_reg; for(i = 0; i < 1; i++) { @@ -1286,6 +1290,7 @@ if (0){ #endif #if 1 + dbg_cmd_hander(DBG_CMD_ON, DBG_M_DAU_TXRX); while(1) { osDelay(500); diff --git a/CablePositioning_APP_V1.0/EWARM/settings/Project.wsdt b/CablePositioning_APP_V1.0/EWARM/settings/Project.wsdt index 3f58815..8ec6505 100644 --- a/CablePositioning_APP_V1.0/EWARM/settings/Project.wsdt +++ b/CablePositioning_APP_V1.0/EWARM/settings/Project.wsdt @@ -86,7 +86,7 @@ 1 1 1 - A40A00000E0040E10000020000005984000002000000568400000200000010860000100000000F810000010000005F860000070000000C810000590A000055840000030000000E810000080000000B810000110000000584000003000000108400001A00000046810000010000000D81000007000000 + B40A00000E0040E10000020000005984000002000000568400000200000010860000100000000F810000010000005F860000070000000C810000690A000055840000030000000E810000080000000B810000110000000584000003000000108400001A00000046810000010000000D81000007000000 49000D8400000F84000008840000FFFFFFFF54840000328100001C810000098400007784000007840000808C000044D50000538400000088000001880000028800000388000004880000058800001C8F00001D8F00001F8F0000208F0000218F00002AE10000118F000055840000568400005984000001B0000002B0000003B0000004B0000005B0000006B0000007B0000008B0000009B000000AB000000BB000000CB000000DB000000EB0000000B000002481000040E100000C840000338400007884000011840000008200001C820000018200006786000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE000020920000289200002992000037920000389200003492000033920000259200001E9200001D920000