diff --git a/Module/LaserTracing_Debug/UartDebug.c b/Module/LaserTracing_Debug/UartDebug.c index 7f0ca2b..7143afc 100644 --- a/Module/LaserTracing_Debug/UartDebug.c +++ b/Module/LaserTracing_Debug/UartDebug.c @@ -436,7 +436,7 @@ void DebugCmdRS485Ctrl(int argc, char *argv[]) } else if(strstr(argv[3], "off") != NULL){ if(idx == 1) - App.Para.Rs485Ch2.Enable = false; + App.Para.Rs485Ch1.Enable = false; else if(idx == 2) App.Para.Rs485Ch2.Enable = false; DBG_LOG("RS485Ch%d Disable!\r\n", idx); @@ -519,11 +519,11 @@ void DebugCmdRS485Ctrl(int argc, char *argv[]) DBG_LOG("At least keep one upgraded serial port!\r\n"); return; } - App.Para.Rs485Ch2.UpgradeEnable = false; + App.Para.Rs485Ch1.UpgradeEnable = false; DBG_LOG("RS485Ch%d Upgrade Off!\r\n", idx); } else if(idx == 2) { - if(App.Para.Rs485Ch2.UpgradeEnable == false) + if(App.Para.Rs485Ch1.UpgradeEnable == false) { DBG_LOG("At least keep one upgraded serial port!\r\n"); return; diff --git a/source/inc/main.h b/source/inc/main.h index 74de791..fc2176d 100644 --- a/source/inc/main.h +++ b/source/inc/main.h @@ -100,7 +100,7 @@ typedef struct { bool CaliFlag; //标校标志位 - int16_t Nonce; //随机数 + uint16_t Nonce; //随机数 }AppDetect_t; extern AppDetect_t App; diff --git a/source/src/SGCP.c b/source/src/SGCP.c index d145636..e342265 100644 --- a/source/src/SGCP.c +++ b/source/src/SGCP.c @@ -1355,7 +1355,7 @@ void SubRevLoopHandler(void) break;} case SUB_STATUS_BROADCAST_SYNC_TIME:{ - ToSDSetColTime(0x00, App.Para.Layout.TimeStamp); + ToSDSyncTime(0x00, App.Para.Layout.TimeStamp); SGCP.SubStatus = SUB_STATUS_IDLE; break;} } diff --git a/source/src/bsp.c b/source/src/bsp.c index 2175306..60cf0a3 100644 --- a/source/src/bsp.c +++ b/source/src/bsp.c @@ -390,6 +390,8 @@ static void GPIOInit(void) Gpio_Init(LASER1_ON_OFF_PORTx,LASER1_ON_OFF_PINx,&GpioInitStruct); Gpio_Init(LASER2_ON_OFF_PORTx,LASER2_ON_OFF_PINx,&GpioInitStruct); Gpio_Init(LASER3_ON_OFF_PORTx,LASER3_ON_OFF_PINx,&GpioInitStruct); + //< ADC??????? + Gpio_Init(AD_ON_OFF_PORTx,AD_ON_OFF_PINx,&GpioInitStruct); GpioInitStruct.bOutputVal = true; ///< 端口默认输出配置->高电平 //< LORA --> RST